chore: Fix linting errors (#199)

When updating go to 1.21 in #198 the linter flags these as unused but the 1.20 linter doesn't seem to catch them. Fixing the linting errors separate from the go upgrade. --------- Signed-off-by: Nicole Hubbard <[email protected]>
infratographer · Apr 2, 2024 · ecf4e94 · ecf4e94
1 parent f8d5a6f
commit ecf4e94
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml
@@ -15,7 +15,7 @@ jobs:
           go-version: '1.20'
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.52.2
+          version: v1.56.2
           args: --timeout=5m
diff --git a/echox/echo_test.go b/echox/echo_test.go
@@ -623,6 +623,7 @@ func TestServe(t *testing.T) {
 
 					return
 				}
+
 				reqResp = resp
 
 				_, _ = io.Copy(io.Discard, resp.Body)
@@ -702,7 +703,7 @@ func TestAddReadinessCheck(t *testing.T) {
 		{
 			"single check, ok",
 			map[string]CheckFunc{
-				"test": func(ctx context.Context) error {
+				"test": func(_ context.Context) error {
 					return nil
 				},
 			},
@@ -712,7 +713,7 @@ func TestAddReadinessCheck(t *testing.T) {
 		{
 			"single check, fail",
 			map[string]CheckFunc{
-				"test": func(ctx context.Context) error {
+				"test": func(_ context.Context) error {
 					return errored
 				},
 			},
@@ -722,10 +723,10 @@ func TestAddReadinessCheck(t *testing.T) {
 		{
 			"multiple checks, ok",
 			map[string]CheckFunc{
-				"test1": func(ctx context.Context) error {
+				"test1": func(_ context.Context) error {
 					return nil
 				},
-				"test2": func(ctx context.Context) error {
+				"test2": func(_ context.Context) error {
 					return nil
 				},
 			},
@@ -735,10 +736,10 @@ func TestAddReadinessCheck(t *testing.T) {
 		{
 			"multiple checks, first fail",
 			map[string]CheckFunc{
-				"test1": func(ctx context.Context) error {
+				"test1": func(_ context.Context) error {
 					return errored
 				},
-				"test2": func(ctx context.Context) error {
+				"test2": func(_ context.Context) error {
 					return nil
 				},
 			},
@@ -748,10 +749,10 @@ func TestAddReadinessCheck(t *testing.T) {
 		{
 			"multiple checks, last fail",
 			map[string]CheckFunc{
-				"test1": func(ctx context.Context) error {
+				"test1": func(_ context.Context) error {
 					return nil
 				},
-				"test2": func(ctx context.Context) error {
+				"test2": func(_ context.Context) error {
 					return errored
 				},
 			},
@@ -761,10 +762,10 @@ func TestAddReadinessCheck(t *testing.T) {
 		{
 			"multiple checks, all fail",
 			map[string]CheckFunc{
-				"test1": func(ctx context.Context) error {
+				"test1": func(_ context.Context) error {
 					return errored
 				},
-				"test2": func(ctx context.Context) error {
+				"test2": func(_ context.Context) error {
 					return errored
 				},
 			},

diff --git a/echox/echozap/middleware_test.go b/echox/echozap/middleware_test.go
@@ -29,7 +29,7 @@ func TestToMiddleware(t *testing.T) {
 		}
 	}
 	returnError := func(iErr any) echo.HandlerFunc {
-		return func(c echo.Context) error {
+		return func(_ echo.Context) error {
 			if err, ok := iErr.(error); ok {
 				return err
 			}
@@ -268,6 +268,7 @@ func TestToMiddleware(t *testing.T) {
 			if tc.config.Logger != nil {
 				tc.config.Logger = zap.New(obsZapCore)
 			}
+
 			mdw, err := tc.config.ToMiddleware()
 
 			if tc.expectConfigError != nil {

diff --git a/entx/gql_hooks.go b/entx/gql_hooks.go
@@ -26,7 +26,7 @@ import (
 //
 //nolint:goerr113
 var (
-	removeNodeGoModel = func(g *gen.Graph, s *ast.Schema) error {
+	removeNodeGoModel = func(_ *gen.Graph, s *ast.Schema) error {
 		n, ok := s.Types["Node"]
 		if !ok {
 			return errors.New("failed to find node interface in schema")
@@ -47,7 +47,7 @@ var (
 		return nil
 	}
 
-	removeNodeQueries = func(g *gen.Graph, s *ast.Schema) error {
+	removeNodeQueries = func(_ *gen.Graph, s *ast.Schema) error {
 		q, ok := s.Types["Query"]
 		if !ok {
 			return errors.New("failed to find query definition in schema")
@@ -69,7 +69,7 @@ var (
 		return nil
 	}
 
-	setPageInfoShareable = func(g *gen.Graph, s *ast.Schema) error {
+	setPageInfoShareable = func(_ *gen.Graph, s *ast.Schema) error {
 		q, ok := s.Types["PageInfo"]
 		if !ok {
 			return nil
@@ -80,7 +80,7 @@ var (
 		return nil
 	}
 
-	addJSONScalar = func(g *gen.Graph, s *ast.Schema) error {
+	addJSONScalar = func(_ *gen.Graph, s *ast.Schema) error {
 		s.Types["JSON"] = &ast.Definition{
 			Kind:        ast.Scalar,
 			Description: "A valid JSON string.",

diff --git a/entx/json_test.go b/entx/json_test.go
@@ -48,10 +48,12 @@ func TestUnmarshalRawMessage(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := UnmarshalRawMessage(tt.arg)
+
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UnmarshalRawMessage() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
+
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("UnmarshalRawMessage() = %s, want %s", got, tt.want)
 			}

diff --git a/ginx/gin.go b/ginx/gin.go
@@ -44,7 +44,7 @@ type LogFunc func(c *gin.Context) []zapcore.Field
 type CheckFunc func(ctx context.Context) error
 
 var (
-	emptyLogFn = func(c *gin.Context) []zapcore.Field { return []zapcore.Field{} }
+	emptyLogFn = func(_ *gin.Context) []zapcore.Field { return []zapcore.Field{} }
 
 	// DefaultServerShutdownTimeout sets the default for how long we give the sever
 	// to shutdown before forcefully stopping the server.

diff --git a/goosex/cobra.go b/goosex/cobra.go
@@ -53,7 +53,7 @@ create NAME [sql|go] Creates new migration file with the current timestamp
 fix                  Apply sequential ordering to migrations
 	`,
 		Args: cobra.MinimumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, args []string) {
 			setupFunc()
 			migrate(args[0], args[1:])
 		},

diff --git a/testing/eventtools/nats.go b/testing/eventtools/nats.go
@@ -81,7 +81,7 @@ func (s *TestNats) SetConsumerSampleFrequency(consumer, frequency string) error
 func (s *TestNats) WaitForAck(consumer string, timeout time.Duration) error {
 	// We should only ever receive one Ack, so we close the channel directly if we get one.
 	ackCh := make(chan struct{})
-	ackSub, err := s.Conn.Subscribe("$JS.EVENT.METRIC.CONSUMER.ACK.*."+consumer, func(m *nats.Msg) {
+	ackSub, err := s.Conn.Subscribe("$JS.EVENT.METRIC.CONSUMER.ACK.*."+consumer, func(_ *nats.Msg) {
 		close(ackCh)
 	})
 
@@ -96,7 +96,7 @@ func (s *TestNats) WaitForAck(consumer string, timeout time.Duration) error {
 
 	var nakOnce sync.Once
 
-	nakSub, err := s.Conn.Subscribe("$JS.EVENT.ADVISORY.CONSUMER.MSG_NAKED.*."+consumer, func(m *nats.Msg) {
+	nakSub, err := s.Conn.Subscribe("$JS.EVENT.ADVISORY.CONSUMER.MSG_NAKED.*."+consumer, func(_ *nats.Msg) {
 		nakOnce.Do(func() {
 			close(nakCh)
 		})

diff --git a/versionx/version.go b/versionx/version.go
@@ -70,7 +70,7 @@ func RegisterCobraCommand(cmd *cobra.Command, printFunc func()) {
 	var versionCmd = &cobra.Command{
 		Use:   "version",
 		Short: "returns the application version information",
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, _ []string) {
 			printFunc()
 		},
 	}