From 92d12fdefaf990358f8c7a23f185e6d95ba1dfd0 Mon Sep 17 00:00:00 2001 From: Yuri Tseretyan Date: Fri, 16 Dec 2022 15:01:41 -0500 Subject: [PATCH] Alerting: Remove fake secret service in tests (#60488) --- .../notifier/channels/alertmanager_test.go | 13 ++++--- .../ngalert/notifier/channels/line_test.go | 13 +++---- .../notifier/channels/opsgenie_test.go | 15 ++++---- .../notifier/channels/pagerduty_test.go | 14 +++----- .../notifier/channels/pushover_test.go | 13 +++---- .../ngalert/notifier/channels/sensugo_test.go | 11 +++--- .../ngalert/notifier/channels/slack_test.go | 11 +++--- .../notifier/channels/telegram_test.go | 13 +++---- .../ngalert/notifier/channels/threema_test.go | 10 +++--- .../ngalert/notifier/channels/webex_test.go | 13 +++---- .../ngalert/notifier/channels/webhook_test.go | 14 ++++---- .../ngalert/notifier/channels/wecom_test.go | 34 +++++++++---------- 12 files changed, 73 insertions(+), 101 deletions(-) diff --git a/pkg/services/ngalert/notifier/channels/alertmanager_test.go b/pkg/services/ngalert/notifier/channels/alertmanager_test.go index c61a147afff..fdc352aeee8 100644 --- a/pkg/services/ngalert/notifier/channels/alertmanager_test.go +++ b/pkg/services/ngalert/notifier/channels/alertmanager_test.go @@ -7,9 +7,6 @@ import ( "net/url" "testing" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -54,8 +51,9 @@ func TestNewAlertmanagerNotifier(t *testing.T) { SecureSettings: secureSettings, } - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue + decryptFn := func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + } cfg, err := NewAlertmanagerConfig(m, decryptFn) if c.expectedInitError != "" { require.Equal(t, c.expectedInitError, err.Error()) @@ -151,8 +149,9 @@ func TestAlertmanagerNotifier_Notify(t *testing.T) { SecureSettings: secureSettings, } - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue + decryptFn := func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + } cfg, err := NewAlertmanagerConfig(m, decryptFn) require.NoError(t, err) sn := NewAlertmanagerNotifier(cfg, &FakeLogger{}, images, tmpl, decryptFn) diff --git a/pkg/services/ngalert/notifier/channels/line_test.go b/pkg/services/ngalert/notifier/channels/line_test.go index 0f509d6fdd9..0fedf5a192a 100644 --- a/pkg/services/ngalert/notifier/channels/line_test.go +++ b/pkg/services/ngalert/notifier/channels/line_test.go @@ -10,9 +10,6 @@ import ( "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" ) func TestLineNotifier(t *testing.T) { @@ -99,8 +96,6 @@ func TestLineNotifier(t *testing.T) { settingsJSON := json.RawMessage(c.settings) secureSettings := make(map[string][]byte) webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue fc := FactoryConfig{ Config: &NotificationChannelConfig{ @@ -111,9 +106,11 @@ func TestLineNotifier(t *testing.T) { }, // TODO: allow changing the associated values for different tests. NotificationService: webhookSender, - DecryptFunc: decryptFn, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Template: tmpl, + Logger: &FakeLogger{}, } pn, err := newLineNotifier(fc) if c.expInitError != "" { diff --git a/pkg/services/ngalert/notifier/channels/opsgenie_test.go b/pkg/services/ngalert/notifier/channels/opsgenie_test.go index dc40be38455..7ee3e50cf94 100644 --- a/pkg/services/ngalert/notifier/channels/opsgenie_test.go +++ b/pkg/services/ngalert/notifier/channels/opsgenie_test.go @@ -7,9 +7,6 @@ import ( "testing" "time" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -235,8 +232,6 @@ func TestOpsgenieNotifier(t *testing.T) { webhookSender := mockNotificationService() webhookSender.Webhook.Body = "" - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue fc := FactoryConfig{ Config: &NotificationChannelConfig{ @@ -246,10 +241,12 @@ func TestOpsgenieNotifier(t *testing.T) { SecureSettings: secureSettings, }, NotificationService: webhookSender, - DecryptFunc: decryptFn, - ImageStore: &UnavailableImageStore{}, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + ImageStore: &UnavailableImageStore{}, + Template: tmpl, + Logger: &FakeLogger{}, } ctx := notify.WithGroupKey(context.Background(), "alertname") diff --git a/pkg/services/ngalert/notifier/channels/pagerduty_test.go b/pkg/services/ngalert/notifier/channels/pagerduty_test.go index cdc094be1f7..388bee43631 100644 --- a/pkg/services/ngalert/notifier/channels/pagerduty_test.go +++ b/pkg/services/ngalert/notifier/channels/pagerduty_test.go @@ -14,9 +14,6 @@ import ( "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" ) func TestPagerdutyNotifier(t *testing.T) { @@ -278,9 +275,6 @@ func TestPagerdutyNotifier(t *testing.T) { settingsJSON := json.RawMessage(c.settings) secureSettings := make(map[string][]byte) webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue - fc := FactoryConfig{ Config: &NotificationChannelConfig{ Name: "pageduty_testing", @@ -289,9 +283,11 @@ func TestPagerdutyNotifier(t *testing.T) { SecureSettings: secureSettings, }, NotificationService: webhookSender, - DecryptFunc: decryptFn, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Template: tmpl, + Logger: &FakeLogger{}, } pn, err := newPagerdutyNotifier(fc) if c.expInitError != "" { diff --git a/pkg/services/ngalert/notifier/channels/pushover_test.go b/pkg/services/ngalert/notifier/channels/pushover_test.go index 16c5e1d81e1..e54a24da82b 100644 --- a/pkg/services/ngalert/notifier/channels/pushover_test.go +++ b/pkg/services/ngalert/notifier/channels/pushover_test.go @@ -12,9 +12,6 @@ import ( "strings" "testing" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -214,8 +211,6 @@ func TestPushoverNotifier(t *testing.T) { secureSettings := make(map[string][]byte) webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue fc := FactoryConfig{ Config: &NotificationChannelConfig{ @@ -226,9 +221,11 @@ func TestPushoverNotifier(t *testing.T) { }, ImageStore: images, NotificationService: webhookSender, - DecryptFunc: decryptFn, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Template: tmpl, + Logger: &FakeLogger{}, } pn, err := NewPushoverNotifier(fc) diff --git a/pkg/services/ngalert/notifier/channels/sensugo_test.go b/pkg/services/ngalert/notifier/channels/sensugo_test.go index 7bc3b47d8a0..f4cd4c53f6b 100644 --- a/pkg/services/ngalert/notifier/channels/sensugo_test.go +++ b/pkg/services/ngalert/notifier/channels/sensugo_test.go @@ -7,9 +7,6 @@ import ( "testing" "time" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -147,16 +144,16 @@ func TestSensuGoNotifier(t *testing.T) { } webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue fc := FactoryConfig{ Config: m, ImageStore: images, NotificationService: webhookSender, Template: tmpl, - DecryptFunc: decryptFn, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Logger: &FakeLogger{}, } sn, err := NewSensuGoNotifier(fc) diff --git a/pkg/services/ngalert/notifier/channels/slack_test.go b/pkg/services/ngalert/notifier/channels/slack_test.go index ebbaee10342..09d082b11b9 100644 --- a/pkg/services/ngalert/notifier/channels/slack_test.go +++ b/pkg/services/ngalert/notifier/channels/slack_test.go @@ -19,8 +19,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" "github.com/grafana/grafana/pkg/setting" ) @@ -421,7 +419,6 @@ func setupSlackForTests(t *testing.T, settings string) (*SlackNotifier, *slackRe URL: "https://www.example.com/test.png", }}, } - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) notificationService := mockNotificationService() c := FactoryConfig{ @@ -433,9 +430,11 @@ func setupSlackForTests(t *testing.T, settings string) (*SlackNotifier, *slackRe }, ImageStore: images, NotificationService: notificationService, - DecryptFunc: secretsService.GetDecryptedValue, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Template: tmpl, + Logger: &FakeLogger{}, } sn, err := buildSlackNotifier(c) diff --git a/pkg/services/ngalert/notifier/channels/telegram_test.go b/pkg/services/ngalert/notifier/channels/telegram_test.go index e59eeba1091..0f084dbe078 100644 --- a/pkg/services/ngalert/notifier/channels/telegram_test.go +++ b/pkg/services/ngalert/notifier/channels/telegram_test.go @@ -7,9 +7,6 @@ import ( "strings" "testing" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -120,8 +117,6 @@ func TestTelegramNotifier(t *testing.T) { require.NoError(t, err) secureSettings := make(map[string][]byte) - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue notificationService := mockNotificationService() fc := FactoryConfig{ @@ -133,9 +128,11 @@ func TestTelegramNotifier(t *testing.T) { }, ImageStore: images, NotificationService: notificationService, - DecryptFunc: decryptFn, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Template: tmpl, + Logger: &FakeLogger{}, } n, err := NewTelegramNotifier(fc) diff --git a/pkg/services/ngalert/notifier/channels/threema_test.go b/pkg/services/ngalert/notifier/channels/threema_test.go index 46e924677af..27725841099 100644 --- a/pkg/services/ngalert/notifier/channels/threema_test.go +++ b/pkg/services/ngalert/notifier/channels/threema_test.go @@ -6,9 +6,6 @@ import ( "net/url" "testing" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -121,7 +118,6 @@ func TestThreemaNotifier(t *testing.T) { settingsJSON := json.RawMessage(c.settings) secureSettings := make(map[string][]byte) webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) fc := FactoryConfig{ Config: &NotificationChannelConfig{ @@ -133,8 +129,10 @@ func TestThreemaNotifier(t *testing.T) { NotificationService: webhookSender, ImageStore: images, Template: tmpl, - DecryptFunc: secretsService.GetDecryptedValue, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Logger: &FakeLogger{}, } pn, err := NewThreemaNotifier(fc) diff --git a/pkg/services/ngalert/notifier/channels/webex_test.go b/pkg/services/ngalert/notifier/channels/webex_test.go index ddccb105b99..3d3a89584df 100644 --- a/pkg/services/ngalert/notifier/channels/webex_test.go +++ b/pkg/services/ngalert/notifier/channels/webex_test.go @@ -8,9 +8,6 @@ import ( "strings" "testing" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -108,8 +105,6 @@ func TestWebexNotifier(t *testing.T) { settingsJSON := json.RawMessage(c.settings) secureSettings := make(map[string][]byte) - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) - decryptFn := secretsService.GetDecryptedValue notificationService := mockNotificationService() fc := FactoryConfig{ @@ -121,9 +116,11 @@ func TestWebexNotifier(t *testing.T) { }, ImageStore: images, NotificationService: notificationService, - DecryptFunc: decryptFn, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + Template: tmpl, + Logger: &FakeLogger{}, } n, err := buildWebexNotifier(fc) diff --git a/pkg/services/ngalert/notifier/channels/webhook_test.go b/pkg/services/ngalert/notifier/channels/webhook_test.go index 5b6d131fc26..25436a75f85 100644 --- a/pkg/services/ngalert/notifier/channels/webhook_test.go +++ b/pkg/services/ngalert/notifier/channels/webhook_test.go @@ -7,9 +7,6 @@ import ( "net/url" "testing" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/template" "github.com/prometheus/alertmanager/types" @@ -348,15 +345,16 @@ func TestWebhookNotifier(t *testing.T) { } webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) fc := FactoryConfig{ Config: m, NotificationService: webhookSender, - DecryptFunc: secretsService.GetDecryptedValue, - ImageStore: &UnavailableImageStore{}, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + ImageStore: &UnavailableImageStore{}, + Template: tmpl, + Logger: &FakeLogger{}, } pn, err := buildWebhookNotifier(fc) diff --git a/pkg/services/ngalert/notifier/channels/wecom_test.go b/pkg/services/ngalert/notifier/channels/wecom_test.go index 3f80838922e..e6a81f855a7 100644 --- a/pkg/services/ngalert/notifier/channels/wecom_test.go +++ b/pkg/services/ngalert/notifier/channels/wecom_test.go @@ -11,9 +11,6 @@ import ( "testing" "time" - "github.com/grafana/grafana/pkg/services/secrets/fakes" - secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager" - "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" @@ -166,15 +163,16 @@ func TestWeComNotifier(t *testing.T) { } webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) fc := FactoryConfig{ Config: m, NotificationService: webhookSender, - DecryptFunc: secretsService.GetDecryptedValue, - ImageStore: nil, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + ImageStore: nil, + Template: tmpl, + Logger: &FakeLogger{}, } pn, err := buildWecomNotifier(fc) @@ -349,15 +347,16 @@ func TestWeComNotifierAPIAPP(t *testing.T) { } webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) fc := FactoryConfig{ Config: m, NotificationService: webhookSender, - DecryptFunc: secretsService.GetDecryptedValue, - ImageStore: nil, - Template: tmpl, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + ImageStore: nil, + Template: tmpl, + Logger: &FakeLogger{}, } pn, err := buildWecomNotifier(fc) @@ -533,14 +532,15 @@ func TestWeComFactory(t *testing.T) { } webhookSender := mockNotificationService() - secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) fc := FactoryConfig{ Config: m, NotificationService: webhookSender, - DecryptFunc: secretsService.GetDecryptedValue, - ImageStore: nil, - Logger: &FakeLogger{}, + DecryptFunc: func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string { + return fallback + }, + ImageStore: nil, + Logger: &FakeLogger{}, } _, err := WeComFactory(fc)