From 3a7b7c932ca55f30182e3f5e4d86f7fabe813394 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Thu, 7 Oct 2021 15:16:19 +0200 Subject: [PATCH] rename envvar to REVA_GATEWAY --- graph/pkg/flagset/flagset.go | 2 +- ocs/pkg/flagset/flagset.go | 2 +- proxy/pkg/flagset/flagset.go | 2 +- storage/pkg/flagset/appprovider.go | 2 +- storage/pkg/flagset/authbasic.go | 2 +- storage/pkg/flagset/authbearer.go | 2 +- storage/pkg/flagset/drivereos.go | 2 +- storage/pkg/flagset/frontend.go | 2 +- storage/pkg/flagset/gateway.go | 2 +- storage/pkg/flagset/groups.go | 2 +- storage/pkg/flagset/sharing.go | 2 +- storage/pkg/flagset/storagehome.go | 2 +- storage/pkg/flagset/storagemetadata.go | 2 +- storage/pkg/flagset/storagepubliclink.go | 2 +- storage/pkg/flagset/storageusers.go | 2 +- storage/pkg/flagset/users.go | 2 +- thumbnails/pkg/flagset/flagset.go | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go index b52d7c706b..9ac8ca49ea 100644 --- a/graph/pkg/flagset/flagset.go +++ b/graph/pkg/flagset/flagset.go @@ -160,7 +160,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Address, }, &cli.StringFlag{ diff --git a/ocs/pkg/flagset/flagset.go b/ocs/pkg/flagset/flagset.go index 3b31a4c528..22aac81de8 100644 --- a/ocs/pkg/flagset/flagset.go +++ b/ocs/pkg/flagset/flagset.go @@ -162,7 +162,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.RevaAddress, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.RevaAddress, }, &cli.StringFlag{ diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go index 2e509c8f5f..b5f0abb514 100644 --- a/proxy/pkg/flagset/flagset.go +++ b/proxy/pkg/flagset/flagset.go @@ -186,7 +186,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Address, }, &cli.BoolFlag{ diff --git a/storage/pkg/flagset/appprovider.go b/storage/pkg/flagset/appprovider.go index 857f9269eb..a8c11e9592 100644 --- a/storage/pkg/flagset/appprovider.go +++ b/storage/pkg/flagset/appprovider.go @@ -131,7 +131,7 @@ func AppProviderWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/authbasic.go b/storage/pkg/flagset/authbasic.go index 01180f1573..98d83497cd 100644 --- a/storage/pkg/flagset/authbasic.go +++ b/storage/pkg/flagset/authbasic.go @@ -67,7 +67,7 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/authbearer.go b/storage/pkg/flagset/authbearer.go index 568cf1b3d4..f3a61c9e01 100644 --- a/storage/pkg/flagset/authbearer.go +++ b/storage/pkg/flagset/authbearer.go @@ -113,7 +113,7 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/drivereos.go b/storage/pkg/flagset/drivereos.go index dee7c2301e..b6ce8c7548 100644 --- a/storage/pkg/flagset/drivereos.go +++ b/storage/pkg/flagset/drivereos.go @@ -128,7 +128,7 @@ func DriverEOSWithConfig(cfg *config.Config) []cli.Flag { Name: "storage-eos-reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Storages.EOS.GatewaySVC, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Storages.EOS.GatewaySVC, }, } diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go index 207ad19813..e7329dba91 100644 --- a/storage/pkg/flagset/frontend.go +++ b/storage/pkg/flagset/frontend.go @@ -177,7 +177,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go index f99eb082f8..d5ec742685 100644 --- a/storage/pkg/flagset/gateway.go +++ b/storage/pkg/flagset/gateway.go @@ -57,7 +57,7 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, &cli.StringSliceFlag{ diff --git a/storage/pkg/flagset/groups.go b/storage/pkg/flagset/groups.go index a6cd9ddbab..b58905d764 100644 --- a/storage/pkg/flagset/groups.go +++ b/storage/pkg/flagset/groups.go @@ -27,7 +27,7 @@ func GroupsWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/sharing.go b/storage/pkg/flagset/sharing.go index b15bfdf870..17105d7cc8 100644 --- a/storage/pkg/flagset/sharing.go +++ b/storage/pkg/flagset/sharing.go @@ -27,7 +27,7 @@ func SharingWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/storagehome.go b/storage/pkg/flagset/storagehome.go index adecf1ac1d..03a78137e6 100644 --- a/storage/pkg/flagset/storagehome.go +++ b/storage/pkg/flagset/storagehome.go @@ -142,7 +142,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, // User provider diff --git a/storage/pkg/flagset/storagemetadata.go b/storage/pkg/flagset/storagemetadata.go index 0d69019d12..41a717cefd 100644 --- a/storage/pkg/flagset/storagemetadata.go +++ b/storage/pkg/flagset/storagemetadata.go @@ -74,7 +74,7 @@ func StorageMetadata(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/storagepubliclink.go b/storage/pkg/flagset/storagepubliclink.go index 35bd5e703a..3e05ffa7c1 100644 --- a/storage/pkg/flagset/storagepubliclink.go +++ b/storage/pkg/flagset/storagepubliclink.go @@ -45,7 +45,7 @@ func StoragePublicLink(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/storageusers.go b/storage/pkg/flagset/storageusers.go index f3b6b44569..accff38dcb 100644 --- a/storage/pkg/flagset/storageusers.go +++ b/storage/pkg/flagset/storageusers.go @@ -132,7 +132,7 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, // User provider diff --git a/storage/pkg/flagset/users.go b/storage/pkg/flagset/users.go index 28a6812b19..a050c81df3 100644 --- a/storage/pkg/flagset/users.go +++ b/storage/pkg/flagset/users.go @@ -27,7 +27,7 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go index 2a1d652c37..0658eaa9a1 100644 --- a/thumbnails/pkg/flagset/flagset.go +++ b/thumbnails/pkg/flagset/flagset.go @@ -146,7 +146,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Thumbnail.RevaGateway, "127.0.0.1:9142"), Usage: "Address of REVA gateway endpoint", - EnvVars: []string{"REVA_GATEWAY_ADDR"}, + EnvVars: []string{"REVA_GATEWAY"}, Destination: &cfg.Thumbnail.RevaGateway, }, &cli.BoolFlag{