From 6d5688ed94a731ebe1f9ee032462f46796e86903 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Wed, 15 Mar 2023 20:19:35 +0100 Subject: [PATCH] remotecache: set secret service on encryptionstorage (#64849) Signed-off-by: bergquist --- pkg/infra/remotecache/remotecache.go | 6 +++--- pkg/infra/remotecache/remotecache_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/infra/remotecache/remotecache.go b/pkg/infra/remotecache/remotecache.go index 039b962d087..3b29e2610c7 100644 --- a/pkg/infra/remotecache/remotecache.go +++ b/pkg/infra/remotecache/remotecache.go @@ -28,7 +28,7 @@ const ( func ProvideService(cfg *setting.Cfg, sqlStore db.DB, usageStats usagestats.Service, secretsService secrets.Service) (*RemoteCache, error) { - client, err := createClient(cfg.RemoteCacheOptions, sqlStore) + client, err := createClient(cfg.RemoteCacheOptions, sqlStore, secretsService) if err != nil { return nil, err } @@ -119,7 +119,7 @@ func (ds *RemoteCache) Run(ctx context.Context) error { return ctx.Err() } -func createClient(opts *setting.RemoteCacheOptions, sqlstore db.DB) (cache CacheStorage, err error) { +func createClient(opts *setting.RemoteCacheOptions, sqlstore db.DB, secretsService secrets.Service) (cache CacheStorage, err error) { switch opts.Name { case redisCacheType: cache, err = newRedisStorage(opts) @@ -138,7 +138,7 @@ func createClient(opts *setting.RemoteCacheOptions, sqlstore db.DB) (cache Cache } if opts.Encryption { - cache = &encryptedCacheStorage{cache: cache} + cache = &encryptedCacheStorage{cache: cache, secretsService: secretsService} } return cache, nil } diff --git a/pkg/infra/remotecache/remotecache_test.go b/pkg/infra/remotecache/remotecache_test.go index 7c99f3d6a90..9ad5acbe7a8 100644 --- a/pkg/infra/remotecache/remotecache_test.go +++ b/pkg/infra/remotecache/remotecache_test.go @@ -40,7 +40,7 @@ func TestCachedBasedOnConfig(t *testing.T) { } func TestInvalidCacheTypeReturnsError(t *testing.T) { - _, err := createClient(&setting.RemoteCacheOptions{Name: "invalid"}, nil) + _, err := createClient(&setting.RemoteCacheOptions{Name: "invalid"}, nil, nil) assert.Equal(t, err, ErrInvalidCacheType) }