root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 169 Packages Projects Releases Wiki Activity

fix test
CodeQL checks / Detect whether code changed (push) Has been cancelled Details
CodeQL checks / Analyze (actions) (push) Has been cancelled Details
CodeQL checks / Analyze (go) (push) Has been cancelled Details
CodeQL checks / Analyze (javascript) (push) Has been cancelled Details

This commit is contained in:
Yuri Tseretyan 2025-10-01 10:26:00 -04:00
parent 19d24bfb46
commit 01deda16a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/ngalert/remote/alertmanager_test.go
View File

@ -453,7 +453,7 @@ func TestCompareAndSendConfiguration(t *testing.T) {
DefaultConfig: defaultGrafanaConfig, DefaultConfig: defaultGrafanaConfig,
} }
testAutogenFn := func(_ context.Context, _ log.Logger, _ int64, config *apimodels.PostableApiAlertingConfig, _ bool) error { testAutogenFn := func(_ context.Context, _ log.Logger, _ int64, config *apimodels.PostableApiAlertingConfig, _ notifier.InvalidReceiversAction) error {
newRoute := definition.Route{ newRoute := definition.Route{
Receiver: config.Receivers[0].Name, Receiver: config.Receivers[0].Name,
Match: map[string]string{"auto-gen-test": "true"}, Match: map[string]string{"auto-gen-test": "true"},
@ -497,7 +497,7 @@ func TestCompareAndSendConfiguration(t *testing.T) {
testAutogenRoutes, err := notifier.Load([]byte(testGrafanaConfigWithSecret)) testAutogenRoutes, err := notifier.Load([]byte(testGrafanaConfigWithSecret))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, testAutogenFn(nil, nil, 0, &testAutogenRoutes.AlertmanagerConfig, false)) require.NoError(t, testAutogenFn(nil, nil, 0, &testAutogenRoutes.AlertmanagerConfig, notifier.ErrorOnInvalidReceivers))
cfgWithAutogenRoutes := client.GrafanaAlertmanagerConfig{ cfgWithAutogenRoutes := client.GrafanaAlertmanagerConfig{
TemplateFiles: testAutogenRoutes.TemplateFiles, TemplateFiles: testAutogenRoutes.TemplateFiles,
AlertmanagerConfig: testAutogenRoutes.AlertmanagerConfig, AlertmanagerConfig: testAutogenRoutes.AlertmanagerConfig,
@ -1420,7 +1420,7 @@ func genAlert(active bool, labels map[string]string) amv2.PostableAlert {
} }
// errAutogenFn is an AutogenFn that always returns an error. // errAutogenFn is an AutogenFn that always returns an error.
func errAutogenFn(_ context.Context, _ log.Logger, _ int64, _ *definition.PostableApiAlertingConfig, _ bool) error { func errAutogenFn(_ context.Context, _ log.Logger, _ int64, _ *definition.PostableApiAlertingConfig, _ notifier.InvalidReceiversAction) error {
return errTest return errTest
} }