Skip to content

Commit 20e1b7e

Browse files
committed
[lint]: update golangci-lint action to v7.0.0 and refine linter settings
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 2b55813 commit 20e1b7e

File tree

4 files changed

+120
-93
lines changed

4 files changed

+120
-93
lines changed

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
go-version-file: go.mod
7171
- name: Setup golangci-lint
72-
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
72+
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
7373
with:
7474
args: --verbose
7575
version: latest

.golangci.yml

+117-90
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,35 @@
1+
version: "2"
2+
formatters:
3+
enable:
4+
- gci
5+
- gofumpt
6+
7+
settings:
8+
gci:
9+
sections:
10+
- standard
11+
- default
12+
- prefix(github.com/shirou)
13+
114
issues:
215
max-same-issues: 0
3-
exclude-rules: []
16+
417
linters:
18+
disable:
19+
- errcheck
20+
- govet
21+
- ineffassign
22+
- staticcheck
23+
- unused
24+
525
enable:
626
- asciicheck
727
- contextcheck
828
- durationcheck
929
- errorlint
10-
- gci
1130
- gocritic
12-
- gofmt
13-
- gofumpt
14-
- goimports
1531
- gomodguard
1632
- gosec
17-
- gosimple
1833
- importas
1934
- misspell
2035
- nakedret
@@ -24,92 +39,104 @@ linters:
2439
- revive
2540
- testifylint
2641
- thelper
27-
- typecheck
2842
- unparam
2943
- usetesting
30-
disable:
31-
- errcheck
32-
- govet
33-
- ineffassign
34-
- staticcheck
35-
- unused
36-
linters-settings:
37-
gci:
38-
sections:
39-
- standard
40-
- default
41-
- prefix(github.com/shirou)
42-
gocritic:
43-
disabled-checks:
44-
- captLocal
45-
gomodguard:
46-
blocked:
47-
modules:
48-
- io/ioutil:
49-
recommendations:
50-
- io
51-
- os
52-
gosec:
53-
excludes:
54-
- G115
55-
perfsprint:
56-
# Optimizes even if it requires an int or uint type cast.
57-
int-conversion: true
58-
# Optimizes into `err.Error()` even if it is only equivalent for non-nil errors.
59-
err-error: true
60-
# Optimizes `fmt.Errorf`.
61-
errorf: true
62-
# Optimizes `fmt.Sprintf` with only one argument.
63-
sprintf1: true
64-
# Optimizes into strings concatenation.
65-
strconcat: true
66-
revive:
67-
rules:
68-
- name: blank-imports
69-
- name: context-as-argument
70-
arguments:
71-
- allowTypesBefore: "*testing.T"
72-
- name: context-keys-type
73-
- name: dot-imports
74-
- name: duplicated-imports
75-
- name: early-return
76-
arguments:
77-
- "preserveScope"
78-
- name: empty-block
79-
disabled: true
80-
- name: error-naming
81-
- name: error-return
82-
- name: error-strings
83-
- name: exported
84-
disabled: true
85-
- name: errorf
86-
- name: increment-decrement
87-
- name: indent-error-flow
88-
arguments:
89-
- "preserveScope"
90-
- name: range
91-
- name: receiver-naming
92-
- name: redefines-builtin-id
93-
- name: redundant-import-alias
94-
- name: superfluous-else
95-
arguments:
96-
- "preserveScope"
97-
- name: time-naming
98-
- name: unexported-return
99-
- name: unnecessary-stmt
100-
- name: unreachable-code
101-
- name: unused-parameter
102-
- name: use-any
103-
- name: var-declaration
104-
- name: var-naming
105-
arguments:
106-
- ["ID"] # AllowList
107-
- ["VM"] # DenyList
108-
- - upperCaseConst: true # Extra parameter (upperCaseConst|skipPackageNameChecks)
109-
testifylint:
110-
enable-all: true
111-
usetesting:
112-
os-create-temp: false
44+
45+
exclusions:
46+
generated: lax
47+
48+
presets:
49+
- comments
50+
- common-false-positives
51+
- legacy
52+
- std-error-handling
53+
54+
warn-unused: true
55+
56+
settings:
57+
gocritic:
58+
disabled-checks:
59+
- captLocal
60+
61+
gomodguard:
62+
blocked:
63+
modules:
64+
- io/ioutil:
65+
recommendations:
66+
- io
67+
- os
68+
69+
gosec:
70+
excludes:
71+
- G115
72+
73+
perfsprint:
74+
# Optimizes into `err.Error()` even if it is only equivalent for non-nil errors.
75+
err-error: true
76+
# Optimizes `fmt.Errorf`.
77+
errorf: true
78+
# Optimizes even if it requires an int or uint type cast.
79+
int-conversion: true
80+
# Optimizes `fmt.Sprintf` with only one argument.
81+
sprintf1: true
82+
# Optimizes into strings concatenation.
83+
strconcat: true
84+
85+
revive:
86+
rules:
87+
- name: blank-imports
88+
- name: context-as-argument
89+
arguments:
90+
- allowTypesBefore: '*testing.T'
91+
- name: context-keys-type
92+
- name: dot-imports
93+
- name: duplicated-imports
94+
- name: early-return
95+
arguments:
96+
- preserveScope
97+
- name: empty-block
98+
disabled: true
99+
- name: error-naming
100+
- name: error-return
101+
- name: error-strings
102+
- name: exported
103+
disabled: true
104+
- name: errorf
105+
- name: increment-decrement
106+
- name: indent-error-flow
107+
arguments:
108+
- preserveScope
109+
- name: range
110+
- name: receiver-naming
111+
- name: redefines-builtin-id
112+
- name: redundant-import-alias
113+
- name: superfluous-else
114+
arguments:
115+
- preserveScope
116+
- name: time-naming
117+
- name: unexported-return
118+
- name: unnecessary-stmt
119+
- name: unreachable-code
120+
- name: unused-parameter
121+
- name: use-any
122+
- name: var-declaration
123+
- name: var-naming
124+
arguments:
125+
- ["ID"] # AllowList
126+
- ["VM"] # DenyList
127+
- - upperCaseConst: true # Extra parameter (upperCaseConst|skipPackageNameChecks)
128+
129+
testifylint:
130+
disable:
131+
- useless-assert # TODO: enable once golangci-lint > 2.0.2
132+
enable-all: true
133+
134+
usetesting:
113135
os-mkdir-temp: false
136+
os-create-temp: false
137+
138+
output:
139+
show-stats: false
140+
114141
run:
115142
timeout: 5m

host/host_linux_ppc64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
//go:build linux && ppc64
33

4-
// Created by cgo -godefs - DO NOT EDIT
4+
// Code Created by cgo -godefs - DO NOT EDIT
55
// cgo -godefs types_linux.go
66

77
package host

process/process_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ func TestOpenFiles(t *testing.T) {
554554
assert.NotEmpty(t, v) // test always open files.
555555

556556
for _, vv := range v {
557-
assert.NotEqual(t, "", vv.Path)
557+
assert.NotEmpty(t, vv.Path)
558558
}
559559
}
560560

0 commit comments

Comments
 (0)