From a319b17459e7631161cfec9e945d6f1bcab54d33 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 13 Jun 2022 11:29:20 +0200 Subject: [PATCH] remove unused `OCS_STORAGE_USERS_DRIVER` configuration option --- changelog/unreleased/fix-remove-unused-ocs-storage-config.md | 5 +++++ extensions/ocs/pkg/config/config.go | 5 ++--- extensions/ocs/pkg/config/defaults/defaultconfig.go | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/fix-remove-unused-ocs-storage-config.md diff --git a/changelog/unreleased/fix-remove-unused-ocs-storage-config.md b/changelog/unreleased/fix-remove-unused-ocs-storage-config.md new file mode 100644 index 00000000000..9fa56fa643e --- /dev/null +++ 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 index 73924980b3e..82abd355973 100644 --- 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 index 4ea124bb663..79d839aee3b 100644 --- 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", },