Merge remote-tracking branch 'origin/main' into arve/revive-rules

Signed-off-by: Arve Knudsen <[email protected]>

Author: aknuds1

.golangci.yml

@@ -66,8 +66,8 @@ linters:
       rules:
         main:
           deny:
-            #- pkg: "sync/atomic"
-              #desc: "Use go.uber.org/atomic instead of sync/atomic"
+            - pkg: "sync/atomic"
+              desc: "Use go.uber.org/atomic instead of sync/atomic"
             - pkg: "github.com/go-kit/kit/log"
               desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
             - pkg: "io/ioutil"
@@ -151,8 +151,6 @@ linters:
         - name: unexported-return
         - name: unreachable-code
         - name: unused-parameter
-          severity: warning
-          disabled: true
         - name: unused-receiver
         - name: var-declaration
         - name: var-naming

config/http_config.go

@@ -748,7 +748,7 @@ func NewFileSecret(file string) *FileSecret {
 	return &FileSecret{file: file}
 }
 
-func (s *FileSecret) Fetch(ctx context.Context) (string, error) {
+func (s *FileSecret) Fetch(context.Context) (string, error) {
 	fileBytes, err := os.ReadFile(s.file)
 	if err != nil {
 		return "", fmt.Errorf("unable to read file %s: %w", s.file, err)

config/http_config_test.go

@@ -31,11 +31,11 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.uber.org/atomic"
 	"gopkg.in/yaml.v2"
 )
 
@@ -181,7 +181,7 @@ func TestNewClientFromConfig(t *testing.T) {
 					InsecureSkipVerify: true,
 				},
 			},
-			handler: func(w http.ResponseWriter, r *http.Request) {
+			handler: func(w http.ResponseWriter, _ *http.Request) {
 				fmt.Fprint(w, ExpectedMessage)
 			},
 		},
@@ -195,7 +195,7 @@ func TestNewClientFromConfig(t *testing.T) {
 					InsecureSkipVerify: false,
 				},
 			},
-			handler: func(w http.ResponseWriter, r *http.Request) {
+			handler: func(w http.ResponseWriter, _ *http.Request) {
 				fmt.Fprint(w, ExpectedMessage)
 			},
 		},
@@ -933,7 +933,7 @@ type secretManager struct {
 	data map[string]string
 }
 
