Skip to content

Commit 82cb500

Browse files
committed
Bump golanci-lint to v2.12.2
- Fix new findings (string constants) - Set required go version to 1.26.0 for all modules Signed-off-by: Lennart Jern <lennart.jern@est.tech>
1 parent cd71112 commit 82cb500

12 files changed

Lines changed: 221 additions & 214 deletions

File tree

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.25"
3+
go: "1.26"
44
build-tags:
55
- e2e
66
allow-parallel-runners: true
@@ -49,6 +49,8 @@ linters:
4949
- wastedassign
5050
- whitespace
5151
settings:
52+
goconst:
53+
ignore-tests: true
5254
# TODO(sbuerin) fix remaining findings and set to 20 afterwards
5355
cyclop:
5456
max-complexity: 30

api/v1beta1/conversion.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import (
3434
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
3535
)
3636

37+
const securityGroupRuleDirectionIngress = "ingress"
38+
3739
// ConvertTo converts this OpenStackCluster to the Hub version (v1beta2).
3840
func (src *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
3941
dst := dstRaw.(*infrav1.OpenStackCluster)
@@ -478,7 +480,7 @@ func LegacyCalicoSecurityGroupRules() []SecurityGroupRuleSpec {
478480
{
479481
Name: "BGP (calico)",
480482
Description: ptr.To("Created by cluster-api-provider-openstack API conversion - BGP (calico)"),
481-
Direction: "ingress",
483+
Direction: securityGroupRuleDirectionIngress,
482484
EtherType: ptr.To("IPv4"),
483485
PortRangeMin: ptr.To(179),
484486
PortRangeMax: ptr.To(179),
@@ -488,7 +490,7 @@ func LegacyCalicoSecurityGroupRules() []SecurityGroupRuleSpec {
488490
{
489491
Name: "IP-in-IP (calico)",
490492
Description: ptr.To("Created by cluster-api-provider-openstack API conversion - IP-in-IP (calico)"),
491-
Direction: "ingress",
493+
Direction: securityGroupRuleDirectionIngress,
492494
EtherType: ptr.To("IPv4"),
493495
Protocol: ptr.To("4"),
494496
RemoteManagedGroups: []ManagedSecurityGroupName{"controlplane", "worker"},

api/v1beta2/conversion_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func ConvertConditionsFromV1Beta2(src []metav1.Condition) clusterv1beta1.Conditi
6565
// IsReady checks if the Ready condition is True.
6666
func IsReady(conditions []metav1.Condition) bool {
6767
for _, c := range conditions {
68-
if c.Type == "Ready" && c.Status == metav1.ConditionTrue {
68+
if c.Type == ReadyConditionReason && c.Status == metav1.ConditionTrue {
6969
return true
7070
}
7171
}

controllers/openstackmachine_controller.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const (
6969
waitForInstanceBecomeActiveToReconcile = 60 * time.Second
7070
waitForBuildingInstanceToReconcile = 10 * time.Second
7171
deleteServerRequeueDelay = 10 * time.Second
72+
waitingForInstanceCreatedMessage = "Waiting for instance to be created"
7273
)
7374

7475
// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,verbs=get;list;watch;create;update;patch;delete
@@ -494,13 +495,13 @@ func (r *OpenStackMachineReconciler) reconcileMachineState(scope *scope.WithLogg
494495
Type: infrav1.InstanceReadyCondition,
495496
Status: metav1.ConditionFalse,
496497
Reason: infrav1.InstanceNotReadyReason,
497-
Message: "Waiting for instance to be created",
498+
Message: waitingForInstanceCreatedMessage,
498499
})
499500
conditions.Set(openStackMachine, metav1.Condition{
500501
Type: clusterv1.ReadyCondition,
501502
Status: metav1.ConditionFalse,
502503
Reason: infrav1.InstanceNotReadyReason,
503-
Message: "Waiting for instance to be created",
504+
Message: waitingForInstanceCreatedMessage,
504505
})
505506
return &ctrl.Result{RequeueAfter: waitForBuildingInstanceToReconcile}
506507
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-openstack
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc

hack/tools/go.mod

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module sigs.k8s.io/cluster-api-provider-openstack/hack/tools
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/a8m/envsubst v1.4.3
77
github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20251203005356-667b167b2ade
8-
github.com/golangci/golangci-lint/v2 v2.11.4
8+
github.com/golangci/golangci-lint/v2 v2.12.2
99
github.com/itchyny/gojq v0.12.19
1010
github.com/onsi/ginkgo/v2 v2.28.2
1111
go.uber.org/mock v0.6.0
@@ -21,6 +21,7 @@ require (
2121
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
2222
4d63.com/gochecknoglobals v0.2.2 // indirect
2323
cel.dev/expr v0.25.1 // indirect
24+
charm.land/lipgloss/v2 v2.0.3 // indirect
2425
codeberg.org/chavacava/garif v0.2.0 // indirect
2526
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
2627
dario.cat/mergo v1.0.1 // indirect
@@ -34,57 +35,58 @@ require (
3435
github.com/Antonboom/nilnil v1.1.1 // indirect
3536
github.com/Antonboom/testifylint v1.6.4 // indirect
3637
github.com/BurntSushi/toml v1.6.0 // indirect
38+
github.com/ClickHouse/clickhouse-go-linter v1.2.0 // indirect
3739
github.com/Djarvur/go-err113 v0.1.1 // indirect
38-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
40+
github.com/Masterminds/semver/v3 v3.5.0 // indirect
3941
github.com/Microsoft/go-winio v0.6.2 // indirect
4042
github.com/MirrexOne/unqueryvet v1.5.4 // indirect
4143
github.com/NYTimes/gziphandler v1.1.1 // indirect
4244
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
4345
github.com/ProtonMail/go-crypto v1.1.6 // indirect
4446
github.com/VividCortex/ewma v1.2.0 // indirect
45-
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
47+
github.com/alecthomas/chroma/v2 v2.24.1 // indirect
4648
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
4749
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
4850
github.com/alexkohler/prealloc v1.1.0 // indirect
4951
github.com/alfatraining/structtag v1.0.0 // indirect
5052
github.com/alingse/asasalint v0.0.11 // indirect
5153
github.com/alingse/nilnesserr v0.2.0 // indirect
5254
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
53-
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
54-
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
55-
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
55+
github.com/ashanbrown/forbidigo/v2 v2.3.1 // indirect
56+
github.com/ashanbrown/makezero/v2 v2.2.1 // indirect
5657
github.com/beorn7/perks v1.0.1 // indirect
5758
github.com/bkielbasa/cyclop v1.2.3 // indirect
5859
github.com/blang/semver/v4 v4.0.0 // indirect
5960
github.com/blizzy78/varnamelen v0.8.0 // indirect
6061
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
61-
github.com/bombsimon/wsl/v5 v5.6.0 // indirect
62+
github.com/bombsimon/wsl/v5 v5.8.0 // indirect
6263
github.com/breml/bidichk v0.3.3 // indirect
6364
github.com/breml/errchkjson v0.4.1 // indirect
64-
github.com/butuzov/ireturn v0.4.0 // indirect
65+
github.com/butuzov/ireturn v0.4.1 // indirect
6566
github.com/butuzov/mirror v1.3.0 // indirect
6667
github.com/catenacyber/perfsprint v0.10.1 // indirect
6768
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
6869
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
6970
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7071
github.com/charithe/durationcheck v0.0.11 // indirect
71-
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
72-
github.com/charmbracelet/lipgloss v1.1.0 // indirect
73-
github.com/charmbracelet/x/ansi v0.10.1 // indirect
74-
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
75-
github.com/charmbracelet/x/term v0.2.1 // indirect
72+
github.com/charmbracelet/colorprofile v0.4.3 // indirect
73+
github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318 // indirect
74+
github.com/charmbracelet/x/ansi v0.11.7 // indirect
75+
github.com/charmbracelet/x/term v0.2.2 // indirect
76+
github.com/charmbracelet/x/termios v0.1.1 // indirect
77+
github.com/charmbracelet/x/windows v0.2.2 // indirect
7678
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
7779
github.com/ckaznocha/intrange v0.3.1 // indirect
78-
github.com/clipperhouse/stringish v0.1.1 // indirect
79-
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
80+
github.com/clipperhouse/displaywidth v0.11.0 // indirect
81+
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
8082
github.com/cloudflare/circl v1.6.3 // indirect
8183
github.com/curioswitch/go-reassign v0.3.0 // indirect
8284
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
8385
github.com/daixiang0/gci v0.13.7 // indirect
8486
github.com/dave/dst v0.27.3 // indirect
8587
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8688
github.com/denis-tingaikin/go-header v0.5.0 // indirect
87-
github.com/dlclark/regexp2 v1.11.5 // indirect
89+
github.com/dlclark/regexp2 v1.12.0 // indirect
8890
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
8991
github.com/emirpasic/gods v1.18.1 // indirect
9092
github.com/ettle/strcase v0.2.0 // indirect
@@ -125,13 +127,14 @@ require (
125127
github.com/gofrs/uuid/v5 v5.3.0 // indirect
126128
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
127129
github.com/golangci/asciicheck v0.5.0 // indirect
128-
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
130+
github.com/golangci/dupl v0.0.0-20260401084720-c99c5cf5c202 // indirect
129131
github.com/golangci/go-printf-func-name v0.1.1 // indirect
130132
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
131133
github.com/golangci/golines v0.15.0 // indirect
132134
github.com/golangci/misspell v0.8.0 // indirect
133135
github.com/golangci/plugin-module-register v0.1.2 // indirect
134136
github.com/golangci/revgrep v0.8.0 // indirect
137+
github.com/golangci/rowserrcheck v0.0.0-20260419091836-c5f79b8a11ba // indirect
135138
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
136139
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
137140
github.com/google/btree v1.1.3 // indirect
@@ -158,8 +161,7 @@ require (
158161
github.com/itchyny/go-yaml v0.0.0-20251001235044-fca9a0999f15 // indirect
159162
github.com/itchyny/timefmt-go v0.1.8 // indirect
160163
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
161-
github.com/jgautheron/goconst v1.8.2 // indirect
162-
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
164+
github.com/jgautheron/goconst v1.10.0 // indirect
163165
github.com/jjti/go-spancheck v0.6.5 // indirect
164166
github.com/josharian/intern v1.0.0 // indirect
165167
github.com/json-iterator/go v1.1.12 // indirect
@@ -181,32 +183,32 @@ require (
181183
github.com/ldez/tagliatelle v0.7.2 // indirect
182184
github.com/ldez/usetesting v0.5.0 // indirect
183185
github.com/leonklingele/grouper v1.1.2 // indirect
184-
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
186+
github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
185187
github.com/macabu/inamedparam v0.2.0 // indirect
186188
github.com/mailru/easyjson v0.7.7 // indirect
187189
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
188-
github.com/manuelarte/funcorder v0.5.0 // indirect
190+
github.com/manuelarte/funcorder v0.6.0 // indirect
189191
github.com/maratori/testableexamples v1.0.1 // indirect
190192
github.com/maratori/testpackage v1.1.2 // indirect
191193
github.com/matoous/godox v1.1.0 // indirect
192194
github.com/mattn/go-colorable v0.1.14 // indirect
193195
github.com/mattn/go-isatty v0.0.20 // indirect
194-
github.com/mattn/go-runewidth v0.0.19 // indirect
196+
github.com/mattn/go-runewidth v0.0.23 // indirect
195197
github.com/mgechev/revive v1.15.0 // indirect
196198
github.com/mitchellh/go-homedir v1.1.0 // indirect
197199
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
198200
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
199201
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
200202
github.com/moricho/tparallel v0.3.2 // indirect
201-
github.com/muesli/termenv v0.16.0 // indirect
203+
github.com/muesli/cancelreader v0.2.2 // indirect
202204
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
203205
github.com/nakabonne/nestif v0.3.1 // indirect
204206
github.com/nishanths/exhaustive v0.12.0 // indirect
205207
github.com/nishanths/predeclared v0.2.2 // indirect
206208
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
207209
github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
208210
github.com/onsi/gomega v1.39.1 // indirect
209-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
211+
github.com/pelletier/go-toml/v2 v2.3.1 // indirect
210212
github.com/pjbgf/sha1cd v0.6.0 // indirect
211213
github.com/pkg/errors v0.9.1 // indirect
212214
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -224,21 +226,22 @@ require (
224226
github.com/rogpeppe/go-internal v1.14.1 // indirect
225227
github.com/russross/blackfriday/v2 v2.1.0 // indirect
226228
github.com/ryancurrah/gomodguard v1.4.1 // indirect
229+
github.com/ryancurrah/gomodguard/v2 v2.1.3 // indirect
227230
github.com/ryanrolds/sqlclosecheck v0.6.0 // indirect
228231
github.com/sagikazarmark/locafero v0.11.0 // indirect
229232
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
230233
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
231234
github.com/saschagrunert/go-modiff v1.3.5 // indirect
232235
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
233236
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
234-
github.com/securego/gosec/v2 v2.24.8-0.20260309165252-619ce2117e08 // indirect
237+
github.com/securego/gosec/v2 v2.26.1 // indirect
235238
github.com/sergi/go-diff v1.4.0 // indirect
236239
github.com/sirupsen/logrus v1.9.4 // indirect
237240
github.com/sivchari/containedctx v1.0.3 // indirect
238241
github.com/skeema/knownhosts v1.3.1 // indirect
239242
github.com/sonatard/noctx v0.5.1 // indirect
240243
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
241-
github.com/sourcegraph/go-diff v0.7.0 // indirect
244+
github.com/sourcegraph/go-diff v0.8.0 // indirect
242245
github.com/spf13/afero v1.15.0 // indirect
243246
github.com/spf13/cast v1.10.0 // indirect
244247
github.com/spf13/cobra v1.10.2 // indirect
@@ -250,15 +253,15 @@ require (
250253
github.com/stretchr/objx v0.5.2 // indirect
251254
github.com/stretchr/testify v1.11.1 // indirect
252255
github.com/subosito/gotenv v1.6.0 // indirect
253-
github.com/tetafro/godot v1.5.4 // indirect
254-
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
256+
github.com/tetafro/godot v1.5.6 // indirect
257+
github.com/timakin/bodyclose v0.0.0-20260129054331-73d1f95b84b4 // indirect
255258
github.com/timonwong/loggercheck v0.11.0 // indirect
256259
github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
257260
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
258261
github.com/ultraware/funlen v0.2.0 // indirect
259262
github.com/ultraware/whitespace v0.2.0 // indirect
260263
github.com/uudashr/gocognit v1.2.1 // indirect
261-
github.com/uudashr/iface v1.4.1 // indirect
264+
github.com/uudashr/iface v1.4.2 // indirect
262265
github.com/x448/float16 v0.8.4 // indirect
263266
github.com/xanzy/ssh-agent v0.3.3 // indirect
264267
github.com/xen0n/gosmopolitan v1.3.0 // indirect
@@ -269,7 +272,7 @@ require (
269272
github.com/ykadowak/zerologlint v0.1.5 // indirect
270273
gitlab.com/bosi/decorder v0.4.2 // indirect
271274
go-simpler.org/musttag v0.14.0 // indirect
272-
go-simpler.org/sloglint v0.11.1 // indirect
275+
go-simpler.org/sloglint v0.12.0 // indirect
273276
go.augendre.info/arangolint v0.4.0 // indirect
274277
go.augendre.info/fatcontext v0.9.0 // indirect
275278
go.opentelemetry.io/auto/sdk v1.2.1 // indirect

0 commit comments

Comments
 (0)