Skip to content

Commit 41b5053

Browse files
Linter gomodguard updated to gomodguard_v2. (#2080)
* Linter gomodguard updated to gomodguard_v2. Fixed constant naming. * Use golangci-lint action instead on manual installation.
1 parent 178cce1 commit 41b5053

4 files changed

Lines changed: 33 additions & 32 deletions

File tree

.github/workflows/go.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ jobs:
7373
cache: true
7474

7575
- name: Set up GolangCI-Lint
76-
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $HOME/bin latest
76+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v8
77+
with:
78+
version: latest
7779

7880
- name: Get dependencies
7981
run: go mod vendor

.golangci-strict.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ linters:
2525
- gocyclo
2626
- godot
2727
- gomoddirectives
28-
- gomodguard
28+
- gomodguard_v2
2929
- goprintffuncname
3030
- gosec
3131
- govet
@@ -106,21 +106,20 @@ linters:
106106
paramsOnly: false
107107
underef:
108108
skipRecvDeref: false
109-
gomodguard:
109+
gomodguard_v2:
110110
blocked:
111-
modules:
112-
- github.com/golang/protobuf:
113-
recommendations:
114-
- google.golang.org/protobuf
115-
reason: see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules
116-
- github.com/satori/go.uuid:
117-
recommendations:
118-
- github.com/google/uuid
119-
reason: satori's package is not maintained
120-
- github.com/gofrs/uuid:
121-
recommendations:
122-
- github.com/google/uuid
123-
reason: gofrs' package is not go module
111+
- module: github.com/golang/protobuf
112+
recommendations:
113+
- google.golang.org/protobuf
114+
reason: see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules
115+
- module: github.com/satori/go.uuid
116+
recommendations:
117+
- github.com/google/uuid
118+
reason: satori's package is not maintained
119+
- module: github.com/gofrs/uuid
120+
recommendations:
121+
- github.com/google/uuid
122+
reason: gofrs' package is not go module
124123
govet:
125124
disable:
126125
- fieldalignment

.golangci.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,20 @@ linters:
2929
- ^golang.org/x/tools/go/analysis.Analyzer$
3030
- ^google.golang.org/protobuf/.+Options$
3131
- ^gopkg.in/yaml.v3.Node$
32-
gomodguard:
32+
gomodguard_v2:
3333
blocked:
34-
modules:
35-
- github.com/golang/protobuf:
36-
recommendations:
37-
- google.golang.org/protobuf
38-
reason: see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules
39-
- github.com/satori/go.uuid:
40-
recommendations:
41-
- github.com/google/uuid
42-
reason: satori's package is not maintained
43-
- github.com/gofrs/uuid:
44-
recommendations:
45-
- github.com/google/uuid
46-
reason: gofrs' package is not go module
34+
- module: github.com/golang/protobuf
35+
recommendations:
36+
- google.golang.org/protobuf
37+
reason: see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules
38+
- module: github.com/satori/go.uuid
39+
recommendations:
40+
- github.com/google/uuid
41+
reason: satori's package is not maintained
42+
- module: github.com/gofrs/uuid
43+
recommendations:
44+
- github.com/google/uuid
45+
reason: gofrs' package is not go module
4746
govet:
4847
disable:
4948
- fieldalignment

pkg/node/fsm/fsm_common.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,9 @@ func convertToInterface[T any](arg any) T {
187187
}
188188

189189
func isCanBeNil(t reflect.Type) bool {
190-
return t.Kind() == reflect.Map || t.Kind() == reflect.Slice || t.Kind() == reflect.Interface ||
191-
t.Kind() == reflect.Chan || t.Kind() == reflect.Func || t.Kind() == reflect.Ptr
190+
k := t.Kind()
191+
return k == reflect.Map || k == reflect.Slice || k == reflect.Interface || k == reflect.Chan ||
192+
k == reflect.Func || k == reflect.Pointer
192193
}
193194

194195
func validateEventArgs(event stateless.Trigger, args ...any) {

0 commit comments

Comments
 (0)