-func (m *secretManager) Fetch(ctx context.Context, secretRef string) (string, error) {
+func (m *secretManager) Fetch(_ context.Context, secretRef string) (string, error) {
 	secretData, ok := m.data[secretRef]
 	if !ok {
 		return "", fmt.Errorf("unknown secret %s", secretRef)
@@ -1044,7 +1044,7 @@ func TestTLSRoundTripper(t *testing.T) {
 
 	ca, cert, key := filepath.Join(tmpDir, "ca"), filepath.Join(tmpDir, "cert"), filepath.Join(tmpDir, "key")
 
-	handler := func(w http.ResponseWriter, r *http.Request) {
+	handler := func(w http.ResponseWriter, _ *http.Request) {
 		fmt.Fprint(w, ExpectedMessage)
 	}
 	testServer, err := newTestServer(handler)
@@ -1162,7 +1162,7 @@ func TestTLSRoundTripper(t *testing.T) {
 }
 
 func TestTLSRoundTripper_Inline(t *testing.T) {
-	handler := func(w http.ResponseWriter, r *http.Request) {
+	handler := func(w http.ResponseWriter, _ *http.Request) {
 		fmt.Fprint(w, ExpectedMessage)
 	}
 	testServer, err := newTestServer(handler)
@@ -1284,7 +1284,7 @@ func TestTLSRoundTripperRaces(t *testing.T) {
 
 	ca, cert, key := filepath.Join(tmpDir, "ca"), filepath.Join(tmpDir, "cert"), filepath.Join(tmpDir, "key")
 
-	handler := func(w http.ResponseWriter, r *http.Request) {
+	handler := func(w http.ResponseWriter, _ *http.Request) {
 		fmt.Fprint(w, ExpectedMessage)
 	}
 	testServer, err := newTestServer(handler)
@@ -1309,7 +1309,8 @@ func TestTLSRoundTripperRaces(t *testing.T) {
 
 	var wg sync.WaitGroup
 	ch := make(chan struct{})
-	var total, ok int64
+	total := atomic.NewInt64(0)
+	ok := atomic.NewInt64(0)
 	// Spawn 10 Go routines polling the server concurrently.
 	for i := 0; i < 10; i++ {
 		wg.Add(1)
@@ -1320,11 +1321,11 @@ func TestTLSRoundTripperRaces(t *testing.T) {
 				case <-ch:
 					return
 				default:
-					atomic.AddInt64(&total, 1)
+					total.Add(1)
 					r, err := c.Get(testServer.URL)
 					if err == nil {
 						r.Body.Close()
-						atomic.AddInt64(&ok, 1)
+						ok.Add(1)
 					}
 				}
 			}
@@ -1402,7 +1403,7 @@ type roundTrip struct {
 	theError    error
 }
 
-func (rt *roundTrip) RoundTrip(r *http.Request) (*http.Response, error) {
+func (rt *roundTrip) RoundTrip(*http.Request) (*http.Response, error) {
 	return rt.theResponse, rt.theError
 }
 
@@ -1875,7 +1876,7 @@ func TestModifyTLSCertificates(t *testing.T) {
 	defer os.RemoveAll(tmpDir)
 	ca, cert, key := filepath.Join(tmpDir, "ca"), filepath.Join(tmpDir, "cert"), filepath.Join(tmpDir, "key")
 
-	handler := func(w http.ResponseWriter, r *http.Request) {
+	handler := func(w http.ResponseWriter, _ *http.Request) {
 		fmt.Fprint(w, ExpectedMessage)
 	}
 	testServer, err := newTestServer(handler)

expfmt/decode.go

@@ -135,7 +135,7 @@ type errDecoder struct {
 	err error
 }
 
-func (d *errDecoder) Decode(v *dto.MetricFamily) error {
+func (d *errDecoder) Decode(*dto.MetricFamily) error {
 	return d.err
 }
 

expfmt/text_parse_test.go

@@ -1048,6 +1048,6 @@ type errReader struct {
 	err error
 }
 
-func (r *errReader) Read(p []byte) (int, error) {
+func (r *errReader) Read([]byte) (int, error) {
 	return 0, r.err
 }

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 	github.com/prometheus/client_model v0.6.2
 	github.com/stretchr/testify v1.10.0
+	go.uber.org/atomic v1.11.0
 	golang.org/x/net v0.42.0
 	golang.org/x/oauth2 v0.30.0
 	google.golang.org/protobuf v1.36.6

go.sum

@@ -45,6 +45,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
 golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=

promslog/slog.go

@@ -147,7 +147,7 @@ type Config struct {
 }
 
 func newGoKitStyleReplaceAttrFunc(lvl *Level) func(groups []string, a slog.Attr) slog.Attr {
-	return func(groups []string, a slog.Attr) slog.Attr {
+	return func(_ []string, a slog.Attr) slog.Attr {
 		key := a.Key
 		switch key {
 		case slog.TimeKey, "ts":

route/route_test.go

@@ -37,7 +37,7 @@ func TestRedirect(t *testing.T) {
 
 func TestContext(t *testing.T) {
 	router := New()
-	router.Get("/test/:foo/", func(w http.ResponseWriter, r *http.Request) {
+	router.Get("/test/:foo/", func(_ http.ResponseWriter, r *http.Request) {
 		want := "bar"
 		got := Param(r.Context(), "foo")
 		require.Equalf(t, want, got, "Unexpected context value: want %q, got %q", want, got)
@@ -50,7 +50,7 @@ func TestContext(t *testing.T) {
 
 func TestContextWithValue(t *testing.T) {
 	router := New()
-	router.Get("/test/:foo/", func(w http.ResponseWriter, r *http.Request) {
+	router.Get("/test/:foo/", func(_ http.ResponseWriter, r *http.Request) {
 		want := "bar"
 		got := Param(r.Context(), "foo")
 		require.Equalf(t, want, got, "Unexpected context value: want %q, got %q", want, got)
@@ -79,7 +79,7 @@ func TestContextWithValue(t *testing.T) {
 
 func TestContextWithoutValue(t *testing.T) {
 	router := New()
-	router.Get("/test", func(w http.ResponseWriter, r *http.Request) {
+	router.Get("/test", func(_ http.ResponseWriter, r *http.Request) {
 		want := ""
 		got := Param(r.Context(), "foo")
 		require.Equalf(t, want, got, "Unexpected context value: want %q, got %q", want, got)
@@ -109,7 +109,7 @@ func TestInstrumentation(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		c.router.Get("/foo", func(w http.ResponseWriter, r *http.Request) {})
+		c.router.Get("/foo", func(_ http.ResponseWriter, _ *http.Request) {})
 
 		r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/foo", nil)
 		require.NoErrorf(t, err, "Error building test request: %s", err)
@@ -149,7 +149,7 @@ func TestInstrumentations(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		c.router.Get("/foo", func(w http.ResponseWriter, r *http.Request) {})
+		c.router.Get("/foo", func(_ http.ResponseWriter, _ *http.Request) {})
 
 		r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/foo", nil)
 		require.NoErrorf(t, err, "Error building test request: %s", err)

server/static_file_server_test.go

@@ -23,7 +23,7 @@ import (
 
 type dummyFileSystem struct{}
 
-func (dummyFileSystem) Open(path string) (http.File, error) {
+func (dummyFileSystem) Open(string) (http.File, error) {
 	return http.Dir(".").Open(".")
 }