From e84dd27e88404cd8de55f0602a3e6b58c5c1614b Mon Sep 17 00:00:00 2001 From: Ali <83188384+testA113@users.noreply.github.com> Date: Tue, 19 Dec 2023 12:13:44 +1300 Subject: [PATCH] feat(cache): default to off [EE-6293] (#10867) Co-authored-by: testa113 <testa113> --- api/datastore/migrator/migrate_dbversion110.go | 18 ------------------ api/datastore/migrator/migrator.go | 1 - .../test_data/output_24_to_latest.json | 6 +++--- api/http/handler/users/admin_init.go | 1 - api/http/handler/users/user_create.go | 1 - 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/api/datastore/migrator/migrate_dbversion110.go b/api/datastore/migrator/migrate_dbversion110.go index d2bbcc677..88f0a4f19 100644 --- a/api/datastore/migrator/migrate_dbversion110.go +++ b/api/datastore/migrator/migrate_dbversion110.go @@ -23,21 +23,3 @@ func (migrator *Migrator) updateAppTemplatesVersionForDB110() error { return migrator.settingsService.UpdateSettings(settings) } - -// setUseCacheForDB110 sets the user cache to true for all users -func (migrator *Migrator) setUserCacheForDB110() error { - users, err := migrator.userService.ReadAll() - if err != nil { - return err - } - - for i := range users { - user := &users[i] - user.UseCache = true - if err := migrator.userService.Update(user.ID, user); err != nil { - return err - } - } - - return nil -} diff --git a/api/datastore/migrator/migrator.go b/api/datastore/migrator/migrator.go index edebb9031..da7bb7ca2 100644 --- a/api/datastore/migrator/migrator.go +++ b/api/datastore/migrator/migrator.go @@ -230,7 +230,6 @@ func (m *Migrator) initMigrations() { ) m.addMigrations("2.20", m.updateAppTemplatesVersionForDB110, - m.setUserCacheForDB110, ) // Add new migrations below... diff --git a/api/datastore/test_data/output_24_to_latest.json b/api/datastore/test_data/output_24_to_latest.json index b91a5d4c5..873dee304 100644 --- a/api/datastore/test_data/output_24_to_latest.json +++ b/api/datastore/test_data/output_24_to_latest.json @@ -903,7 +903,7 @@ "color": "" }, "TokenIssueAt": 0, - "UseCache": true, + "UseCache": false, "Username": "admin" }, { @@ -933,11 +933,11 @@ "color": "" }, "TokenIssueAt": 0, - "UseCache": true, + "UseCache": false, "Username": "prabhat" } ], "version": { - "VERSION": "{\"SchemaVersion\":\"2.20.0\",\"MigratorCount\":2,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" + "VERSION": "{\"SchemaVersion\":\"2.20.0\",\"MigratorCount\":1,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" } } \ No newline at end of file diff --git a/api/http/handler/users/admin_init.go b/api/http/handler/users/admin_init.go index ec73ca246..753ec97a6 100644 --- a/api/http/handler/users/admin_init.go +++ b/api/http/handler/users/admin_init.go @@ -65,7 +65,6 @@ func (handler *Handler) adminInit(w http.ResponseWriter, r *http.Request) *httpe user := &portainer.User{ Username: payload.Username, Role: portainer.AdministratorRole, - UseCache: true, } user.Password, err = handler.CryptoService.Hash(payload.Password) diff --git a/api/http/handler/users/user_create.go b/api/http/handler/users/user_create.go index 8e6112442..d932b8c43 100644 --- a/api/http/handler/users/user_create.go +++ b/api/http/handler/users/user_create.go @@ -65,7 +65,6 @@ func (handler *Handler) userCreate(w http.ResponseWriter, r *http.Request) *http user = &portainer.User{ Username: payload.Username, Role: portainer.UserRole(payload.Role), - UseCache: true, } settings, err := handler.DataStore.Settings().Settings()