diff --git a/changelog/unreleased/fix-remove-unused-ocs-backend-config.md b/changelog/unreleased/fix-remove-unused-ocs-backend-config.md
new file mode 100644
index 00000000000..08da6b90085
--- /dev/null
+++ b/changelog/unreleased/fix-remove-unused-ocs-backend-config.md
@@ -0,0 +1,7 @@
+Bugfix: Remove static ocs user backend config
+
+We've remove the `OCS_ACCOUNT_BACKEND_TYPE` configuration option.
+It was intended to allow configuration of different user backends for the ocs service.
+Right now the ocs service only has a "cs3" backend. Therefor it's a static entry and not configurable.
+
+https://github.com/owncloud/ocis/pull/4077
diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml
index 1940c506fec..872e927d1f9 100644
--- a/deployments/examples/ocis_individual_services/docker-compose.yml
+++ b/deployments/examples/ocis_individual_services/docker-compose.yml
@@ -336,7 +336,6 @@ services:
OCS_HTTP_ADDR: 0.0.0.0:9110
- OCS_ACCOUNT_BACKEND_TYPE: cs3
OCS_IDM_ADDRESS: https://${OCIS_DOMAIN}
OCS_JWT_SECRET: ${OCIS_JWT_SECRET}
diff --git a/docs/helpers/environment-variable-docs-generator.go.tmpl b/docs/helpers/environment-variable-docs-generator.go.tmpl
index 63dc7e56005..af31091abf9 100644
--- a/docs/helpers/environment-variable-docs-generator.go.tmpl
+++ b/docs/helpers/environment-variable-docs-generator.go.tmpl
@@ -77,7 +77,11 @@ func GetAnnotatedVariables(s interface{}) []ConfigField {
continue
}
v := fmt.Sprintf("%v", value.Interface())
- fields = append(fields, ConfigField{Name: strings.ReplaceAll(env, ";", "
"), DefaultValue: html.EscapeString(strings.Replace(v, "|", "\\|", -1)), Description: desc, Type: value.Type().Name()})
+ typeName := value.Type().Name()
+ if typeName == "" {
+ typeName = value.Type().String()
+ }
+ fields = append(fields, ConfigField{Name: strings.ReplaceAll(env, ";", "
"), DefaultValue: html.EscapeString(strings.Replace(v, "|", "\\|", -1)), Description: desc, Type: typeName})
case reflect.Ptr:
// PolicySelectors in the Proxy are being skipped atm
// they are not configurable via env vars, if that changes
diff --git a/services/ocs/pkg/config/config.go b/services/ocs/pkg/config/config.go
index 4d30c12a83a..bf18ec276af 100644
--- a/services/ocs/pkg/config/config.go
+++ b/services/ocs/pkg/config/config.go
@@ -23,8 +23,8 @@ type Config struct {
IdentityManagement IdentityManagement `yaml:"identity_management"`
- AccountBackend string `yaml:"account_backend" env:"OCS_ACCOUNT_BACKEND_TYPE"`
- MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY" desc: "Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
+ AccountBackend string `yaml:"-"` // we only support cs3 backend, no need to have this configurable
+ MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY" desc:"Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
Context context.Context `yaml:"-"`
}
diff --git a/services/search/pkg/config/config.go b/services/search/pkg/config/config.go
index d44fdbdaccd..7b72fab033e 100644
--- a/services/search/pkg/config/config.go
+++ b/services/search/pkg/config/config.go
@@ -18,11 +18,11 @@ type Config struct {
GRPC GRPC `yaml:"grpc"`
- Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH"`
+ Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH" desc:"Path for the search persistence directory."`
Reva Reva `yaml:"reva"`
Events Events `yaml:"events"`
- MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY" desc: "Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
+ MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY" desc:"Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
Context context.Context `yaml:"-"`
}