Alerting: Update alerting module + refactor (#111761)

* update alerting module
* replace compat with ones from alerting
* update type references Receiver and Integration to *Status
* update route in provisioning test that is invalid after recent change
* use right type for LINE ingtegration

pkg/tests/api/alerting/test-data/provisioning-mixed-set.yaml

@@ -144,16 +144,17 @@ policies:
       - label_keys_not_$$escaped
     # <list> a list of prometheus-like matchers that an alert rule has to fulfill to match the node (allowed chars
     #        [a-zA-Z_:])
-    matchers:
-      - alertname = Watchdog
-      - service_id_X = serviceX
-      - severity =~ "warning|critical"
-    # <list> a list of grafana-like matchers that an alert rule has to fulfill to match the node
-    object_matchers:
-      - ["alertname", "=", "CPUUsage"]
-      - ["service_id-X", "=", "serviceX"]
-      - ["severity", "=~", "warning|critical"]
     group_wait: 30s
     group_interval: 5m
     repeat_interval: 4h
-    routes: []
+    routes:
+      - matchers:
+          - alertname = Watchdog
+          - service_id_X = serviceX
+          - severity =~ "warning|critical"
+        # <list> a list of grafana-like matchers that an alert rule has to fulfill to match the node
+        object_matchers:
+          - [ "alertname", "=", "CPUUsage" ]
+          - [ "service_id-X", "=", "serviceX" ]
+          - [ "severity", "=~", "warning|critical" ]
+

pkg/tests/apis/alerting/notifications/receivers/receiver_test.go

@@ -9,10 +9,11 @@ import (
 	"net/http"
 	"path"
 	"slices"
-	"sort"
 	"strings"
 	"testing"
 
+	"github.com/grafana/alerting/notify/notifytest"
+	"github.com/grafana/alerting/receivers/line"
 	"github.com/grafana/alerting/receivers/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -1225,7 +1226,7 @@ func TestIntegrationCRUD(t *testing.T) {
 	t.Run("should be able to update default receiver", func(t *testing.T) {
 		require.NotNil(t, defaultReceiver)
 		newDefault := defaultReceiver.Copy().(*v0alpha1.Receiver)
-		newDefault.Spec.Integrations = append(newDefault.Spec.Integrations, createIntegration(t, "line"))
+		newDefault.Spec.Integrations = append(newDefault.Spec.Integrations, createIntegration(t, line.Type))
 
 		updatedReceiver, err := adminClient.Update(ctx, newDefault, v1.UpdateOptions{})
 		require.NoError(t, err)
@@ -1266,10 +1267,10 @@ func TestIntegrationCRUD(t *testing.T) {
 
 	var receiver *v0alpha1.Receiver
 	t.Run("should correctly persist all known integrations", func(t *testing.T) {
-		integrations := make([]v0alpha1.ReceiverIntegration, 0, len(notify.AllKnownConfigsForTesting))
-		keysIter := maps.Keys(notify.AllKnownConfigsForTesting)
+		integrations := make([]v0alpha1.ReceiverIntegration, 0, len(notifytest.AllKnownV1ConfigsForTesting))
+		keysIter := maps.Keys(notifytest.AllKnownV1ConfigsForTesting)
 		keys := slices.Collect(keysIter)
-		sort.Strings(keys)
+		slices.Sort(keys)
 		for _, key := range keys {
 			integrations = append(integrations, createIntegration(t, key))
 		}
@@ -1300,7 +1301,7 @@ func TestIntegrationCRUD(t *testing.T) {
 
 		export := legacyCli.ExportReceiverTyped(t, receiver.Spec.Title, true)
 		for _, integration := range export.Receivers {
-			expected := notify.AllKnownConfigsForTesting[strings.ToLower(integration.Type)] // to lower because there is LINE that is in different casing in API
+			expected := notifytest.AllKnownV1ConfigsForTesting[schema.IntegrationType(integration.Type)]
 			assert.JSONEqf(t, expected.Config, string(integration.Settings), "integration %s", integration.Type)
 		}
 	})
@@ -1313,7 +1314,7 @@ func TestIntegrationCRUD(t *testing.T) {
 			for _, integration := range get.Spec.Integrations {
 				integrationType := schema.IntegrationType(integration.Type)
 				t.Run(integration.Type, func(t *testing.T) {
-					expected := notify.AllKnownConfigsForTesting[strings.ToLower(integration.Type)]
+					expected := notifytest.AllKnownV1ConfigsForTesting[schema.IntegrationType(integration.Type)]
 					var fields map[string]any
 					require.NoError(t, json.Unmarshal([]byte(expected.Config), &fields))
 					typeSchema, ok := notify.GetSchemaVersionForIntegration(integrationType, schema.V1)
@@ -1336,11 +1337,11 @@ func TestIntegrationCRUD(t *testing.T) {
 	})
 
 	t.Run("should fail to persist receiver with invalid config", func(t *testing.T) {
-		keysIter := maps.Keys(notify.AllKnownConfigsForTesting)
+		keysIter := maps.Keys(notifytest.AllKnownV1ConfigsForTesting)
 		keys := slices.Collect(keysIter)
-		sort.Strings(keys)
+		slices.Sort(keys)
 		for _, key := range keys {
-			t.Run(key, func(t *testing.T) {
+			t.Run(string(key), func(t *testing.T) {
 				integration := createIntegration(t, key)
 				// Make the integration invalid, so it fails to create. This is usually done by sending empty settings.
 				clear(integration.Settings)
@@ -1503,18 +1504,18 @@ func persistInitialConfig(t *testing.T, amConfig definitions.PostableUserConfig)
 	require.NoError(t, err)
 }
 
-func createIntegration(t *testing.T, integrationType string) v0alpha1.ReceiverIntegration {
-	cfg, ok := notify.AllKnownConfigsForTesting[integrationType]
+func createIntegration(t *testing.T, integrationType schema.IntegrationType) v0alpha1.ReceiverIntegration {
+	cfg, ok := notifytest.AllKnownV1ConfigsForTesting[integrationType]
 	require.Truef(t, ok, "no known config for integration type %s", integrationType)
-	return createIntegrationWithSettings(t, integrationType, "v1", cfg.Config)
+	return createIntegrationWithSettings(t, integrationType, schema.V1, cfg.Config)
 }
-func createIntegrationWithSettings(t *testing.T, integrationType string, integrationVersion string, settingsJson string) v0alpha1.ReceiverIntegration {
+func createIntegrationWithSettings(t *testing.T, integrationType schema.IntegrationType, integrationVersion schema.Version, settingsJson string) v0alpha1.ReceiverIntegration {
 	settings := common.Unstructured{}
 	require.NoError(t, settings.UnmarshalJSON([]byte(settingsJson)))
 	return v0alpha1.ReceiverIntegration{
 		Settings:              settings.Object,
-		Type:                  integrationType,
-		Version:               integrationVersion,
+		Type:                  string(integrationType),
+		Version:               string(integrationVersion),
 		DisableResolveMessage: util.Pointer(false),
 	}
 }