Linting

Author: JacobsonMT

http/client_test.go

@@ -458,13 +458,13 @@ func TestSendWebhookOAuth2(t *testing.T) {
 
 			oauth2Server := httptest.NewServer(http.HandlerFunc(oauthHandler))
 			defer oauth2Server.Close()
-			tokenUrl := oauth2Server.URL + "/oauth2/token"
+			tokenURL := oauth2Server.URL + "/oauth2/token"
 
 			proxyRequestCnt := 0
 			proxyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				proxyRequestCnt++
 				// Verify this is a proxy request.
-				assert.Equal(t, tokenUrl, r.RequestURI, "expected request to be sent to oauth server")
+				assert.Equal(t, tokenURL, r.RequestURI, "expected request to be sent to oauth server")
 
 				// Simulate forwarding the request to the OAuth2 handler.
 				oauthHandler(w, r)
@@ -481,7 +481,7 @@ func TestSendWebhookOAuth2(t *testing.T) {
 			defer webhookServer.Close()
 
 			oauthConfig := tc.oauth2Config
-			oauthConfig.TokenURL = tokenUrl
+			oauthConfig.TokenURL = tokenURL
 
 			if oauthConfig.ProxyConfig != nil && oauthConfig.ProxyConfig.ProxyURL != "" {
 				oauthConfig.ProxyConfig.ProxyURL = proxyServer.URL

http/config.go

@@ -19,6 +19,8 @@ var (
 )
 
 // HTTPClientConfig holds common configuration for notifier HTTP clients.
+//
+//revive:disable-line:exported
 type HTTPClientConfig struct {
 	// The OAuth2 client credentials used to fetch a token for the targets.
 	OAuth2 *OAuth2Config `yaml:"oauth2,omitempty" json:"oauth2,omitempty"`
@@ -68,16 +70,16 @@ func (cfg *ProxyConfig) Proxy() (fn func(*http.Request) (*url.URL, error), err e
 		}, nil
 	}
 	if cfg.ProxyURL != "" {
-		proxyUrl, err := url.Parse(cfg.ProxyURL)
+		proxyURL, err := url.Parse(cfg.ProxyURL)
 		if err != nil {
 			return nil, fmt.Errorf("invalid proxy URL %q: %w", cfg.ProxyURL, err)
 		}
 		if cfg.NoProxy == "" {
-			return http.ProxyURL(proxyUrl), nil
+			return http.ProxyURL(proxyURL), nil
 		}
 		proxy := &httpproxy.Config{
-			HTTPProxy:  proxyUrl.String(),
-			HTTPSProxy: proxyUrl.String(),
+			HTTPProxy:  proxyURL.String(),
+			HTTPSProxy: proxyURL.String(),
 			NoProxy:    cfg.NoProxy,
 		}
 		proxyFn := proxy.ProxyFunc()

notify/factory.go

@@ -88,7 +88,7 @@ func BuildReceiverIntegrations(
 		})
 	}
 	for i, cfg := range receiver.EmailConfigs {
-		ci(i, cfg.Metadata, func(cli *http.Client) notificationChannel {
+		ci(i, cfg.Metadata, func(_ *http.Client) notificationChannel {
 			return email.New(cfg.Settings, cfg.Metadata, tmpl, emailSender, img, logger)
 		})
 	}
@@ -113,7 +113,7 @@ func BuildReceiverIntegrations(
 		})
 	}
 	for i, cfg := range receiver.MqttConfigs {
-		ci(i, cfg.Metadata, func(cli *http.Client) notificationChannel {
+		ci(i, cfg.Metadata, func(_ *http.Client) notificationChannel {
 			return mqtt.New(cfg.Settings, cfg.Metadata, tmpl, logger, nil)
 		})
 	}
@@ -143,7 +143,9 @@ func BuildReceiverIntegrations(
 		})
 	}
 	for i, cfg := range receiver.SNSConfigs {
-		ci(i, cfg.Metadata, func(cli *http.Client) notificationChannel { return sns.New(cfg.Settings, cfg.Metadata, tmpl, logger) })
+		ci(i, cfg.Metadata, func(_ *http.Client) notificationChannel {
+			return sns.New(cfg.Settings, cfg.Metadata, tmpl, logger)
+		})
 	}
 	for i, cfg := range receiver.SlackConfigs {
 		ci(i, cfg.Metadata, func(cli *http.Client) notificationChannel {