From 57eec16a10f4bc2f5163679540d33e16221d7d2a Mon Sep 17 00:00:00 2001 From: Tania B Date: Mon, 25 Oct 2021 16:31:00 +0300 Subject: [PATCH] Refactor secrets service test helper --- pkg/services/secrets/manager/helpers.go | 12 +----------- pkg/services/secrets/manager/manager_test.go | 5 ++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/pkg/services/secrets/manager/helpers.go b/pkg/services/secrets/manager/helpers.go index f1590782692..7777f952ef7 100644 --- a/pkg/services/secrets/manager/helpers.go +++ b/pkg/services/secrets/manager/helpers.go @@ -6,23 +6,13 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/services/encryption/ossencryption" "github.com/grafana/grafana/pkg/services/secrets" - "github.com/grafana/grafana/pkg/services/secrets/database" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/setting" "github.com/stretchr/testify/require" "gopkg.in/ini.v1" ) -func SetupTestService(tb testing.TB, db *sqlstore.SQLStore) *SecretsService { - if db == nil { - return setupTestService(tb, fakes.NewFakeSecretsStore()) - } - return setupTestService(tb, database.ProvideSecretsStore(db)) -} - -func setupTestService(tb testing.TB, store secrets.Store) *SecretsService { +func SetupTestService(tb testing.TB, store secrets.Store) *SecretsService { tb.Helper() defaultKey := "SdlklWklckeLS" if len(setting.SecretKey) > 0 { diff --git a/pkg/services/secrets/manager/manager_test.go b/pkg/services/secrets/manager/manager_test.go index 3e78ac4f166..b3bca2b7ede 100644 --- a/pkg/services/secrets/manager/manager_test.go +++ b/pkg/services/secrets/manager/manager_test.go @@ -4,18 +4,17 @@ import ( "context" "testing" + "github.com/grafana/grafana/pkg/services/secrets" "github.com/grafana/grafana/pkg/services/secrets/database" "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "github.com/grafana/grafana/pkg/services/secrets" ) func TestSecrets_EnvelopeEncryption(t *testing.T) { store := database.ProvideSecretsStore(sqlstore.InitTestDB(t)) - svc := setupTestService(t, store) + svc := SetupTestService(t, store) ctx := context.Background() t.Run("encrypting with no entity_id should create DEK", func(t *testing.T) {