From 5b38fa149d1b28838b4c795ddc4fc28953efcd6d Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 13 May 2024 11:54:37 +0200 Subject: [PATCH] settings: Remove deprecated `filesystem` backend We changed the default to `metadata` before the 2.0 release. This PR alos removes the associated `SETTINGS_STORE_TYPE` and `SETTINGS_DATA_PATH` settings as they are no longer needed with `metadata` as the only available backend. --- .../remove-deprecated-settings-backend.md | 6 + services/settings/README.md | 9 +- services/settings/pkg/config/config.go | 2 - .../pkg/config/defaults/defaultconfig.go | 4 - services/settings/pkg/service/v0/service.go | 52 +- services/settings/pkg/service/v0/settings.go | 569 ------------------ .../pkg/store/filesystem/assignments.go | 66 -- .../pkg/store/filesystem/assignments_test.go | 178 ------ .../settings/pkg/store/filesystem/bundles.go | 181 ------ .../pkg/store/filesystem/bundles_test.go | 155 ----- services/settings/pkg/store/filesystem/io.go | 60 -- .../settings/pkg/store/filesystem/paths.go | 65 -- .../pkg/store/filesystem/permissions.go | 72 --- .../pkg/store/filesystem/staticcheck.conf | 1 - .../settings/pkg/store/filesystem/store.go | 50 -- .../pkg/store/filesystem/store_test.go | 39 -- .../settings/pkg/store/filesystem/values.go | 109 ---- .../pkg/store/filesystem/values_test.go | 70 --- services/settings/pkg/store/registry.go | 1 - tests/acceptance/docker/src/ocis-base.yml | 1 - 20 files changed, 9 insertions(+), 1681 deletions(-) create mode 100644 changelog/unreleased/remove-deprecated-settings-backend.md delete mode 100644 services/settings/pkg/store/filesystem/assignments.go delete mode 100644 services/settings/pkg/store/filesystem/assignments_test.go delete mode 100644 services/settings/pkg/store/filesystem/bundles.go delete mode 100644 services/settings/pkg/store/filesystem/bundles_test.go delete mode 100644 services/settings/pkg/store/filesystem/io.go delete mode 100644 services/settings/pkg/store/filesystem/paths.go delete mode 100644 services/settings/pkg/store/filesystem/permissions.go delete mode 100644 services/settings/pkg/store/filesystem/staticcheck.conf delete mode 100644 services/settings/pkg/store/filesystem/store.go delete mode 100644 services/settings/pkg/store/filesystem/store_test.go delete mode 100644 services/settings/pkg/store/filesystem/values.go delete mode 100644 services/settings/pkg/store/filesystem/values_test.go diff --git a/changelog/unreleased/remove-deprecated-settings-backend.md b/changelog/unreleased/remove-deprecated-settings-backend.md new file mode 100644 index 0000000000..81d333176e --- /dev/null +++ b/changelog/unreleased/remove-deprecated-settings-backend.md @@ -0,0 +1,6 @@ +Change: The `filesystem` backend for the settings service has been removed + +The only remaining backend for the settings service is `metadata`, which has been the +default backend since ocis 2.0 + +https://github.com/owncloud/ocis/pull/9138 diff --git a/services/settings/README.md b/services/settings/README.md index 69432c8de8..6567231610 100644 --- a/services/settings/README.md +++ b/services/settings/README.md @@ -12,12 +12,7 @@ The settings service is currently used for managing the: As an example, user profile settings that can be changed in the Web UI must be persistent. -The settings service supports two different backends for persisting the data. The backend can be set via the `SETTINGS_STORE_TYPE` environment variable. Supported values are: - -* `metadata`: The default. This backend persists the settings data via the `storage-system` service. -* `filesystem`: (deprecated) This backend persists the settings data in a directory on the local filesystem. - The directory can be configured with `SETTINGS_DATA_PATH`. This backend is **not** suitable for running - multiple intances of the `settings` service in a scale-out deployment and was therefore deprecated. +The settings service persists the settings data via the `storage-system` service.