Fix lint: upgrade to first version that supports go1.21

jkh52 · jkh52 · commit 0416f5e62fdb · 2024-04-02T20:36:04.000-07:00
https://github.com/golangci/golangci-lint/releases/tag/v1.54.0
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ endif
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 INSTALL_LOCATION:=$(shell go env GOPATH)/bin
-GOLANGCI_LINT_VERSION ?= 1.51.2
+GOLANGCI_LINT_VERSION ?= 1.54.0
 GOSEC_VERSION ?= 2.13.1
 
 REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
diff --git a/cmd/server/app/server.go b/cmd/server/app/server.go
@@ -393,7 +393,7 @@ func (p *Proxy) runAgentServer(o *options.ProxyRunOptions, server *server.ProxyS
 	return nil
 }
 
-func (p *Proxy) runAdminServer(o *options.ProxyRunOptions, server *server.ProxyServer) error {
+func (p *Proxy) runAdminServer(o *options.ProxyRunOptions, _ *server.ProxyServer) error {
 	muxHandler := http.NewServeMux()
 	muxHandler.Handle("/metrics", promhttp.Handler())
 	if o.EnableProfiling {
diff --git a/cmd/test-server/main.go b/cmd/test-server/main.go
@@ -143,15 +143,15 @@ func SetupSignalHandler() (stopCh <-chan struct{}) {
 	return stop
 }
 
-func returnSuccess(w http.ResponseWriter, req *http.Request) {
+func returnSuccess(w http.ResponseWriter, _ *http.Request) {
 	fmt.Fprintf(w, "<!DOCTYPE html>\n<html>\n    <head>\n        <title>Success</title>\n    </head>\n    <body>\n        <p>The success test page!</p>\n    </body>\n</html>")
 }
 
-func returnError(w http.ResponseWriter, req *http.Request) {
+func returnError(w http.ResponseWriter, _ *http.Request) {
 	http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 }
 
-func closeNoResponse(w http.ResponseWriter, req *http.Request) {
+func closeNoResponse(w http.ResponseWriter, _ *http.Request) {
 	hj, ok := w.(http.Hijacker)
 	if !ok {
 		http.Error(w, "webserver doesn't support hijacking", http.StatusInternalServerError)
diff --git a/pkg/server/backend_manager.go b/pkg/server/backend_manager.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"math/rand"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -278,12 +279,7 @@ func NewDefaultBackendStorage(idTypes []header.IdentifierType) *DefaultBackendSt
 }
 
 func containIDType(idTypes []header.IdentifierType, idType header.IdentifierType) bool {
-	for _, it := range idTypes {
-		if it == idType {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(idTypes, idType)
 }
 
 // addBackend adds a backend.
diff --git a/pkg/server/default_route_backend_manager.go b/pkg/server/default_route_backend_manager.go
@@ -36,7 +36,7 @@ func NewDefaultRouteBackendManager() *DefaultRouteBackendManager {
 }
 
 // Backend tries to get a backend that advertises default route, with random selection.
-func (dibm *DefaultRouteBackendManager) Backend(ctx context.Context) (Backend, error) {
+func (dibm *DefaultRouteBackendManager) Backend(_ context.Context) (Backend, error) {
 	return dibm.GetRandomBackend()
 }
 
diff --git a/tests/agent_disconnect_test.go b/tests/agent_disconnect_test.go
@@ -173,7 +173,7 @@ func clientRequest(c *http.Client, addr string) ([]byte, error) {
 	return data, nil
 }
 
-func createGrpcTunnelClient(ctx context.Context, proxyAddr, addr string) (*http.Client, error) {
+func createGrpcTunnelClient(ctx context.Context, proxyAddr, _ string) (*http.Client, error) {
 	tunnel, err := createSingleUseGrpcTunnel(ctx, proxyAddr)
 	if err != nil {
 		return nil, err
@@ -189,7 +189,7 @@ func createGrpcTunnelClient(ctx context.Context, proxyAddr, addr string) (*http.
 	return c, nil
 }
 
-func createHTTPConnectClient(ctx context.Context, proxyAddr, addr string) (*http.Client, error) {
+func createHTTPConnectClient(_ context.Context, proxyAddr, addr string) (*http.Client, error) {
 	conn, err := net.Dial("unix", proxyAddr)
 	if err != nil {
 		return nil, err
diff --git a/tests/framework/agent.go b/tests/framework/agent.go
@@ -208,6 +208,7 @@ func (a *externalAgent) waitForLiveness() error {
 }
 
 func agentOptions(t testing.TB, opts AgentOpts) (*agentopts.GrpcProxyAgentOptions, error) {
+	t.Helper()
 	o := agentopts.NewGrpcProxyAgentOptions()
 
 	host, port, err := net.SplitHostPort(opts.ServerAddr)
diff --git a/tests/framework/proxy_server.go b/tests/framework/proxy_server.go
@@ -136,6 +136,7 @@ func (ps *inProcessProxyServer) Metrics() metricstest.ServerTester {
 }
 
 func serverOptions(t testing.TB, opts ProxyServerOpts) (*serveropts.ProxyRunOptions, error) {
+	t.Helper()
 	o := serveropts.NewProxyRunOptions()
 
 	o.ServerCount = uint(opts.ServerCount)
diff --git a/tests/ha_proxy_server_test.go b/tests/ha_proxy_server_test.go
@@ -37,7 +37,7 @@ type tcpLB struct {
 	backends []string
 }
 
-func copy(wc io.WriteCloser, r io.Reader) {
+func ioCopy(wc io.WriteCloser, r io.Reader) {
 	defer wc.Close()
 	io.Copy(wc, r)
 }
@@ -48,8 +48,8 @@ func (lb *tcpLB) handleConnection(in net.Conn, backend string) {
 		lb.t.Log(err)
 		return
 	}
-	go copy(out, in)
-	go copy(in, out)
+	go ioCopy(out, in)
+	go ioCopy(in, out)
 }
 
 func (lb *tcpLB) serve(stopCh chan struct{}) string {
diff --git a/tests/proxy_test.go b/tests/proxy_test.go
@@ -76,7 +76,7 @@ func newSizedServer(length, chunks int) *testServer {
 	}
 }
 
-func (s *testServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+func (s *testServer) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
 	for i := 0; i < s.chunks; i++ {
 		w.Write(s.echo)
 	}
@@ -94,7 +94,7 @@ func newWaitingServer() *waitingServer {
 	}
 }
 
-func (s *waitingServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (s *waitingServer) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
 	close(s.requestReceivedCh)
 	<-s.respondCh // Wait for permission to respond.
 	w.Write([]byte("hello"))
@@ -114,7 +114,7 @@ func newDelayedServer() *delayedServer {
 
 var _ = newDelayedServer() // Suppress unused lint error.
 
-func (s *delayedServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (s *delayedServer) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
 	delay := time.Duration(rand.Int63n(int64(s.maxWait-s.minWait))) + s.minWait /* #nosec G404 */
 	time.Sleep(delay)
 	w.Write([]byte("hello"))

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ func (p Proxy) runAgentServer(o options.ProxyRunOptions, server *server.ProxyS`
`393`	`393`	`return nil`
`394`	`394`	`}`
`395`	`395`
`396`		`-func (p Proxy) runAdminServer(o options.ProxyRunOptions, server *server.ProxyServer) error {`
	`396`	`+func (p Proxy) runAdminServer(o options.ProxyRunOptions, _ *server.ProxyServer) error {`
`397`	`397`	`muxHandler := http.NewServeMux()`
`398`	`398`	`muxHandler.Handle("/metrics", promhttp.Handler())`
`399`	`399`	`if o.EnableProfiling {`
Original file line number	Diff line number	Diff line change
`@@ -143,15 +143,15 @@ func SetupSignalHandler() (stopCh <-chan struct{}) {`
`143`	`143`	`return stop`
`144`	`144`	`}`
`145`	`145`
`146`		`-func returnSuccess(w http.ResponseWriter, req *http.Request) {`
	`146`	`+func returnSuccess(w http.ResponseWriter, _ *http.Request) {`
`147`	`147`	`fmt.Fprintf(w, "<!DOCTYPE html>\n<html>\n <head>\n <title>Success</title>\n </head>\n <body>\n <p>The success test page!</p>\n </body>\n</html>")`
`148`	`148`	`}`
`149`	`149`
`150`		`-func returnError(w http.ResponseWriter, req *http.Request) {`
	`150`	`+func returnError(w http.ResponseWriter, _ *http.Request) {`
`151`	`151`	`http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)`
`152`	`152`	`}`
`153`	`153`
`154`		`-func closeNoResponse(w http.ResponseWriter, req *http.Request) {`
	`154`	`+func closeNoResponse(w http.ResponseWriter, _ *http.Request) {`
`155`	`155`	`hj, ok := w.(http.Hijacker)`
`156`	`156`	`if !ok {`
`157`	`157`	`http.Error(w, "webserver doesn't support hijacking", http.StatusInternalServerError)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func NewDefaultRouteBackendManager() *DefaultRouteBackendManager {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// Backend tries to get a backend that advertises default route, with random selection.`
`39`		`-func (dibm *DefaultRouteBackendManager) Backend(ctx context.Context) (Backend, error) {`
	`39`	`+func (dibm *DefaultRouteBackendManager) Backend(_ context.Context) (Backend, error) {`
`40`	`40`	`return dibm.GetRandomBackend()`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,7 @@ func (a *externalAgent) waitForLiveness() error {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`func agentOptions(t testing.TB, opts AgentOpts) (*agentopts.GrpcProxyAgentOptions, error) {`
	`211`	`+ t.Helper()`
`211`	`212`	`o := agentopts.NewGrpcProxyAgentOptions()`
`212`	`213`
`213`	`214`	`host, port, err := net.SplitHostPort(opts.ServerAddr)`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ func (ps *inProcessProxyServer) Metrics() metricstest.ServerTester {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`func serverOptions(t testing.TB, opts ProxyServerOpts) (*serveropts.ProxyRunOptions, error) {`
	`139`	`+ t.Helper()`
`139`	`140`	`o := serveropts.NewProxyRunOptions()`
`140`	`141`
`141`	`142`	`o.ServerCount = uint(opts.ServerCount)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ type tcpLB struct {`
`37`	`37`	`backends []string`
`38`	`38`	`}`
`39`	`39`
`40`		`-func copy(wc io.WriteCloser, r io.Reader) {`
	`40`	`+func ioCopy(wc io.WriteCloser, r io.Reader) {`
`41`	`41`	`defer wc.Close()`
`42`	`42`	`io.Copy(wc, r)`
`43`	`43`	`}`
`@@ -48,8 +48,8 @@ func (lb *tcpLB) handleConnection(in net.Conn, backend string) {`
`48`	`48`	`lb.t.Log(err)`
`49`	`49`	`return`
`50`	`50`	`}`
`51`		`- go copy(out, in)`
`52`		`- go copy(in, out)`
	`51`	`+ go ioCopy(out, in)`
	`52`	`+ go ioCopy(in, out)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func (lb *tcpLB) serve(stopCh chan struct{}) string {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func newSizedServer(length, chunks int) *testServer {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`-func (s testServer) ServeHTTP(w http.ResponseWriter, req http.Request) {`
	`79`	`+func (s testServer) ServeHTTP(w http.ResponseWriter, _ http.Request) {`
`80`	`80`	`for i := 0; i < s.chunks; i++ {`
`81`	`81`	`w.Write(s.echo)`
`82`	`82`	`}`
`@@ -94,7 +94,7 @@ func newWaitingServer() *waitingServer {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`-func (s waitingServer) ServeHTTP(w http.ResponseWriter, r http.Request) {`
	`97`	`+func (s waitingServer) ServeHTTP(w http.ResponseWriter, _ http.Request) {`
`98`	`98`	`close(s.requestReceivedCh)`
`99`	`99`	`<-s.respondCh // Wait for permission to respond.`
`100`	`100`	`w.Write([]byte("hello"))`
`@@ -114,7 +114,7 @@ func newDelayedServer() *delayedServer {`
`114`	`114`
`115`	`115`	`var _ = newDelayedServer() // Suppress unused lint error.`
`116`	`116`
`117`		`-func (s delayedServer) ServeHTTP(w http.ResponseWriter, r http.Request) {`
	`117`	`+func (s delayedServer) ServeHTTP(w http.ResponseWriter, _ http.Request) {`
`118`	`118`	`delay := time.Duration(rand.Int63n(int64(s.maxWait-s.minWait))) + s.minWait /* #nosec G404 */`
`119`	`119`	`time.Sleep(delay)`
`120`	`120`	`w.Write([]byte("hello"))`