public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'encryption/use-secrets-service' of github.com:grafana/grafana into encryption/use-secrets-service

Browse Source
This commit is contained in:
Joan López de la Franca Beltran
2021-10-25 08:37:22 +02:00
parent f7b5c4491e 388de0f476
commit b83f8f7e3c
10 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/notifier/channels/alertmanager_test.go
+3 -3
View File
@@ -9,7 +9,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
@@ -55,7 +55,7 @@ func TestNewAlertmanagerNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
sn, err := NewAlertmanagerNotifier(m, tmpl, decryptFn)
if c.expectedInitError != "" {
@@ -136,7 +136,7 @@ func TestAlertmanagerNotifier_Notify(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
sn, err := NewAlertmanagerNotifier(m, tmpl, decryptFn)
require.NoError(t, err)
pkg/services/ngalert/notifier/channels/line_test.go
+3 -2
View File
@@ -5,6 +5,8 @@ import (
"net/url"
"testing"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -13,7 +15,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
)
func TestLineNotifier(t *testing.T) {
@@ -89,7 +90,7 @@ func TestLineNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewLineNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/opsgenie_test.go
+2 -2
View File
@@ -6,6 +6,7 @@ import (
"testing"
"time"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -14,7 +15,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
)
func TestOpsgenieNotifier(t *testing.T) {
@@ -169,7 +169,7 @@ func TestOpsgenieNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewOpsgenieNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/pagerduty_test.go
+2 -2
View File
@@ -7,6 +7,7 @@ import (
"os"
"testing"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -15,7 +16,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
)
func TestPagerdutyNotifier(t *testing.T) {
@@ -135,7 +135,7 @@ func TestPagerdutyNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewPagerdutyNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/pushover_test.go
+2 -2
View File
@@ -14,7 +14,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -142,7 +142,7 @@ func TestPushoverNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewPushoverNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/sensugo_test.go
+2 -3
View File
@@ -10,8 +10,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -140,7 +139,7 @@ func TestSensuGoNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
sn, err := NewSensuGoNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/slack_test.go
+2 -3
View File
@@ -11,8 +11,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -171,7 +170,7 @@ func TestSlackNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewSlackNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/telegram_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"net/url"
"testing"
"github.com/grafana/grafana/pkg/components/simplejson"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -95,7 +95,7 @@ func TestTelegramNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewTelegramNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/threema_test.go
+3 -2
View File
@@ -5,6 +5,8 @@ import (
"net/url"
"testing"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
@@ -13,7 +15,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
)
func TestThreemaNotifier(t *testing.T) {
@@ -107,7 +108,7 @@ func TestThreemaNotifier(t *testing.T) {
Settings: settingsJSON,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewThreemaNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {
pkg/services/ngalert/notifier/channels/webhook_test.go
+3 -2
View File
@@ -6,6 +6,8 @@ import (
"net/url"
"testing"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/template"
"github.com/prometheus/alertmanager/types"
@@ -15,7 +17,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
)
func TestWebhookNotifier(t *testing.T) {
@@ -189,7 +190,7 @@ func TestWebhookNotifier(t *testing.T) {
OrgID: orgID,
}
secretsService := secretsManager.SetupTestService(t, nil)
secretsService := fakes.NewFakeSecretsService()
decryptFn := secretsService.GetDecryptedValue
pn, err := NewWebHookNotifier(m, tmpl, decryptFn)
if c.expInitError != "" {