From 6eb8419e90c6344d40408de5b84dfd7ec2854766 Mon Sep 17 00:00:00 2001 From: Robert Pocklington Date: Tue, 15 Feb 2022 10:29:32 +1100 Subject: [PATCH 1/2] fix: align storage metadata GPRC bind port with other variable names Currently STORAGE_METADATA_GRPC_PROVIDER_ADDR environment variable used as the way to set the GRPC bind port for the service. All other services use the format _GRPC_ADDR for GRPC, and _HTTP_ADDR for HTTP. This change brings it in line with the others, as it's confusing why this one is different. --- storage/pkg/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 1b06517210..4df4643220 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -1234,7 +1234,7 @@ func structMappings(cfg *Config) []shared.EnvBinding { Destination: &cfg.Reva.StorageMetadata.GRPCNetwork, }, { - EnvVars: []string{"STORAGE_METADATA_GRPC_PROVIDER_ADDR"}, + EnvVars: []string{"STORAGE_METADATA_GRPC_ADDR"}, Destination: &cfg.Reva.StorageMetadata.GRPCAddr, }, { From 412d3e224472625e9568ffd6235d2470cc3d66c7 Mon Sep 17 00:00:00 2001 From: Robert Pocklington Date: Tue, 15 Feb 2022 10:56:35 +1100 Subject: [PATCH 2/2] Added changelog --- changelog/unreleased/fix-storage-metadata-env-var-name.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/fix-storage-metadata-env-var-name.md diff --git a/changelog/unreleased/fix-storage-metadata-env-var-name.md b/changelog/unreleased/fix-storage-metadata-env-var-name.md new file mode 100644 index 0000000000..709e141d06 --- /dev/null +++ b/changelog/unreleased/fix-storage-metadata-env-var-name.md @@ -0,0 +1,5 @@ +Bugfix: Align storage metadata GPRC bind port with other variable names + +Changed STORAGE_METADATA_GRPC_PROVIDER_ADDR to STORAGE_METADATA_GRPC_ADDR so it aligns with standard environment variable naming conventions used in oCIS. + +https://github.com/owncloud/ocis/pull/3169