diff --git a/changelog/unreleased/deprecate-gateway-envvars.md b/changelog/unreleased/deprecate-gateway-envvars.md new file mode 100644 index 0000000000..853dd23dbb --- /dev/null +++ b/changelog/unreleased/deprecate-gateway-envvars.md @@ -0,0 +1,5 @@ +Enhancement: Deprecate gateway environment variables + +Deprecate service specific `_GATEWAY_NAME` env vars. It makes no sense to point one specific service to a different gateway. + +https://github.com/owncloud/ocis/pull/9451 diff --git a/services/clientlog/pkg/config/config.go b/services/clientlog/pkg/config/config.go index 9627d6b81c..54d6ae3ca0 100644 --- a/services/clientlog/pkg/config/config.go +++ b/services/clientlog/pkg/config/config.go @@ -20,7 +20,7 @@ type Config struct { TokenManager *TokenManager `yaml:"token_manager"` - RevaGateway string `yaml:"reva_gateway" env:"OCIS_REVA_GATEWAY;CLIENTLOG_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata" introductionVersion:"5.0"` + RevaGateway string `yaml:"reva_gateway" env:"OCIS_REVA_GATEWAY;CLIENTLOG_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata" introductionVersion:"5.0" deprecationVersion:"6.0" removalVersion:"%%NEXT%%" deprecationInfo:"CLIENTLOG_REVA_GATEWAY removed from simplicity."` Events Events `yaml:"events"` ServiceAccount ServiceAccount `yaml:"service_account"` diff --git a/services/collaboration/pkg/config/cs3api.go b/services/collaboration/pkg/config/cs3api.go index bd2c81a2dd..c8561d13d9 100644 --- a/services/collaboration/pkg/config/cs3api.go +++ b/services/collaboration/pkg/config/cs3api.go @@ -8,7 +8,7 @@ type CS3Api struct { // Gateway defines the available configuration for the CS3 API gateway type Gateway struct { - Name string `yaml:"name" env:"OCIS_REVA_GATEWAY;COLLABORATION_CS3API_GATEWAY_NAME" desc:"The service name of the CS3API gateway." introductionVersion:"6.0.0"` + Name string `yaml:"name" env:"OCIS_REVA_GATEWAY;COLLABORATION_CS3API_GATEWAY_NAME" desc:"The service name of the CS3API gateway." introductionVersion:"6.0.0" deprecationVersion:"6.0" removalVersion:"%%NEXT%%" deprecationInfo:"COLLABORATION_CS3API_GATEWAY_NAME removed from simplicity."` } // DataGateway defines the available configuration for the CS3 API data gateway