Merge pull request #3955 from wkloucek/remove-unused-ocs-config-option

remove unused `OCS_STORAGE_USERS_DRIVER` configuration option
owncloud · Jun 13, 2022 · 358807f · 358807f
2 parents 202d8dd + a319b17
commit 358807f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/changelog/unreleased/fix-remove-unused-ocs-storage-config.md b/changelog/unreleased/fix-remove-unused-ocs-storage-config.md
@@ -0,0 +1,5 @@
+Bugfix: Remove unused OCS storage configuration
+
+We've removed the unused OCS configuration option `OCS_STORAGE_USERS_DRIVER`.
+
+https://github.com/owncloud/ocis/pull/3955
diff --git a/extensions/ocs/pkg/config/config.go b/extensions/ocs/pkg/config/config.go
@@ -23,9 +23,8 @@ type Config struct {
 
 	IdentityManagement IdentityManagement `yaml:"identity_management"`
 
-	AccountBackend     string `yaml:"account_backend" env:"OCS_ACCOUNT_BACKEND_TYPE"`
-	StorageUsersDriver string `yaml:"storage_users_driver" env:"STORAGE_USERS_DRIVER;OCS_STORAGE_USERS_DRIVER"`
-	MachineAuthAPIKey  string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY"`
+	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"`
 
 	Context context.Context `yaml:"-"`
 }

diff --git a/extensions/ocs/pkg/config/defaults/defaultconfig.go b/extensions/ocs/pkg/config/defaults/defaultconfig.go
@@ -39,7 +39,6 @@ func DefaultConfig() *config.Config {
 		Reva: &config.Reva{
 			Address: "127.0.0.1:9142",
 		},
-		StorageUsersDriver: "ocis",
 		IdentityManagement: config.IdentityManagement{
 			Address: "https://localhost:9200",
 		},