Rebase conflict fixes

Author: JacobsonMT

http/client.go

@@ -15,9 +15,10 @@ import (
 	"github.com/benbjohnson/clock"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	commoncfg "github.com/prometheus/common/config"
 	"golang.org/x/oauth2"
 
+	commoncfg "github.com/prometheus/common/config"
+
 	"github.com/grafana/alerting/receivers"
 )
 

http/client_test.go

@@ -549,5 +549,5 @@ func TestToHTTPClientOption(t *testing.T) {
 	// Verify number of fields using reflection
 	tp := reflect.TypeOf(clientConfiguration{})
 	// You need to increase the number of fields covered in this test, if you add a new field to the configuration struct.
-	require.Equalf(t, 3, tp.NumField(), "Not all fields are converted to HTTPClientOption, which means that the configuration will not be supported in upstream integrations")
+	require.Equalf(t, 4, tp.NumField(), "Not all fields are converted to HTTPClientOption, which means that the configuration will not be supported in upstream integrations")
 }

notify/factory_test.go

@@ -10,9 +10,10 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/stretchr/testify/require"
+
 	"github.com/prometheus/alertmanager/config"
 	commoncfg "github.com/prometheus/common/config"
-	"github.com/stretchr/testify/require"
 
 	"github.com/prometheus/alertmanager/notify"
 
@@ -160,7 +161,7 @@ func TestBuildReceiversIntegrations(t *testing.T) {
 			tmpl,
 			imageProvider,
 			NoopDecrypt,
-			NoopDecode,
+			DecodeSecretsFromBase64,
 			emailService,
 			nil,
 			func(_ string, n notify.Notifier) notify.Notifier {
@@ -206,7 +207,7 @@ func TestBuildReceiversIntegrations(t *testing.T) {
 			tmpl,
 			imageProvider,
 			NoopDecrypt,
-			NoopDecode,
+			DecodeSecretsFromBase64,
 			emailService,
 			nil,
 			func(_ string, n notify.Notifier) notify.Notifier {