IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

remotecache: set secret service on encryptionstorage (#64849)

Browse Source 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
This commit is contained in:
Carl Bergquist 2023-03-15 20:19:35 +01:00 committed by GitHub
parent c1f1cb8524
commit 6d5688ed94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/infra/remotecache/remotecache.go
View File

@ -28,7 +28,7 @@ const (
func ProvideService(cfg *setting.Cfg, sqlStore db.DB, usageStats usagestats.Service, func ProvideService(cfg *setting.Cfg, sqlStore db.DB, usageStats usagestats.Service,
secretsService secrets.Service) (*RemoteCache, error) { secretsService secrets.Service) (*RemoteCache, error) {
client, err := createClient(cfg.RemoteCacheOptions, sqlStore) client, err := createClient(cfg.RemoteCacheOptions, sqlStore, secretsService)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -119,7 +119,7 @@ func (ds *RemoteCache) Run(ctx context.Context) error {
return ctx.Err() 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 { switch opts.Name {
case redisCacheType: case redisCacheType:
cache, err = newRedisStorage(opts) cache, err = newRedisStorage(opts)
@ -138,7 +138,7 @@ func createClient(opts *setting.RemoteCacheOptions, sqlstore db.DB) (cache Cache
} }
if opts.Encryption { if opts.Encryption {
cache = &encryptedCacheStorage{cache: cache} cache = &encryptedCacheStorage{cache: cache, secretsService: secretsService}
} }
return cache, nil return cache, nil
} }

2
pkg/infra/remotecache/remotecache_test.go
View File

@ -40,7 +40,7 @@ func TestCachedBasedOnConfig(t *testing.T) {
} }
func TestInvalidCacheTypeReturnsError(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) assert.Equal(t, err, ErrInvalidCacheType)
} }