Linting

Author: JacobsonMT

notify/receivers.go

@@ -532,7 +532,7 @@ func GetActiveReceiversMap(r *dispatch.Route) map[string]struct{} {
 	return receiversMap
 }
 
-func parseHttpConfig(integration *GrafanaIntegrationConfig, decryptFn func(key string, fallback string) string) (*http.HTTPClientConfig, error) {
+func parseHTTPConfig(integration *GrafanaIntegrationConfig, decryptFn func(key string, fallback string) string) (*http.HTTPClientConfig, error) {
 	httpConfigSettings := struct {
 		HTTPConfig *http.HTTPClientConfig `yaml:"http_config,omitempty" json:"http_config,omitempty"`
 	}{}
@@ -552,7 +552,7 @@ func parseHttpConfig(integration *GrafanaIntegrationConfig, decryptFn func(key s
 }
 
 func newNotifierConfig[T interface{}](integration *GrafanaIntegrationConfig, idx int, settings T, decryptFn func(key string, fallback string) string) (*NotifierConfig[T], error) {
-	httpClientConfig, err := parseHttpConfig(integration, decryptFn)
+	httpClientConfig, err := parseHTTPConfig(integration, decryptFn)
 	if err != nil {
 		return nil, err
 	}

notify/receivers_test.go

@@ -491,8 +491,8 @@ func TestHTTPConfig(t *testing.T) {
 
 				invalidAddress := fmt.Errorf("invalid address")
 				allowedUrls := map[string]struct{}{
-					strings.TrimPrefix(oauth2Server.URL, "http://"): struct{}{},
-					strings.TrimPrefix(testServer.URL, "http://"):   struct{}{},
+					oauth2Server.URL: {},
+					testServer.URL:   {},
 				}
 				integrations, err := BuildGrafanaReceiverIntegrations(
 					parsed,
@@ -509,7 +509,7 @@ func TestHTTPConfig(t *testing.T) {
 						// we don't start calling real endpoints in the tests.
 						// Additionally, it will help ensure the test is correctly validating the OAuth2 flow.
 						Control: func(_, address string, _ syscall.RawConn) error {
-							if _, ok := allowedUrls[address]; !ok {
+							if _, ok := allowedUrls["http://"+address]; !ok {
 								return fmt.Errorf("%w: %s", invalidAddress, address)
 							}
 							return nil

notify/testing.go

@@ -128,7 +128,7 @@ var AllKnownConfigsForTesting = map[string]NotifierConfigTest{
 		NotifierType:                "prometheus-alertmanager",
 		Config:                      alertmanager.FullValidConfigForTesting,
 		Secrets:                     alertmanager.FullValidSecretsForTesting,
-		commonHttpConfigUnsupported: true,
+		commonHTTPConfigUnsupported: true,
 	},
 	"dingding": {NotifierType: "dingding",
 		Config: dinding.FullValidConfigForTesting,
@@ -138,7 +138,7 @@ var AllKnownConfigsForTesting = map[string]NotifierConfigTest{
 	},
 	"email": {NotifierType: "email",
 		Config:                      email.FullValidConfigForTesting,
-		commonHttpConfigUnsupported: true,
+		commonHTTPConfigUnsupported: true,
 	},
 	"googlechat": {NotifierType: "googlechat",
 		Config:  googlechat.FullValidConfigForTesting,
@@ -159,7 +159,7 @@ var AllKnownConfigsForTesting = map[string]NotifierConfigTest{
 	"mqtt": {NotifierType: "mqtt",
 		Config:                      mqtt.FullValidConfigForTesting,
 		Secrets:                     mqtt.FullValidSecretsForTesting,
-		commonHttpConfigUnsupported: true,
+		commonHTTPConfigUnsupported: true,
 	},
 	"oncall": {NotifierType: "oncall",
 		Config:  oncall.FullValidConfigForTesting,
@@ -184,11 +184,11 @@ var AllKnownConfigsForTesting = map[string]NotifierConfigTest{
 	"slack": {NotifierType: "slack",
 		Config:                      slack.FullValidConfigForTesting,
 		Secrets:                     slack.FullValidSecretsForTesting,
-		commonHttpConfigUnsupported: true,
+		commonHTTPConfigUnsupported: true,
 	},
 	"sns": {NotifierType: "sns",
 		Config:                      sns.FullValidConfigForTesting,
-		commonHttpConfigUnsupported: true,
+		commonHTTPConfigUnsupported: true,
 	},
 	"teams": {NotifierType: "teams",
 		Config: teams.FullValidConfigForTesting,
@@ -259,7 +259,7 @@ type NotifierConfigTest struct {
 	NotifierType                string
 	Config                      string
 	Secrets                     string
-	commonHttpConfigUnsupported bool
+	commonHTTPConfigUnsupported bool
 }
 
 func (n NotifierConfigTest) GetRawNotifierConfig(name string) *GrafanaIntegrationConfig {
@@ -275,7 +275,7 @@ func (n NotifierConfigTest) GetRawNotifierConfig(name string) *GrafanaIntegratio
 	}
 
 	config := []byte(n.Config)
-	if !n.commonHttpConfigUnsupported {
+	if !n.commonHTTPConfigUnsupported {
 		var err error
 		config, err = MergeSettings([]byte(n.Config), []byte(FullValidHTTPConfigForTesting))
 		if err != nil {