lint: fix linter rules

andydunstall · andydunstall · commit 5bdee0ac98fb · 2024-06-24T06:39:18.000+01:00
Fixes linter rules after updating to v1.59.1.
diff --git a/agent/client/client_test.go b/agent/client/client_test.go
@@ -9,6 +9,7 @@ import (
 )
 
 func handler(w http.ResponseWriter, _ *http.Request) {
+	// nolint
 	fmt.Fprintln(w, "Hello from Piko")
 }
 
diff --git a/agent/reverseproxy/reverseproxy_test.go b/agent/reverseproxy/reverseproxy_test.go
@@ -58,7 +58,7 @@ func TestReverseProxy_Forward(t *testing.T) {
 	t.Run("timeout", func(t *testing.T) {
 		blockCh := make(chan struct{})
 		upstream := httptest.NewServer(http.HandlerFunc(
-			func(w http.ResponseWriter, r *http.Request) {
+			func(_ http.ResponseWriter, _ *http.Request) {
 				<-blockCh
 			},
 		))
diff --git a/cli/agent/command.go b/cli/agent/command.go
@@ -68,7 +68,7 @@ Examples:
 	conf.RegisterFlags(cmd.PersistentFlags())
 	loadConf.RegisterFlags(cmd.PersistentFlags())
 
-	cmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PersistentPreRun = func(_ *cobra.Command, _ []string) {
 		if err := loadConf.Load(&conf); err != nil {
 			fmt.Println(err.Error())
 			os.Exit(1)
diff --git a/cli/agent/http.go b/cli/agent/http.go
@@ -54,7 +54,7 @@ Timeout forwarding incoming HTTP requests to the upstream.`,
 
 	var logger log.Logger
 
-	cmd.PreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PreRun = func(_ *cobra.Command, args []string) {
 		// Discard any listeners in the configuration file and use from command
 		// line.
 		conf.Listeners = []config.ListenerConfig{{
@@ -73,7 +73,7 @@ Timeout forwarding incoming HTTP requests to the upstream.`,
 		}
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := runAgent(conf, logger); err != nil {
 			logger.Error("failed to run agent", zap.Error(err))
 			os.Exit(1)
diff --git a/cli/agent/start.go b/cli/agent/start.go
@@ -25,7 +25,7 @@ Examples:
 
 	var logger log.Logger
 
-	cmd.PreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PreRun = func(_ *cobra.Command, _ []string) {
 		var err error
 		logger, err = log.NewLogger(conf.Log.Level, conf.Log.Subsystems)
 		if err != nil {
@@ -39,7 +39,7 @@ Examples:
 		}
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := runAgent(conf, logger); err != nil {
 			logger.Error("failed to run agent", zap.Error(err))
 			os.Exit(1)
diff --git a/cli/agent/tcp.go b/cli/agent/tcp.go
@@ -51,7 +51,7 @@ Timeout connecting to the upstream.`,
 
 	var logger log.Logger
 
-	cmd.PreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PreRun = func(_ *cobra.Command, args []string) {
 		// Discard any listeners in the configuration file and use from command
 		// line.
 		conf.Listeners = []config.ListenerConfig{{
@@ -70,7 +70,7 @@ Timeout connecting to the upstream.`,
 		}
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := runAgent(conf, logger); err != nil {
 			logger.Error("failed to run agent", zap.Error(err))
 			os.Exit(1)
diff --git a/cli/forward/command.go b/cli/forward/command.go
@@ -49,7 +49,7 @@ Examples:
 	conf.RegisterFlags(cmd.PersistentFlags())
 	loadConf.RegisterFlags(cmd.PersistentFlags())
 
-	cmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PersistentPreRun = func(_ *cobra.Command, _ []string) {
 		if err := loadConf.Load(&conf); err != nil {
 			fmt.Println(err.Error())
 			os.Exit(1)
diff --git a/cli/forward/start.go b/cli/forward/start.go
@@ -25,7 +25,7 @@ Examples:
 
 	var logger log.Logger
 
-	cmd.PreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PreRun = func(_ *cobra.Command, _ []string) {
 		var err error
 		logger, err = log.NewLogger(conf.Log.Level, conf.Log.Subsystems)
 		if err != nil {
@@ -39,7 +39,7 @@ Examples:
 		}
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := runForward(conf, logger); err != nil {
 			logger.Error("failed to run forward", zap.Error(err))
 			os.Exit(1)
diff --git a/cli/forward/tcp.go b/cli/forward/tcp.go
@@ -30,7 +30,7 @@ Examples:
 
 	var logger log.Logger
 
-	cmd.PreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PreRun = func(_ *cobra.Command, args []string) {
 		// Discard any ports in the configuration file and use from command
 		// line.
 		conf.Ports = []config.PortConfig{{
@@ -46,7 +46,7 @@ Examples:
 		}
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := runForward(conf, logger); err != nil {
 			logger.Error("failed to run forward", zap.Error(err))
 			os.Exit(1)
diff --git a/cli/server/command.go b/cli/server/command.go
@@ -80,7 +80,7 @@ Examples:
 
 	var logger log.Logger
 
-	cmd.PreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PreRun = func(_ *cobra.Command, _ []string) {
 		if err := loadConf.Load(&conf); err != nil {
 			fmt.Println(err.Error())
 			os.Exit(1)
@@ -134,7 +134,7 @@ Examples:
 		}
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := runServer(&conf, logger); err != nil {
 			logger.Error("failed to run agent", zap.Error(err))
 			os.Exit(1)
diff --git a/cli/server/status/cluster.go b/cli/server/status/cluster.go
@@ -37,7 +37,7 @@ Examples:
 `,
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		showClusterNodes(c)
 	}
 
@@ -88,7 +88,7 @@ Examples:
 `,
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, args []string) {
 		showClusterNode(args[0], c)
 	}
 
diff --git a/cli/server/status/command.go b/cli/server/status/command.go
@@ -38,7 +38,7 @@ Examples:
 
 	c := client.NewClient(nil)
 
-	cmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+	cmd.PersistentPreRun = func(_ *cobra.Command, _ []string) {
 		if err := conf.Validate(); err != nil {
 			fmt.Printf("config: %s\n", err.Error())
 			os.Exit(1)
diff --git a/cli/server/status/gossip.go b/cli/server/status/gossip.go
@@ -37,7 +37,7 @@ Examples:
 `,
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		showGossipNodes(c)
 	}
 
@@ -83,7 +83,7 @@ Examples:
 `,
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, args []string) {
 		showGossipNode(args[0], c)
 	}
 
diff --git a/cli/server/status/upstream.go b/cli/server/status/upstream.go
@@ -33,7 +33,7 @@ Examples:
 `,
 	}
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		showUpstreamEndpoints(c)
 	}
 
diff --git a/cli/workload/requests.go b/cli/workload/requests.go
@@ -55,7 +55,7 @@ Examples:
 	// Register flags and set default values.
 	conf.RegisterFlags(cmd.Flags())
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := conf.Validate(); err != nil {
 			fmt.Printf("invalid config: %s\n", err.Error())
 			os.Exit(1)
diff --git a/cli/workload/upstreams.go b/cli/workload/upstreams.go
@@ -50,7 +50,7 @@ Examples:
 	// Register flags and set default values.
 	conf.RegisterFlags(cmd.Flags())
 
-	cmd.Run = func(cmd *cobra.Command, args []string) {
+	cmd.Run = func(_ *cobra.Command, _ []string) {
 		if err := conf.Validate(); err != nil {
 			fmt.Printf("invalid config: %s\n", err.Error())
 			os.Exit(1)
diff --git a/pkg/log/logger.go b/pkg/log/logger.go
@@ -220,7 +220,7 @@ func (l *nopLogger) Sync() error {
 
 func (l *nopLogger) StdLogger(_ zapcore.Level) *stdlog.Logger {
 	return stdlog.New(&loggerWriter{
-		logFunc: func(msg string, fields ...zap.Field) {
+		logFunc: func(_ string, _ ...zap.Field) {
 		},
 	}, "", 0)
 }
diff --git a/server/proxy/httpproxy_test.go b/server/proxy/httpproxy_test.go
@@ -71,6 +71,8 @@ func TestHTTPProxy_Forward(t *testing.T) {
 		proxy := NewHTTPProxy(
 			&fakeManager{
 				handler: func(endpointID string, allowForward bool) (upstream.Upstream, bool) {
+					assert.Equal(t, "my-endpoint", endpointID)
+					assert.True(t, allowForward)
 					return &tcpUpstream{
 						addr: server.Listener.Addr().String(),
 					}, true
@@ -101,7 +103,7 @@ func TestHTTPProxy_Forward(t *testing.T) {
 	t.Run("timeout", func(t *testing.T) {
 		blockCh := make(chan struct{})
 		server := httptest.NewServer(http.HandlerFunc(
-			func(w http.ResponseWriter, r *http.Request) {
+			func(_ http.ResponseWriter, _ *http.Request) {
 				<-blockCh
 			},
 		))
@@ -111,6 +113,8 @@ func TestHTTPProxy_Forward(t *testing.T) {
 		proxy := NewHTTPProxy(
 			&fakeManager{
 				handler: func(endpointID string, allowForward bool) (upstream.Upstream, bool) {
+					assert.Equal(t, "my-endpoint", endpointID)
+					assert.True(t, allowForward)
 					return &tcpUpstream{
 						addr: server.Listener.Addr().String(),
 					}, true
@@ -121,6 +125,7 @@ func TestHTTPProxy_Forward(t *testing.T) {
 		)
 
 		r := httptest.NewRequest(http.MethodGet, "/", nil)
+		r.Header.Add("x-piko-endpoint", "my-endpoint")
 
 		w := httptest.NewRecorder()
 		proxy.ServeHTTP(w, r)
@@ -139,6 +144,8 @@ func TestHTTPProxy_Forward(t *testing.T) {
 		proxy := NewHTTPProxy(
 			&fakeManager{
 				handler: func(endpointID string, allowForward bool) (upstream.Upstream, bool) {
+					assert.Equal(t, "my-endpoint", endpointID)
+					assert.True(t, allowForward)
 					return &tcpUpstream{
 						addr: "localhost:55555",
 					}, true
diff --git a/server/proxy/tcpproxy_test.go b/server/proxy/tcpproxy_test.go
@@ -49,6 +49,8 @@ func TestTCPProxy_Forward(t *testing.T) {
 		server := NewServer(
 			&fakeManager{
 				handler: func(endpointID string, allowForward bool) (upstream.Upstream, bool) {
+					assert.Equal(t, "my-endpoint", endpointID)
+					assert.True(t, allowForward)
 					return &tcpUpstream{
 						addr: echoLn.Addr().String(),
 					}, true
@@ -91,6 +93,8 @@ func TestTCPProxy_Forward(t *testing.T) {
 		proxy := NewTCPProxy(
 			&fakeManager{
 				handler: func(endpointID string, allowForward bool) (upstream.Upstream, bool) {
+					assert.Equal(t, "my-endpoint", endpointID)
+					assert.True(t, allowForward)
 					return &tcpUpstream{
 						addr: "localhost:55555",
 					}, true
diff --git a/tests/cluster_test.go b/tests/cluster_test.go
@@ -26,7 +26,7 @@ func TestCluster_Proxy(t *testing.T) {
 
 		remoteEndpointCh := make(chan string)
 		cluster.Nodes()[1].ClusterState().OnRemoteEndpointUpdate(
-			func(nodeID string, endpointID string) {
+			func(_ string, endpointID string) {
 				remoteEndpointCh <- endpointID
 			},
 		)
@@ -39,7 +39,7 @@ func TestCluster_Proxy(t *testing.T) {
 		assert.NoError(t, err)
 
 		server := httptest.NewUnstartedServer(http.HandlerFunc(
-			func(w http.ResponseWriter, r *http.Request) {},
+			func(_ http.ResponseWriter, _ *http.Request) {},
 		))
 		server.Listener = ln
 		go server.Start()
@@ -72,7 +72,7 @@ func TestCluster_Proxy(t *testing.T) {
 
 		remoteEndpointCh := make(chan string)
 		cluster.Nodes()[1].ClusterState().OnRemoteEndpointUpdate(
-			func(nodeID string, endpointID string) {
+			func(_ string, endpointID string) {
 				remoteEndpointCh <- endpointID
 			},
 		)

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func handler(w http.ResponseWriter, _ *http.Request) {`
	`12`	`+ // nolint`
`12`	`13`	`fmt.Fprintln(w, "Hello from Piko")`
`13`	`14`	`}`
`14`	`15`
Original file line number	Diff line number	Diff line change
@@ -54,7 +54,7 @@ Timeout forwarding incoming HTTP requests to the upstream.`,
`54`	`54`
`55`	`55`	`var logger log.Logger`
`56`	`56`
`57`		`- cmd.PreRun = func(cmd *cobra.Command, args []string) {`
	`57`	`+ cmd.PreRun = func(_ *cobra.Command, args []string) {`
`58`	`58`	`// Discard any listeners in the configuration file and use from command`
`59`	`59`	`// line.`
`60`	`60`	`conf.Listeners = []config.ListenerConfig{{`
@@ -73,7 +73,7 @@ Timeout forwarding incoming HTTP requests to the upstream.`,
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- cmd.Run = func(cmd *cobra.Command, args []string) {`
	`76`	`+ cmd.Run = func(_ *cobra.Command, _ []string) {`
`77`	`77`	`if err := runAgent(conf, logger); err != nil {`
`78`	`78`	`logger.Error("failed to run agent", zap.Error(err))`
`79`	`79`	`os.Exit(1)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ Examples:`
`25`	`25`
`26`	`26`	`var logger log.Logger`
`27`	`27`
`28`		`- cmd.PreRun = func(cmd *cobra.Command, args []string) {`
	`28`	`+ cmd.PreRun = func(_ *cobra.Command, _ []string) {`
`29`	`29`	`var err error`
`30`	`30`	`logger, err = log.NewLogger(conf.Log.Level, conf.Log.Subsystems)`
`31`	`31`	`if err != nil {`
`@@ -39,7 +39,7 @@ Examples:`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- cmd.Run = func(cmd *cobra.Command, args []string) {`
	`42`	`+ cmd.Run = func(_ *cobra.Command, _ []string) {`
`43`	`43`	`if err := runAgent(conf, logger); err != nil {`
`44`	`44`	`logger.Error("failed to run agent", zap.Error(err))`
`45`	`45`	`os.Exit(1)`
Original file line number	Diff line number	Diff line change
@@ -51,7 +51,7 @@ Timeout connecting to the upstream.`,
`51`	`51`
`52`	`52`	`var logger log.Logger`
`53`	`53`
`54`		`- cmd.PreRun = func(cmd *cobra.Command, args []string) {`
	`54`	`+ cmd.PreRun = func(_ *cobra.Command, args []string) {`
`55`	`55`	`// Discard any listeners in the configuration file and use from command`
`56`	`56`	`// line.`
`57`	`57`	`conf.Listeners = []config.ListenerConfig{{`
@@ -70,7 +70,7 @@ Timeout connecting to the upstream.`,
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- cmd.Run = func(cmd *cobra.Command, args []string) {`
	`73`	`+ cmd.Run = func(_ *cobra.Command, _ []string) {`
`74`	`74`	`if err := runAgent(conf, logger); err != nil {`
`75`	`75`	`logger.Error("failed to run agent", zap.Error(err))`
`76`	`76`	`os.Exit(1)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ Examples:`
`30`	`30`
`31`	`31`	`var logger log.Logger`
`32`	`32`
`33`		`- cmd.PreRun = func(cmd *cobra.Command, args []string) {`
	`33`	`+ cmd.PreRun = func(_ *cobra.Command, args []string) {`
`34`	`34`	`// Discard any ports in the configuration file and use from command`
`35`	`35`	`// line.`
`36`	`36`	`conf.Ports = []config.PortConfig{{`
`@@ -46,7 +46,7 @@ Examples:`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- cmd.Run = func(cmd *cobra.Command, args []string) {`
	`49`	`+ cmd.Run = func(_ *cobra.Command, _ []string) {`
`50`	`50`	`if err := runForward(conf, logger); err != nil {`
`51`	`51`	`logger.Error("failed to run forward", zap.Error(err))`
`52`	`52`	`os.Exit(1)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ Examples:`
`80`	`80`
`81`	`81`	`var logger log.Logger`
`82`	`82`
`83`		`- cmd.PreRun = func(cmd *cobra.Command, args []string) {`
	`83`	`+ cmd.PreRun = func(_ *cobra.Command, _ []string) {`
`84`	`84`	`if err := loadConf.Load(&conf); err != nil {`
`85`	`85`	`fmt.Println(err.Error())`
`86`	`86`	`os.Exit(1)`
`@@ -134,7 +134,7 @@ Examples:`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`- cmd.Run = func(cmd *cobra.Command, args []string) {`
	`137`	`+ cmd.Run = func(_ *cobra.Command, _ []string) {`
`138`	`138`	`if err := runServer(&conf, logger); err != nil {`
`139`	`139`	`logger.Error("failed to run agent", zap.Error(err))`
`140`	`140`	`os.Exit(1)`