chore: update dependecy, CI, and linter

vulcand · Mar 25, 2024 · ee138e5 · ee138e5
1 parent 842f413
commit ee138e5
Show file tree

Hide file tree

Showing 19 changed files with 94 additions and 85 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.55.2
+      GOLANGCI_LINT_VERSION: v1.57.1
 
     steps:
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,5 @@
 run:
-  deadline: 5m
-  skip-files: [ ]
-  skip-dirs: ["internal/holsterv4"]
+  timeout: 5m
 
 linters-settings:
   govet:
@@ -11,8 +9,6 @@ linters-settings:
       - shadow
   gocyclo:
     min-complexity: 15
-  maligned:
-    suggest-new: true
   goconst:
     min-len: 5
     min-occurrences: 3
@@ -50,6 +46,9 @@ linters-settings:
     settings:
       hugeParam:
         sizeThreshold: 100
+  testifylint:
+    disable:
+      - go-require
 
 linters:
   enable-all: true
@@ -92,11 +91,24 @@ linters:
     - nonamedreturns
     - gochecknoglobals # TODO(ldez) should be use on the project
     - nestif # TODO(ldez) should be use on the project
+    - musttag
+    - perfsprint # TODO(ldez) should be use on the project
+    - copyloopvar # TODO(ldez) should be use on the project (only for go>=1.22)
+    - intrange # TODO(ldez) should be use on the project (only for go>=1.22)
+
+output:
+  show-stats: true
+  sort-results: true
+  sort-order:
+    - linter
+    - file
 
 issues:
   exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-dirs:
+    - "internal/holsterv4"
   exclude:
     - 'ST1000: at least one file in a package should have a package comment' # TODO(ldez) must be fixed
     - 'package-comments: should have a package comment'

diff --git a/buffer/buffer_test.go b/buffer/buffer_test.go
@@ -19,7 +19,7 @@ import (
 )
 
 func TestSimple(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)
@@ -87,7 +87,7 @@ func TestChunkedEncodingSuccess(t *testing.T) {
 }
 
 func TestChunkedEncodingLimitReached(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)
@@ -118,7 +118,7 @@ func TestChunkedEncodingLimitReached(t *testing.T) {
 }
 
 func TestChunkedResponse(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		h := w.(http.Hijacker)
 		conn, _, _ := h.Hijack()
 		_, _ = fmt.Fprintf(conn, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n4\r\ntest\r\n5\r\ntest1\r\n5\r\ntest2\r\n0\r\n\r\n")
@@ -146,7 +146,7 @@ func TestChunkedResponse(t *testing.T) {
 }
 
 func TestRequestLimitReached(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)
@@ -173,7 +173,7 @@ func TestRequestLimitReached(t *testing.T) {
 }
 
 func TestResponseLimitReached(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello, this response is too large"))
 	})
 	t.Cleanup(srv.Close)
@@ -200,7 +200,7 @@ func TestResponseLimitReached(t *testing.T) {
 }
 
 func TestFileStreamingResponse(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello, this response is too large to fit in memory"))
 	})
 	t.Cleanup(srv.Close)
@@ -228,7 +228,7 @@ func TestFileStreamingResponse(t *testing.T) {
 }
 
 func TestCustomErrorHandler(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello, this response is too large"))
 	})
 	t.Cleanup(srv.Close)
@@ -243,7 +243,7 @@ func TestCustomErrorHandler(t *testing.T) {
 	})
 
 	// stream handler will forward requests to redirect
-	errHandler := utils.ErrorHandlerFunc(func(w http.ResponseWriter, req *http.Request, err error) {
+	errHandler := utils.ErrorHandlerFunc(func(w http.ResponseWriter, _ *http.Request, _ error) {
 		w.WriteHeader(http.StatusTeapot)
 		_, _ = w.Write([]byte(http.StatusText(http.StatusTeapot)))
 	})
@@ -259,7 +259,7 @@ func TestCustomErrorHandler(t *testing.T) {
 }
 
 func TestNotModified(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusNotModified)
 	})
 	t.Cleanup(srv.Close)
@@ -286,7 +286,7 @@ func TestNotModified(t *testing.T) {
 }
 
 func TestNoBody(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusOK)
 	})
 	t.Cleanup(srv.Close)
@@ -314,7 +314,7 @@ func TestNoBody(t *testing.T) {
 
 // Make sure that stream handler preserves TLS settings.
 func TestPreservesTLS(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		_, _ = w.Write([]byte("ok"))
 	})
@@ -346,7 +346,7 @@ func TestPreservesTLS(t *testing.T) {
 }
 
 func TestNotNilBody(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)
