Skip to content

Commit 01b3015

Browse files
committed
update golangci-lint to v2
Signed-off-by: Tyler Auerbeck <[email protected]>
1 parent 8c05d8f commit 01b3015

File tree

2 files changed

+53
-43
lines changed

2 files changed

+53
-43
lines changed

.golangci.yml

Lines changed: 48 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
version: "2"
12
run:
2-
timeout: 5m
33
go: "1.23"
4-
5-
linters-settings:
6-
gocritic:
7-
enabled-tags:
8-
- performance
9-
lll:
10-
line-length: 200
11-
misspell:
12-
locale: US
13-
4+
timeout: 5m
145
linters:
15-
disable-all: true
6+
default: none
167
enable:
178
- copyloopvar
189
- durationcheck
@@ -22,42 +13,61 @@ linters:
2213
- goconst
2314
- gocritic
2415
- gocyclo
25-
- gofmt
26-
- goimports
27-
- gosimple
28-
- govet
2916
- gosec
17+
- govet
3018
- ineffassign
3119
- makezero
3220
- misspell
3321
- nilerr
3422
- revive
3523
- staticcheck
36-
- stylecheck
37-
- typecheck
3824
- unused
3925
- whitespace
40-
# Run with --fast=false for more extensive checks (enables all linters)
41-
fast: true
42-
26+
settings:
27+
gocritic:
28+
enabled-tags:
29+
- performance
30+
lll:
31+
line-length: 200
32+
misspell:
33+
locale: US
34+
exclusions:
35+
generated: lax
36+
presets:
37+
- comments
38+
- common-false-positives
39+
- legacy
40+
- std-error-handling
41+
rules:
42+
- linters:
43+
- revive
44+
text: 'unused-parameter: parameter ''.*'' seems to be unused, consider removing or renaming it as _'
45+
- linters:
46+
- revive
47+
text: 'dot-imports: should not use dot imports'
48+
source: . "github.com/onsi/(ginkgo/v2|gomega)"
49+
paths:
50+
- zz_generated.*\.go$
51+
- pkg/util/fileutil/atomic_writer.go
52+
- pkg/util/fileutil/atomic_writer_test.go
53+
- third_party$
54+
- builtin$
55+
- examples$
4356
issues:
44-
exclude-files:
45-
- "zz_generated.*\\.go$"
46-
- "pkg/util/fileutil/atomic_writer.go"
47-
- "pkg/util/fileutil/atomic_writer_test.go"
4857
max-issues-per-linter: 0
49-
exclude-rules:
50-
- text: "unused-parameter: parameter '.*' seems to be unused, consider removing or renaming it as _"
51-
linters:
52-
- revive
53-
- text: "dot-imports: should not use dot imports"
54-
linters:
55-
- revive
56-
source: ". \"github.com/onsi/(ginkgo/v2|gomega)\""
57-
58-
# default: 3
5958
max-same-issues: 0
60-
6159
severity:
62-
# default: ''
63-
default-severity: error
60+
default: error
61+
formatters:
62+
enable:
63+
- gofmt
64+
- goimports
65+
exclusions:
66+
generated: lax
67+
paths:
68+
- zz_generated.*\.go$
69+
- pkg/util/fileutil/atomic_writer.go
70+
- pkg/util/fileutil/atomic_writer_test.go
71+
- third_party$
72+
- builtin$
73+
- examples$

controllers/secretproviderclasspodstatus_controller.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,15 @@ func (r *SecretProviderClassPodStatusReconciler) Reconcile(ctx context.Context,
221221
r.mutex.Lock()
222222
defer r.mutex.Unlock()
223223

224-
klog.InfoS("reconcile started", "spcps", req.NamespacedName.String())
224+
klog.InfoS("reconcile started", "spcps", req.String())
225225

226226
spcPodStatus := &secretsstorev1.SecretProviderClassPodStatus{}
227227
if err := r.reader.Get(ctx, req.NamespacedName, spcPodStatus); err != nil {
228228
if apierrors.IsNotFound(err) {
229-
klog.InfoS("reconcile complete", "spcps", req.NamespacedName.String())
229+
klog.InfoS("reconcile complete", "spcps", req.String())
230230
return ctrl.Result{}, nil
231231
}
232-
klog.ErrorS(err, "failed to get spc pod status", "spcps", req.NamespacedName.String())
232+
klog.ErrorS(err, "failed to get spc pod status", "spcps", req.String())
233233
return ctrl.Result{}, err
234234
}
235235

@@ -442,7 +442,7 @@ func (r *SecretProviderClassPodStatusReconciler) patchSecretWithOwnerRef(ctx con
442442
Namespace: namespace,
443443
Name: name,
444444
}
445-
if err := r.Client.Get(ctx, secretKey, secret); err != nil {
445+
if err := r.Get(ctx, secretKey, secret); err != nil {
446446
if apierrors.IsNotFound(err) {
447447
klog.V(5).InfoS("secret not found for patching", "secret", klog.ObjectRef{Namespace: namespace, Name: name})
448448
return nil
@@ -484,7 +484,7 @@ func (r *SecretProviderClassPodStatusReconciler) secretExists(ctx context.Contex
484484
Namespace: namespace,
485485
Name: name,
486486
}
487-
err := r.Client.Get(ctx, secretKey, o)
487+
err := r.Get(ctx, secretKey, o)
488488
if err == nil {
489489
return true, nil
490490
}

0 commit comments

Comments
 (0)