fix error reported by golangLintCI

mo3et · Oct 10, 2024 · 5623d4e · 5623d4e
1 parent 405e084
commit 5623d4e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -31,6 +31,5 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.60.3
-          working-directory: ${{ matrix.workdir }}
-          skip-pkg-cache: true
+          version: v1.61.0
+          working-directory: ${{ matrix.workdir }}
diff --git a/.golangci.yml b/.golangci.yml
@@ -10,8 +10,9 @@ linters:
     - dogsled
     - durationcheck
     - errcheck
-    - copyloopvar
+    # - copyloopvar # need upgrade to Go 1.22
     - govet
+    - staticcheck
     - gosimple
     - gofmt
     - gofumpt
@@ -30,7 +31,6 @@ linters:
     - wastedassign
     - unconvert
     - misspell
-    - shadow
 
   # don't enable:
   # - asciicheck
@@ -49,6 +49,9 @@ linters:
   # - wsl
 
 linters-settings:
+  govet:
+    enable:
+      - shadow
   whitespace:
     multi-func: true
   lll:

diff --git a/app.go b/app.go
@@ -99,7 +99,6 @@ func (a *App) Run() error {
 		}
 	}
 	for _, srv := range a.opts.servers {
-		srv := srv
 		eg.Go(func() error {
 			<-ctx.Done() // wait for stop signal
 			stopCtx, cancel := context.WithTimeout(NewContext(a.opts.ctx, a), a.opts.stopTimeout)

diff --git a/transport/grpc/client.go b/transport/grpc/client.go
@@ -305,7 +305,7 @@ func streamClientInterceptor(ms []middleware.Middleware, filters []selector.Node
 			return nil, err
 		}
 
-		h := func(ctx context.Context, req interface{}) (interface{}, error) {
+		h := func(_ context.Context, _ interface{}) (interface{}, error) {
 			return streamer, nil
 		}
 

diff --git a/transport/grpc/interceptor.go b/transport/grpc/interceptor.go
@@ -80,7 +80,7 @@ func (s *Server) streamServerInterceptor() grpc.StreamServerInterceptor {
 			replyHeader: headerCarrier(replyHeader),
 		})
 
-		h := func(_ context.Context, req interface{}) (interface{}, error) {
+		h := func(_ context.Context, _ interface{}) (interface{}, error) {
 			return handler(srv, ss), nil
 		}