@@ -382,7 +382,7 @@ func TestNotNilBody(t *testing.T) {
 }
 
 func TestGRPCErrorResponse(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Grpc-Status", "10" /* ABORTED */)
 		w.WriteHeader(http.StatusOK)
 
@@ -414,7 +414,7 @@ func TestGRPCErrorResponse(t *testing.T) {
 }
 
 func TestGRPCOKResponse(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Grpc-Status", "0" /* OK */)
 		_, _ = w.Write([]byte("grpc-body"))
 		w.WriteHeader(http.StatusOK)

diff --git a/buffer/retry_test.go b/buffer/retry_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestSuccess(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)
@@ -32,7 +32,7 @@ func TestSuccess(t *testing.T) {
 }
 
 func TestRetryOnError(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)
@@ -52,7 +52,7 @@ func TestRetryOnError(t *testing.T) {
 }
 
 func TestRetryExceedAttempts(t *testing.T) {
-	srv := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
+	srv := testutils.NewHandler(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 	t.Cleanup(srv.Close)

diff --git a/cbreaker/cbreaker_test.go b/cbreaker/cbreaker_test.go
@@ -19,7 +19,7 @@ import (
 const triggerNetRatio = `NetworkErrorRatio() > 0.5`
 
 func TestStandbyCycle(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 
@@ -36,7 +36,7 @@ func TestStandbyCycle(t *testing.T) {
 }
 
 func TestFullCycle(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 
@@ -93,7 +93,7 @@ func TestFullCycle(t *testing.T) {
 }
 
 func TestRedirectWithPath(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 
@@ -114,7 +114,7 @@ func TestRedirectWithPath(t *testing.T) {
 	require.NoError(t, err)
 
 	client := &http.Client{
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+		CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
 			return fmt.Errorf("no redirects")
 		},
 	}
@@ -126,7 +126,7 @@ func TestRedirectWithPath(t *testing.T) {
 }
 
 func TestRedirect(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 
@@ -144,7 +144,7 @@ func TestRedirect(t *testing.T) {
 	require.NoError(t, err)
 
 	client := &http.Client{
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+		CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
 			return fmt.Errorf("no redirects")
 		},
 	}
@@ -156,7 +156,7 @@ func TestRedirect(t *testing.T) {
 }
 
 func TestTriggerDuringRecovery(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 
@@ -233,7 +233,7 @@ func TestSideEffects(t *testing.T) {
 		})
 	require.NoError(t, err)
 
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 

diff --git a/cbreaker/ratio_test.go b/cbreaker/ratio_test.go
@@ -24,7 +24,7 @@ func TestRampUp(t *testing.T) {
 		t.Log("Ratio", ratio)
 		t.Log("Expected", expected)
 		t.Log("Diff", diff)
-		assert.EqualValues(t, 0, round(diff, 0.5, 1))
+		assert.EqualValues(t, 0, round(diff, 0.5, 1)) //nolint:testifylint // the rounding is already handled.
 		clock.Advance(clock.Millisecond)
 	}
 }

diff --git a/connlimit/connlimit_test.go b/connlimit/connlimit_test.go
@@ -62,11 +62,11 @@ func TestHitLimitAndRelease(t *testing.T) {
 
 // We've hit the limit and were able to proceed once the request has completed.
 func TestCustomHandlers(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 
-	errHandler := utils.ErrorHandlerFunc(func(w http.ResponseWriter, req *http.Request, err error) {
+	errHandler := utils.ErrorHandlerFunc(func(w http.ResponseWriter, _ *http.Request, _ error) {
 		w.WriteHeader(http.StatusTeapot)
 		_, _ = w.Write([]byte(http.StatusText(http.StatusTeapot)))
 	})
@@ -84,7 +84,7 @@ func TestCustomHandlers(t *testing.T) {
 
 // We've hit the limit and were able to proceed once the request has completed.
 func TestFaultyExtract(t *testing.T) {
-	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	})
 

diff --git a/forward/example_test.go b/forward/example_test.go
@@ -11,7 +11,7 @@ import (
 
 func ExampleNew_customErrHandler() {
 	f := New(true)
-	f.ErrorHandler = func(w http.ResponseWriter, req *http.Request, err error) {
+	f.ErrorHandler = func(w http.ResponseWriter, _ *http.Request, _ error) {
 		w.WriteHeader(http.StatusTeapot)
 		_, _ = w.Write([]byte(http.StatusText(http.StatusTeapot)))
 	}
@@ -43,7 +43,7 @@ func ExampleNew_customErrHandler() {
 }
 
 func ExampleNew_responseModifier() {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	}))
 	defer srv.Close()
@@ -75,7 +75,7 @@ func ExampleNew_responseModifier() {
 }
 
 func ExampleNew_customTransport() {
-	srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	}))
 	defer srv.Close()
@@ -113,7 +113,7 @@ func ExampleNew_customTransport() {
 }
 
 func ExampleNewStateListener() {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = w.Write([]byte("hello"))
 	}))
 	defer srv.Close()

diff --git a/forward/fwd_websocket_test.go b/forward/fwd_websocket_test.go
@@ -219,7 +219,7 @@ func TestWebSocketPassHost(t *testing.T) {
 func TestWebSocketServerWithoutCheckOrigin(t *testing.T) {
 	f := New(true)
 
-	upgrader := gorillawebsocket.Upgrader{CheckOrigin: func(r *http.Request) bool {
+	upgrader := gorillawebsocket.Upgrader{CheckOrigin: func(_ *http.Request) bool {
 		return true
 	}}
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -412,7 +412,7 @@ func TestWebSocketUpgradeFailed(t *testing.T) {
 	f := New(true)
 
 	mux := http.NewServeMux()
-	mux.HandleFunc("/ws", func(w http.ResponseWriter, req *http.Request) {
+	mux.HandleFunc("/ws", func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 	})
 

diff --git a/go.mod b/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/mailgun/multibuf v0.1.2
 	github.com/segmentio/fasthash v1.0.3
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	github.com/vulcand/predicate v1.2.0
-	golang.org/x/net v0.20.0
+	golang.org/x/net v0.22.0
 )
 
 require (
@@ -18,8 +18,8 @@ require (
 	github.com/jonboulle/clockwork v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )