Upgrade to golangci-lint to 1.54.2 and updates depguard config interface (#443)

* bump golangci version

Signed-off-by: mikeee <[email protected]>

* refactor depguard config

Signed-off-by: mikeee <[email protected]>

* exclude unused options

Signed-off-by: mikeee <[email protected]>

* remove locale option

Signed-off-by: mikeee <[email protected]>

* reassign iterated variables inside the loops

Signed-off-by: mikeee <[email protected]>

---------

Signed-off-by: mikeee <[email protected]>

Author: mikeee

.github/workflows/test-on-push.yaml

@@ -7,7 +7,6 @@ on:
       - main
 
 jobs:
-
   build:
     name: Test on ${{ matrix.gover }}
     runs-on: ubuntu-latest
@@ -19,38 +18,37 @@ jobs:
           - "1.20"
     env:
       GOVER: ${{ matrix.gover }}
-      GOLANGCILINT_VER: v1.52.2
+      GOLANGCILINT_VER: v1.54.2
 
     steps:
-
-    - name: Setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: ${{ env.GOVER }}
-
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-
-    - name: Tidy
-      run: make tidy
-
-    - name: Test
-      run: make test
-
-    - name: Cover
-      uses: codecov/codecov-action@v3
-
-    - name: Lint
-      uses: golangci/[email protected]
-      with:
-        version: ${{ env.GOLANGCILINT_VER }}
-        skip-cache: true
-        args: --timeout=10m0s
+      - name: Setup
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GOVER }}
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Tidy
+        run: make tidy
+
+      - name: Test
+        run: make test
+
+      - name: Cover
+        uses: codecov/codecov-action@v3
+
+      - name: Lint
+        uses: golangci/[email protected]
+        with:
+          version: ${{ env.GOLANGCILINT_VER }}
+          skip-cache: true
+          args: --timeout=10m0s

.golangci.yml

@@ -30,7 +30,7 @@ run:
   # won't be reported. Default value is empty list, but there is
   # no need to include all autogenerated files, we confidently recognize
   # autogenerated files. If it's not please let us know.
-  skip-files:
+  # skip-files:
   #  - ".*\\.my\\.go$"
   #  - lib/bad.go
 
@@ -64,7 +64,7 @@ linters-settings:
 
     # path to a file containing a list of functions to exclude from checking
     # see https://github.com/kisielk/errcheck#excluding-functions for details
-    exclude:
+    # exclude:
 
   funlen:
     lines: 60
@@ -133,21 +133,29 @@ linters-settings:
     # minimal occurrences count to trigger, 3 by default
     min-occurrences: 5
   depguard:
-    list-type: denylist
-    include-go-root: false
-    packages-with-error-message:
-      - "github.com/Sirupsen/logrus": "must use github.com/dapr/kit/logger"
-      - "github.com/agrea/ptr": "must use github.com/dapr/kit/ptr"
-      - "go.uber.org/atomic": "must use sync/atomic"
-      - "github.com/pkg/errors": "must use standard library (errors package and/or fmt.Errorf)"
-      - "github.com/cenkalti/backoff": "must use github.com/cenkalti/backoff/v4"
-      - "github.com/cenkalti/backoff/v2": "must use github.com/cenkalti/backoff/v4"
-      - "github.com/cenkalti/backoff/v3": "must use github.com/cenkalti/backoff/v4"
+    rules:
+      main:
+        deny:
+          - pkg: "github.com/Sirupsen/logrus"
+            desc: "you must use github.com/dapr/kit/logger"
+          - pkg: "github.com/agrea/ptr"
+            desc: "you must use github.com/dapr/kit/ptr"
+          - pkg: "go.uber.org/atomic"
+            desc: "you must use sync/atomic"
+          - pkg: "github.com/pkg/errors"
+            desc: "you must use the standard library (errors package and/or fmt.Errorf)"
+          - pkg: "github.com/cenkalti/backoff"
+            desc: "you must use github.com/cenkalti/backoff/v4"
+          - pkg: "github.com/cenkalti/backoff/v2"
+            desc: "you must use github.com/cenkalti/backoff/v4"
+          - pkg: "github.com/cenkalti/backoff/v3"
+            desc: "you must use github.com/cenkalti/backoff/v4"
   misspell:
     # Correct spellings using locale preferences for US or UK.
-    # Default is to use a neutral variety of English.
+    # Default is to use a neutral variety of English. (Do not specify a locale value)
     # Setting locale to US will correct the British spelling of 'colour' to 'color'.
-    locale: default
+    # locale:
+
     ignore-words:
       - someword
   lll:
@@ -185,7 +193,7 @@ linters-settings:
     # See https://go-critic.github.io/overview#checks-overview
     # To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run`
     # By default list of stable checks is used.
-    enabled-checks:
+    # enabled-checks:
 
     # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
     disabled-checks:

actor/state/actor_state_change_test.go

@@ -46,6 +46,7 @@ func TestNewActorStateChange(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
+		test := test
 		t.Run(name, func(t *testing.T) {
 			assert.Equal(t, test.want, NewActorStateChange(test.stateName, test.value, test.changeKind, &test.ttl))
 		})

service/internal/topicregistrar_test.go

@@ -61,10 +61,11 @@ func TestTopicRegistrarValidation(t *testing.T) {
 		},
 	}
 	for name, tt := range tests {
+		tt := tt // dereference loop var
 		t.Run(name, func(t *testing.T) {
 			m := internal.TopicRegistrar{}
 			if tt.err != "" {
-				assert.EqualError(t, m.AddSubscription(&tt.sub, tt.fn), tt.err)
+				assert.EqualError(t, m.AddSubscription(&tt.sub, tests[name].fn), tt.err)
 			} else {
 				assert.NoError(t, m.AddSubscription(&tt.sub, tt.fn))
 			}