diff --git a/graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go index 9da2a1214f..b52d7c706b 100644 --- a/graph/pkg/flagset/flagset.go +++ b/graph/pkg/flagset/flagset.go @@ -159,8 +159,8 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { &cli.StringFlag{ Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"), - Usage: "REVA Gateway Endpoint", - EnvVars: []string{"GRAPH_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"}, + Usage: "Address of REVA gateway endpoint", + EnvVars: []string{"REVA_GATEWAY_ADDR"}, Destination: &cfg.Reva.Address, }, &cli.StringFlag{ diff --git a/ocs/pkg/flagset/flagset.go b/ocs/pkg/flagset/flagset.go index a56e456940..3b31a4c528 100644 --- a/ocs/pkg/flagset/flagset.go +++ b/ocs/pkg/flagset/flagset.go @@ -161,8 +161,8 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { &cli.StringFlag{ Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.RevaAddress, "127.0.0.1:9142"), - Usage: "REVA Gateway Endpoint", - EnvVars: []string{"OCS_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"}, + Usage: "Address of REVA gateway endpoint", + EnvVars: []string{"REVA_GATEWAY_ADDR"}, Destination: &cfg.RevaAddress, }, &cli.StringFlag{ diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go index e453470556..2e509c8f5f 100644 --- a/proxy/pkg/flagset/flagset.go +++ b/proxy/pkg/flagset/flagset.go @@ -185,8 +185,8 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { &cli.StringFlag{ Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"), - Usage: "REVA Gateway Endpoint", - EnvVars: []string{"PROXY_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"}, + Usage: "Address of REVA gateway endpoint", + EnvVars: []string{"REVA_GATEWAY_ADDR"}, Destination: &cfg.Reva.Address, }, &cli.BoolFlag{ diff --git a/storage/pkg/flagset/appprovider.go b/storage/pkg/flagset/appprovider.go index 48d358b580..857f9269eb 100644 --- a/storage/pkg/flagset/appprovider.go +++ b/storage/pkg/flagset/appprovider.go @@ -128,10 +128,10 @@ func AppProviderWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/authbasic.go b/storage/pkg/flagset/authbasic.go index 5a5d815eeb..01180f1573 100644 --- a/storage/pkg/flagset/authbasic.go +++ b/storage/pkg/flagset/authbasic.go @@ -64,10 +64,10 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/authbearer.go b/storage/pkg/flagset/authbearer.go index 4c1fa1bca1..568cf1b3d4 100644 --- a/storage/pkg/flagset/authbearer.go +++ b/storage/pkg/flagset/authbearer.go @@ -110,10 +110,10 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/drivereos.go b/storage/pkg/flagset/drivereos.go index 541d15eb8c..df6eeeaf59 100644 --- a/storage/pkg/flagset/drivereos.go +++ b/storage/pkg/flagset/drivereos.go @@ -125,10 +125,10 @@ func DriverEOSWithConfig(cfg *config.Config) []cli.Flag { Destination: &cfg.Reva.Storages.EOS.UserLayout, }, &cli.StringFlag{ - Name: "storage-eos-gatewaysvc", - Value: flags.OverrideDefaultString(cfg.Reva.Storages.EOS.GatewaySVC, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_DRIVER_EOS_GATEWAYSVC"}, + Name: "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"}, Destination: &cfg.Reva.Storages.EOS.GatewaySVC, }, } diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go index faa944b123..207ad19813 100644 --- a/storage/pkg/flagset/frontend.go +++ b/storage/pkg/flagset/frontend.go @@ -174,10 +174,10 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go index 59795d467d..9ccfa7d5ad 100644 --- a/storage/pkg/flagset/gateway.go +++ b/storage/pkg/flagset/gateway.go @@ -47,17 +47,17 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag { Destination: &cfg.Reva.Gateway.GRPCNetwork, }, &cli.StringFlag{ - Name: "addr", + Name: "reva-gateway-bind-addr", Value: flags.OverrideDefaultString(cfg.Reva.Gateway.GRPCAddr, "0.0.0.0:9142"), - Usage: "Address to bind storage service", - EnvVars: []string{"STORAGE_GATEWAY_GRPC_ADDR"}, + Usage: "Address to bind REVA service", + EnvVars: []string{"REVA_GATEWAY_BIND_ADDR"}, Destination: &cfg.Reva.Gateway.GRPCAddr, }, &cli.StringFlag{ - Name: "endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "endpoint to use for the storage service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, &cli.StringSliceFlag{ diff --git a/storage/pkg/flagset/groups.go b/storage/pkg/flagset/groups.go index 80c0b4e0cc..a6cd9ddbab 100644 --- a/storage/pkg/flagset/groups.go +++ b/storage/pkg/flagset/groups.go @@ -24,10 +24,10 @@ func GroupsWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/sharing.go b/storage/pkg/flagset/sharing.go index 58abecab81..b15bfdf870 100644 --- a/storage/pkg/flagset/sharing.go +++ b/storage/pkg/flagset/sharing.go @@ -24,10 +24,10 @@ func SharingWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/storagehome.go b/storage/pkg/flagset/storagehome.go index 311af564cb..adecf1ac1d 100644 --- a/storage/pkg/flagset/storagehome.go +++ b/storage/pkg/flagset/storagehome.go @@ -139,10 +139,10 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "endpoint to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, // User provider diff --git a/storage/pkg/flagset/storagemetadata.go b/storage/pkg/flagset/storagemetadata.go index 17e5dfbd58..0d69019d12 100644 --- a/storage/pkg/flagset/storagemetadata.go +++ b/storage/pkg/flagset/storagemetadata.go @@ -71,10 +71,10 @@ func StorageMetadata(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "endpoint to use for the gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/storage/pkg/flagset/storagepubliclink.go b/storage/pkg/flagset/storagepubliclink.go index 613fa15ec6..35bd5e703a 100644 --- a/storage/pkg/flagset/storagepubliclink.go +++ b/storage/pkg/flagset/storagepubliclink.go @@ -42,10 +42,10 @@ func StoragePublicLink(cfg *config.Config) []cli.Flag { }, &cli.StringFlag{ - Name: "gateway-endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "endpoint to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, } diff --git a/storage/pkg/flagset/storageusers.go b/storage/pkg/flagset/storageusers.go index d66bea3ae5..f3b6b44569 100644 --- a/storage/pkg/flagset/storageusers.go +++ b/storage/pkg/flagset/storageusers.go @@ -129,10 +129,10 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "endpoint to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, // User provider diff --git a/storage/pkg/flagset/users.go b/storage/pkg/flagset/users.go index 5d7f4356c1..28a6812b19 100644 --- a/storage/pkg/flagset/users.go +++ b/storage/pkg/flagset/users.go @@ -24,10 +24,10 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag { // Gateway &cli.StringFlag{ - Name: "gateway-endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), - Usage: "URL to use for the storage gateway service", - EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + 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"}, Destination: &cfg.Reva.Gateway.Endpoint, }, diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go index 6aab80d5af..2a1d652c37 100644 --- a/thumbnails/pkg/flagset/flagset.go +++ b/thumbnails/pkg/flagset/flagset.go @@ -145,8 +145,8 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { &cli.StringFlag{ Name: "reva-gateway-addr", Value: flags.OverrideDefaultString(cfg.Thumbnail.RevaGateway, "127.0.0.1:9142"), - Usage: "Reva gateway address", - EnvVars: []string{"THUMBNAILS_REVA_GATEWAY", "PROXY_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"}, + Usage: "Address of REVA gateway endpoint", + EnvVars: []string{"REVA_GATEWAY_ADDR"}, Destination: &cfg.Thumbnail.RevaGateway, }, &cli.BoolFlag{