Skip to content

Commit 0fe3f4a

Browse files
committed
chore: update linter
1 parent fa2166f commit 0fe3f4a

File tree

2 files changed

+90
-93
lines changed

2 files changed

+90
-93
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
env:
4040
GO_VERSION: stable
41-
GOLANGCI_LINT_VERSION: v1.61.0
41+
GOLANGCI_LINT_VERSION: v2.1.2
4242
CGO_ENABLED: 0
4343

4444
steps:
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Install golangci-lint ${{ env.GOLANGCI_LINT_VERSION }}
5757
run: |
58-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
58+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
5959
golangci-lint --version
6060
6161
- run: make

.golangci.yml

Lines changed: 88 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,101 @@
1-
run:
2-
timeout: 2m
1+
version: "2"
32

4-
linters-settings:
5-
govet:
6-
enable-all: true
7-
disable:
8-
- fieldalignment
9-
gocyclo:
10-
min-complexity: 15
11-
goconst:
12-
min-len: 5
13-
min-occurrences: 3
14-
mnd:
15-
ignored-functions:
16-
- os.*
17-
misspell:
18-
locale: US
19-
funlen:
20-
lines: -1
21-
statements: 50
22-
godox:
23-
keywords:
24-
- FIXME
25-
gofumpt:
26-
extra-rules: true
27-
depguard:
28-
rules:
29-
main:
30-
deny:
31-
- pkg: "github.com/instana/testify"
32-
desc: not allowed
33-
- pkg: "github.com/pkg/errors"
34-
desc: Should be replaced by standard lib errors package
35-
gocritic:
36-
enabled-tags:
37-
- diagnostic
38-
- style
39-
- performance
40-
disabled-checks:
41-
- sloppyReassign
42-
- rangeValCopy
43-
- octalLiteral
44-
- paramTypeCombine # already handle by gofumpt.extra-rules
45-
settings:
46-
hugeParam:
47-
sizeThreshold: 220
48-
forbidigo:
49-
forbid:
50-
- ^print(ln)?$
51-
- ^spew\.Print(f|ln)?$
52-
- ^spew\.Dump$
53-
tagliatelle:
54-
case:
55-
rules:
56-
json: goCamel
57-
csv: goCamel
58-
gosec:
59-
excludes:
60-
- G204
61-
tagalign:
62-
align: false
63-
order:
64-
- json
65-
- csv
3+
formatters:
4+
enable:
5+
- gci
6+
- gofumpt
7+
settings:
8+
gofumpt:
9+
extra-rules: true
6610

6711
linters:
68-
enable-all: true
12+
default: all
6913
disable:
70-
- execinquery # deprecated
71-
- exportloopref # deprecated
72-
- gomnd # deprecated
73-
- sqlclosecheck # not relevant (SQL)
74-
- rowserrcheck # not relevant (SQL)
7514
- cyclop # duplicate of gocyclo
76-
- lll
7715
- err113
78-
- prealloc
79-
- testpackage
80-
- paralleltest
8116
- exhaustive
8217
- exhaustruct
18+
- lll
19+
- mnd
20+
- paralleltest
21+
- prealloc
22+
- rowserrcheck # not relevant (SQL)
23+
- sqlclosecheck # not relevant (SQL)
24+
- testpackage
8325
- varnamelen
8426

27+
settings:
28+
depguard:
29+
rules:
30+
main:
31+
deny:
32+
- pkg: github.com/instana/testify
33+
desc: not allowed
34+
- pkg: github.com/pkg/errors
35+
desc: Should be replaced by standard lib errors package
36+
forbidigo:
37+
forbid:
38+
- pattern: ^print(ln)?$
39+
- pattern: ^spew\.Print(f|ln)?$
40+
- pattern: ^spew\.Dump$
41+
funlen:
42+
lines: -1
43+
statements: 50
44+
goconst:
45+
min-len: 5
46+
min-occurrences: 3
47+
gocritic:
48+
disabled-checks:
49+
- sloppyReassign
50+
- rangeValCopy
51+
- octalLiteral
52+
- paramTypeCombine # already handle by gofumpt.extra-rules
53+
enabled-tags:
54+
- diagnostic
55+
- style
56+
- performance
57+
settings:
58+
hugeParam:
59+
sizeThreshold: 220
60+
gocyclo:
61+
min-complexity: 15
62+
godox:
63+
keywords:
64+
- FIXME
65+
gosec:
66+
excludes:
67+
- G204
68+
govet:
69+
disable:
70+
- fieldalignment
71+
enable-all: true
72+
misspell:
73+
locale: US
74+
mnd:
75+
ignored-functions:
76+
- os.*
77+
tagalign:
78+
align: false
79+
order:
80+
- json
81+
- csv
82+
tagliatelle:
83+
case:
84+
rules:
85+
csv: goCamel
86+
json: goCamel
87+
88+
exclusions:
89+
presets:
90+
- comments
91+
rules:
92+
- path: (.+)_test.go
93+
linters:
94+
- dupl
95+
- funlen
96+
- goconst
97+
- maintidx
98+
8599
issues:
86-
exclude-use-default: false
87100
max-issues-per-linter: 0
88101
max-same-issues: 0
89-
exclude:
90-
- 'package-comments: should have a package comment'
91-
exclude-rules:
92-
- path: (.+)_test.go
93-
linters:
94-
- funlen
95-
- goconst
96-
- maintidx
97-
- dupl
98-
99-
output:
100-
show-stats: true
101-
sort-results: true
102-
sort-order:
103-
- linter
104-
- file

0 commit comments

Comments
 (0)