Skip to content

Commit 6148f50

Browse files
ci: migrate golangci-lint to v2 (#75)
* ci: migrate golangci-lint to v2 Signed-off-by: Maximilian Braun (SAP) <[email protected]> * ci: raise action to v2.0.2 Signed-off-by: Maximilian Braun (SAP) <[email protected]> * ci: linting Signed-off-by: Maximilian Braun (SAP) <[email protected]> * ci: linting Signed-off-by: Maximilian Braun (SAP) <[email protected]> --------- Signed-off-by: Maximilian Braun (SAP) <[email protected]>
1 parent 3e0d3fc commit 6148f50

File tree

5 files changed

+133
-208
lines changed

5 files changed

+133
-208
lines changed

.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
cache: false
2525
- uses: actions/checkout@v4
2626
- name: golangci-lint
27-
uses: golangci/golangci-lint-action@v6
27+
uses: golangci/golangci-lint-action@v7
2828
with:
2929
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
30-
version: v1.60.1
30+
version: v2.0.2
3131

3232
# Optional: working directory, useful for monorepos
3333
# working-directory: somedir

.golangci.yaml

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
version: "2"
2+
linters:
3+
enable:
4+
- asasalint
5+
- asciicheck
6+
- bidichk
7+
- bodyclose
8+
- contextcheck
9+
- durationcheck
10+
- errchkjson
11+
- errorlint
12+
- exhaustive
13+
- gocheckcompilerdirectives
14+
- gochecksumtype
15+
- goconst
16+
- gocritic
17+
- gocyclo
18+
- gosec
19+
- gosmopolitan
20+
- loggercheck
21+
- makezero
22+
- misspell
23+
- musttag
24+
- nakedret
25+
- nilerr
26+
- nilnesserr
27+
- noctx
28+
- prealloc
29+
- protogetter
30+
- reassign
31+
- recvcheck
32+
- rowserrcheck
33+
- spancheck
34+
- sqlclosecheck
35+
- testifylint
36+
- unconvert
37+
- unparam
38+
- zerologlint
39+
settings:
40+
dupl:
41+
threshold: 100
42+
errcheck:
43+
check-type-assertions: false
44+
check-blank: false
45+
exclude-functions:
46+
- fmt:.*,io
47+
- ioutil:^Read.*
48+
goconst:
49+
min-len: 3
50+
min-occurrences: 5
51+
gocritic:
52+
enabled-tags:
53+
- performance
54+
settings:
55+
captLocal:
56+
paramsOnly: true
57+
rangeValCopy:
58+
sizeThreshold: 32
59+
gocyclo:
60+
min-complexity: 10
61+
govet:
62+
disable:
63+
- shadow
64+
lll:
65+
tab-width: 1
66+
nakedret:
67+
max-func-lines: 30
68+
prealloc:
69+
simple: true
70+
range-loops: true
71+
for-loops: false
72+
unparam:
73+
check-exported: false
74+
exclusions:
75+
generated: lax
76+
rules:
77+
- linters:
78+
- staticcheck
79+
text: "QF1008:" # could remove embedded field "xy" from selector (staticcheck)
80+
- linters:
81+
- staticcheck
82+
text: "QF1007:" # could merge conditional assignment into variable declaration (staticcheck)
83+
- linters:
84+
- dupl
85+
- errcheck
86+
- gocyclo
87+
- gosec
88+
- scopelint
89+
- unparam
90+
path: _test(ing)?\.go
91+
- linters:
92+
- gocritic
93+
path: _test\.go
94+
text: (unnamedResult|exitAfterDefer)
95+
- linters:
96+
- gocritic
97+
text: '(hugeParam|rangeValCopy):'
98+
- linters:
99+
- staticcheck
100+
text: 'SA3000:'
101+
- linters:
102+
- gosec
103+
text: 'G101:'
104+
- linters:
105+
- gosec
106+
text: 'G104:'
107+
paths:
108+
- zz_generated\..+\.go$
109+
- vendored/.+\.go$
110+
- third_party$
111+
- builtin$
112+
- examples$
113+
issues:
114+
max-same-issues: 0
115+
new: false
116+
formatters:
117+
enable:
118+
- gofmt
119+
- goimports
120+
settings:
121+
gofmt:
122+
simplify: true
123+
exclusions:
124+
generated: lax
125+
paths:
126+
- zz_generated\..+\.go$
127+
- vendored/.+\.go$
128+
- third_party$
129+
- builtin$
130+
- examples$

.golangci.yml

Lines changed: 0 additions & 203 deletions
This file was deleted.

pkg/xpenvfuncs/xpenvfuncs.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232

3333
resHelper "github.com/crossplane-contrib/xp-testing/pkg/resources"
3434
"github.com/crossplane-contrib/xp-testing/pkg/vendored"
35-
xconditions "github.com/crossplane-contrib/xp-testing/pkg/xpconditions"
3635

3736
"github.com/crossplane-contrib/xp-testing/internal/docker"
3837
"github.com/crossplane-contrib/xp-testing/internal/xpkg"
@@ -387,7 +386,7 @@ func awaitProviderHealthy(opts InstallCrossplaneProviderOptions) env.Func {
387386
return ctx, err
388387
}
389388
err = wait.For(
390-
xconditions.New(r).ProviderConditionMatch(
389+
xpconditions.New(r).ProviderConditionMatch(
391390
opts.Name,
392391
"Healthy",
393392
corev1.ConditionTrue,

pkg/xpenvfuncs/xpenvfuncs_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ spec:
275275
for _, test := range tests {
276276
t.Run(
277277
test.description, func(t *testing.T) {
278-
require.True(t, true)
279278
rendered, err := renderTemplate(test.args.template, test.args.data)
280279

281280
if len(test.expects.errorMessage) == 0 {

0 commit comments

Comments
 (0)