Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename APP_PROVIDER_BASIC_* environment variables #2812

Merged
merged 1 commit into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog/unreleased/change-rename-app-provider-env.md
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions storage/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
{
Expand Down