From f9fc2e4568e440dd124ea44a50b5b1d22be70f1f Mon Sep 17 00:00:00 2001
From: Santiago <santiagohernandez.1997@gmail.com>
Date: Wed, 25 Oct 2023 17:11:53 +0200
Subject: [PATCH] Alerting: Remove ConfigHash() from the Alertmanager interface
 (#77134)

---
 .../ngalert/api/api_alertmanager_test.go        | 17 +++++++++--------
 pkg/services/ngalert/notifier/alertmanager.go   |  4 ----
 .../ngalert/notifier/multiorg_alertmanager.go   |  1 -
 .../notifier/multiorg_alertmanager_test.go      |  1 -
 pkg/services/ngalert/remote/alertmanager.go     |  4 ----
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go
index 90a9a3a0060..8ab0b168b4a 100644
--- a/pkg/services/ngalert/api/api_alertmanager_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_test.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"crypto/md5"
 	"encoding/json"
 	"math/rand"
 	"net/http"
@@ -230,21 +231,21 @@ func TestAlertmanagerConfig(t *testing.T) {
 		r := sut.RoutePostAlertingConfig(&rc, request)
 		require.Equal(t, 202, r.Status())
 
-		am, err := sut.mam.AlertmanagerFor(1)
-		require.NoError(t, err)
-		hash := am.ConfigHash()
-
 		getResponse := sut.RouteGetAlertingConfig(&rc)
 		require.Equal(t, 200, getResponse.Status())
-		postable, err := notifier.Load(getResponse.Body())
+
+		body := getResponse.Body()
+		hash := md5.Sum(body)
+		postable, err := notifier.Load(body)
 		require.NoError(t, err)
 
 		r = sut.RoutePostAlertingConfig(&rc, *postable)
 		require.Equal(t, 202, r.Status())
 
-		am, err = sut.mam.AlertmanagerFor(1)
-		require.NoError(t, err)
-		newHash := am.ConfigHash()
+		getResponse = sut.RouteGetAlertingConfig(&rc)
+		require.Equal(t, 200, getResponse.Status())
+
+		newHash := md5.Sum(getResponse.Body())
 		require.Equal(t, hash, newHash)
 	})
 
diff --git a/pkg/services/ngalert/notifier/alertmanager.go b/pkg/services/ngalert/notifier/alertmanager.go
index 38d43d850df..aa3e1cf1954 100644
--- a/pkg/services/ngalert/notifier/alertmanager.go
+++ b/pkg/services/ngalert/notifier/alertmanager.go
@@ -395,10 +395,6 @@ func (am *alertmanager) PutAlerts(_ context.Context, postableAlerts apimodels.Po
 	return am.Base.PutAlerts(alerts)
 }
 
-func (am *alertmanager) ConfigHash() [16]byte {
-	return am.Base.ConfigHash()
-}
-
 func (am *alertmanager) OrgID() int64 {
 	return am.orgID
 }
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
index aa3ac45b838..e20df5688e4 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
@@ -58,7 +58,6 @@ type Alertmanager interface {
 	StopAndWait()
 	Ready() bool
 	OrgID() int64
-	ConfigHash() [16]byte
 }
 
 type MultiOrgAlertmanager struct {
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
index b92678a833e..b6cdbf99256 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
@@ -288,7 +288,6 @@ func TestMultiOrgAlertmanager_AlertmanagerFor(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, "N/A", *am.GetStatus().VersionInfo.Version)
 		require.Equal(t, int64(2), am.OrgID())
-		require.NotNil(t, am.ConfigHash())
 	}
 
 	// Let's now remove the previous queried organization.
diff --git a/pkg/services/ngalert/remote/alertmanager.go b/pkg/services/ngalert/remote/alertmanager.go
index ab68702182f..cd31e04024b 100644
--- a/pkg/services/ngalert/remote/alertmanager.go
+++ b/pkg/services/ngalert/remote/alertmanager.go
@@ -301,10 +301,6 @@ func (am *Alertmanager) OrgID() int64 {
 	return am.orgID
 }
 
-func (am *Alertmanager) ConfigHash() [16]byte {
-	return [16]byte{}
-}
-
 type roundTripper struct {
 	tenantID          string
 	basicAuthPassword string