From 0fc2efadf2adef6b93be4a1158601085e21c40cd Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 11:04:13 +0100 Subject: [PATCH] rename `APP_PROVIDER_BASIC_*` environment variables, followup of #2811 --- changelog/unreleased/change-rename-app-provider-env.md | 8 ++++++++ storage/pkg/config/config.go | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/change-rename-app-provider-env.md diff --git a/changelog/unreleased/change-rename-app-provider-env.md b/changelog/unreleased/change-rename-app-provider-env.md new file mode 100644 index 00000000000..47262479939 --- /dev/null +++ b/changelog/unreleased/change-rename-app-provider-env.md @@ -0,0 +1,8 @@ +Change: Rename `APP_PROVIDER_BASIC_*` environment variables + +We've renamed the `APP_PROVIDER_BASIC_*` to `APP_PROVIDER_*` since +the `_BASIC_` part is a copy and paste error. Now all app provider +environment variables are consistently starting with `APP_PROVIDER_*`. + +https://github.com/owncloud/ocis/pull/2812 +https://github.com/owncloud/ocis/pull/2811 diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 4412005be40..c1a201ac6c2 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -1082,19 +1082,19 @@ func structMappings(cfg *Config) []shared.EnvBinding { // app provider { - EnvVars: []string{"APP_PROVIDER_DEBUG_ADDR", "APP_PROVIDER_BASIC_DEBUG_ADDR"}, // TODO: remove env containing _BASIC_ + EnvVars: []string{"APP_PROVIDER_DEBUG_ADDR"}, Destination: &cfg.Reva.AppProvider.DebugAddr, }, { - EnvVars: []string{"APP_PROVIDER_GRPC_NETWORK", "APP_PROVIDER_BASIC_GRPC_NETWORK"}, // TODO: remove env containing _BASIC_ + EnvVars: []string{"APP_PROVIDER_GRPC_NETWORK"}, Destination: &cfg.Reva.AppProvider.GRPCNetwork, }, { - EnvVars: []string{"APP_PROVIDER_GRPC_ADDR", "APP_PROVIDER_BASIC_GRPC_ADDR"}, // TODO: remove env containing _BASIC_ + EnvVars: []string{"APP_PROVIDER_GRPC_ADDR"}, Destination: &cfg.Reva.AppProvider.GRPCAddr, }, { - EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR", "APP_PROVIDER_BASIC_EXTERNAL_ADDR"}, // TODO: remove env containing _BASIC_ + EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR"}, Destination: &cfg.Reva.AppProvider.ExternalAddr, }, {