chore: lint tests (#161)

Author: nrwiersma

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
         go-version: [ "1.23", "1.24" ]
     runs-on: ubuntu-latest
     env:
-      GOLANGCI_LINT_VERSION: v2.0.2
+      GOLANGCI_LINT_VERSION: v2.1.5
 
     steps:
       - name: Checkout code

.golangci.yml

@@ -1,6 +1,4 @@
 version: "2"
-run:
-  tests: false
 
 formatters:
   enable:
@@ -35,14 +33,22 @@ linters:
     - inamedparam
     - ireturn
     - mnd
+    - nonamedreturns
     - nlreturn
+    - paralleltest
+    - testpackage
     - varnamelen
     - wrapcheck
     - wsl
   settings:
     cyclop:
-      max-complexity: 12
+      max-complexity: 15
     funlen:
-      lines: 80
+      lines: 160
   exclusions:
     generated: lax
+    rules:
+      - linters:
+          - gosec
+          - lll
+        path: _test\.go

errors/errors_test.go

@@ -1,18 +1,18 @@
 package errors_test
 
 import (
-	"errors"
 	"testing"
 
 	errorsx "github.com/hamba/pkg/v2/errors"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-const testErr = errorsx.Error("test error")
+const errTest = errorsx.Error("test error")
 
 func TestError(t *testing.T) {
-	err := testErr
+	err := errTest
 
-	assert.EqualError(t, err, "test error")
-	assert.True(t, errors.Is(err, testErr))
+	require.EqualError(t, err, "test error")
+	assert.ErrorIs(t, err, errTest)
 }

errors/reason/reason_test.go

@@ -19,7 +19,7 @@ func TestExtract(t *testing.T) {
 
 	reasons, errs := reason.Extract(errs)
 
-	require.NotEmpty(t, errs)
+	require.Error(t, errs)
 	assert.Equal(t, "test1\ntest2", errs.Error())
 	assert.Equal(t, []string{"First Error", "Second Error"}, reasons)
 }

http/healthz/healthz_test.go

@@ -24,7 +24,7 @@ func TestHandler(t *testing.T) {
 	h.ServeHTTP(rec, req)
 
 	assert.Equal(t, http.StatusOK, rec.Code)
-	assert.Equal(t, "", gotOutput)
+	assert.Empty(t, gotOutput)
 	assert.Equal(t, `ok`, rec.Body.String())
 }
 
@@ -42,7 +42,7 @@ func TestHandler_Verbose(t *testing.T) {
 	h.ServeHTTP(rec, req)
 
 	assert.Equal(t, http.StatusOK, rec.Code)
-	assert.Equal(t, "", gotOutput)
+	assert.Empty(t, gotOutput)
 	assert.Equal(t, "+ good ok\nreadyz check passed", rec.Body.String())
 }
 

http/ip_test.go

@@ -9,6 +9,8 @@ import (
 )
 
 func TestRealIP(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		req  *http.Request
@@ -54,7 +56,6 @@ func TestRealIP(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 

http/middleware/bench_test.go

@@ -13,11 +13,11 @@ import (
 func BenchmarkWithStats(b *testing.B) {
 	s := statter.New(statter.DiscardReporter, time.Second)
 	h := middleware.WithStats("test", s, http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {}),
+		func(http.ResponseWriter, *http.Request) {}),
 	)
 
 	resp := httptest.NewRecorder()
-	req, _ := http.NewRequest("GET", "/", nil)
+	req, _ := http.NewRequest(http.MethodGet, "/", nil)
 
 	b.ReportAllocs()
 	b.ResetTimer()

http/middleware/middleware_test.go

@@ -2,6 +2,7 @@ package middleware_test
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"net/http"
 	"net/http/httptest"
@@ -20,6 +21,8 @@ import (
 )
 
 func TestRecovery(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name    string
 		val     interface{}
@@ -38,18 +41,20 @@ func TestRecovery(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 
 			buf := bytes.Buffer{}
 			log := logger.New(&buf, logger.LogfmtFormat(), logger.Info)
 
-			next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			next := http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
 				panic(test.val)
 			})
 
-			req, _ := http.NewRequest("GET", "/", nil)
+			ctx, cancel := context.WithCancel(context.Background())
+			t.Cleanup(cancel)
+
+			req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/", nil)
 			resp := httptest.NewRecorder()
 
 			defer func() {
@@ -66,8 +71,10 @@ func TestRecovery(t *testing.T) {
 }
 
 func TestRequestID(t *testing.T) {
+	t.Parallel()
+
 	var nextCalled bool
-	next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+	next := http.HandlerFunc(func(_ http.ResponseWriter, req *http.Request) {
 		nextCalled = true
 
 		got, ok := request.IDFrom(req.Context())
@@ -76,7 +83,10 @@ func TestRequestID(t *testing.T) {
 		assert.NotEmpty(t, got)
 	})
 
-	req := httptest.NewRequest(http.MethodGet, "/some/thing", nil)
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
+	req := httptest.NewRequestWithContext(ctx, http.MethodGet, "/some/thing", nil)
 	rec := httptest.NewRecorder()
 
 	middleware.RequestID()(next).ServeHTTP(rec, req)
@@ -86,6 +96,8 @@ func TestRequestID(t *testing.T) {
 }
 
 func TestStats(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name        string
 		handlerName string
@@ -106,13 +118,12 @@ func TestStats(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 
 			m := &mockReporter{}
 			m.On("Counter", "requests", int64(1), test.wantTags)
-			wantTags := append(test.wantTags, [][2]string{{"code", "305"}, {"code-group", "3xx"}}...)
+			wantTags := append(test.wantTags, [][2]string{{"code", "305"}, {"code-group", "3xx"}}...) //nolint:gocritic
 			sort.Slice(wantTags, func(i, j int) bool {
 				return wantTags[i][0] < wantTags[j][0]
 			})
@@ -123,12 +134,15 @@ func TestStats(t *testing.T) {
 			s := statter.New(m, time.Second)
 
 			next := http.HandlerFunc(
-				func(w http.ResponseWriter, r *http.Request) {
-					w.WriteHeader(305)
+				func(w http.ResponseWriter, _ *http.Request) {
+					w.WriteHeader(http.StatusUseProxy)
 				})
 
+			ctx, cancel := context.WithCancel(context.Background())
+			t.Cleanup(cancel)
+
+			req, _ := http.NewRequestWithContext(ctx, http.MethodGet, test.path, nil)
 			resp := httptest.NewRecorder()
-			req, _ := http.NewRequest("GET", test.path, nil)
 
 			middleware.Stats(test.handlerName, s)(next).ServeHTTP(resp, req)
 
@@ -141,17 +155,22 @@ func TestStats(t *testing.T) {
 }
 
 func TestWithStats_Prometheus(t *testing.T) {
+	t.Parallel()
+
 	reporter := prometheus.New("test")
 	s := statter.New(reporter, time.Second)
 
 	h := middleware.WithStats("test-handler", s, http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(305)
+		func(w http.ResponseWriter, _ *http.Request) {
+			w.WriteHeader(http.StatusUseProxy)
 		}),
 	)
 
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
+	req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/foobar", nil)
 	resp := httptest.NewRecorder()
-	req, _ := http.NewRequest("GET", "/foobar", nil)
 
 	h.ServeHTTP(resp, req)
 

http/server/server_test.go

@@ -60,7 +60,7 @@ func TestGenericServer_Run(t *testing.T) {
 	url := "http://" + ln.Addr().String() + "/"
 	statusCode, _ := requireDoRequest(t, url)
 
-	assert.Equal(t, statusCode, http.StatusOK)
+	assert.Equal(t, http.StatusOK, statusCode)
 	assert.True(t, handlerCalled)
 
 	cancel()
@@ -123,7 +123,7 @@ func TestGenericServer_RunWithTLS(t *testing.T) {
 	url := "https://" + ln.Addr().String() + "/"
 	statusCode, _ := requireDoRequest(t, url)
 
-	assert.Equal(t, statusCode, http.StatusOK)
+	assert.Equal(t, http.StatusOK, statusCode)
 	assert.True(t, handlerCalled)
 
 	cancel()
@@ -149,7 +149,7 @@ func TestGenericServer_RunWithHooks(t *testing.T) {
 	}
 
 	postStartHookCalledCh := make(chan struct{})
-	srv.MustAddPostStartHook("test", func(t context.Context) error {
+	srv.MustAddPostStartHook("test", func(_ context.Context) error {
 		close(postStartHookCalledCh)
 		return nil
 	})
@@ -232,12 +232,12 @@ func TestGenericServer_RunWithHealthChecks(t *testing.T) {
 
 	url := "http://" + ln.Addr().String() + "/readyz?verbose=1"
 	statusCode, body := requireDoRequest(t, url)
-	assert.Equal(t, statusCode, http.StatusOK)
+	assert.Equal(t, http.StatusOK, statusCode)
 	assert.Equal(t, "+ postStartHook:test ok\n+ test ok\n+ shutdown ok\nreadyz check passed", body)
 
 	url = "http://" + ln.Addr().String() + "/livez?verbose=1"
 	statusCode, body = requireDoRequest(t, url)
-	assert.Equal(t, statusCode, http.StatusOK)
+	assert.Equal(t, http.StatusOK, statusCode)
 	assert.Equal(t, "+ test ok\nlivez check passed", body)
 
 	cancel()
@@ -298,7 +298,7 @@ func TestGenericServer_RunShutdownCausesReadyzToFail(t *testing.T) {
 
 	url := "http://" + ln.Addr().String() + "/readyz?verbose=1"
 	statusCode, body := requireDoRequest(t, url)
-	assert.Equal(t, statusCode, http.StatusInternalServerError)
+	assert.Equal(t, http.StatusInternalServerError, statusCode)
 	assert.Equal(t, "+ test ok\n- shutdown failed\nreadyz check failed\n", body)
 
 	select {
@@ -330,7 +330,7 @@ func TestGenericServer_RunHandlesServerError(t *testing.T) {
 
 	err = srv.Run(ctx)
 
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "starting server: listen tcp 127.0.0.1:")
 	assert.Contains(t, err.Error(), "bind: address already in use")
 }
@@ -393,7 +393,10 @@ func requireDoRequest(t *testing.T, path string) (int, string) {
 		},
 	}
 
-	req, err := http.NewRequest(http.MethodGet, path, nil)
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, path, nil)
 	require.NoError(t, err)
 
 	resp, err := client.Do(req)