Skip to content

Commit 54f0126

Browse files
authored
Merge pull request #17292 from ameukam/bump-tools
Bump CI tools
2 parents 1f58f00 + 685f4fe commit 54f0126

10 files changed

+359
-338
lines changed

.golangci.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
run:
22
timeout: 30m
3-
go: "1.22"
3+
go: "1.23"
44

55
issues:
66
max-same-issues: 0
77
# Excluding configuration per-path, per-linter, per-text and per-source
88
exclude-rules:
9-
# exclude ineffassing linter for generated files for conversion
10-
- path: conversion\.go
11-
linters:
12-
- ineffassign
9+
# exclude ineffassing linter for generated files for conversion
10+
- path: conversion\.go
11+
linters:
12+
- ineffassign
1313
exclude-files:
14-
- "^zz_generated.*"
14+
- "^zz_generated.*"
1515

1616
linters:
1717
disable-all: true
1818
enable:
19-
- govet
20-
- ineffassign
21-
- staticcheck
22-
- tenv
19+
- govet
20+
- ineffassign
21+
- staticcheck
22+
- tenv
2323

2424
linters-settings: # please keep this alphabetized
2525
staticcheck:
2626
checks: [
27-
"all",
28-
"-ST1000", # Incorrect or missing package comment
29-
"-ST1003", # Poorly chosen identifier
30-
"-ST1005", # Incorrectly formatted error string
31-
"-ST1006", # Poorly chosen receiver name
32-
"-ST1012", # Poorly chosen name for error variable
33-
"-ST1016", # Use consistent method receiver names
34-
"-SA1019", # Using a deprecated function, variable, constant or field
35-
]
27+
"all",
28+
"-ST1000", # Incorrect or missing package comment
29+
"-ST1003", # Poorly chosen identifier
30+
"-ST1005", # Incorrectly formatted error string
31+
"-ST1006", # Poorly chosen receiver name
32+
"-ST1012", # Poorly chosen name for error variable
33+
"-ST1016", # Use consistent method receiver names
34+
"-SA1019", # Using a deprecated function, variable, constant or field
35+
]

hack/go.mod

Lines changed: 89 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,60 @@ go 1.23.5
44

55
require (
66
github.com/client9/misspell v0.3.4
7-
github.com/golangci/golangci-lint v1.61.0
8-
golang.org/x/tools v0.25.0
9-
honnef.co/go/tools v0.5.1
10-
sigs.k8s.io/controller-tools v0.16.0
7+
github.com/golangci/golangci-lint v1.64.5
8+
golang.org/x/tools v0.30.0
9+
honnef.co/go/tools v0.6.0
10+
sigs.k8s.io/controller-tools v0.17.0
1111
)
1212

1313
require (
1414
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
15-
4d63.com/gochecknoglobals v0.2.1 // indirect
16-
github.com/4meepo/tagalign v1.3.4 // indirect
17-
github.com/Abirdcfly/dupword v0.1.1 // indirect
18-
github.com/Antonboom/errname v0.1.13 // indirect
19-
github.com/Antonboom/nilnil v0.1.9 // indirect
20-
github.com/Antonboom/testifylint v1.4.3 // indirect
15+
4d63.com/gochecknoglobals v0.2.2 // indirect
16+
github.com/4meepo/tagalign v1.4.1 // indirect
17+
github.com/Abirdcfly/dupword v0.1.3 // indirect
18+
github.com/Antonboom/errname v1.0.0 // indirect
19+
github.com/Antonboom/nilnil v1.0.1 // indirect
20+
github.com/Antonboom/testifylint v1.5.2 // indirect
2121
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
22-
github.com/Crocmagnon/fatcontext v0.5.2 // indirect
22+
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
2323
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
2424
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
2525
github.com/Masterminds/semver/v3 v3.3.0 // indirect
2626
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
27-
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
28-
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
27+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
28+
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
2929
github.com/alexkohler/prealloc v1.0.0 // indirect
3030
github.com/alingse/asasalint v0.0.11 // indirect
31+
github.com/alingse/nilnesserr v0.1.2 // indirect
3132
github.com/ashanbrown/forbidigo v1.6.0 // indirect
32-
github.com/ashanbrown/makezero v1.1.1 // indirect
33+
github.com/ashanbrown/makezero v1.2.0 // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
34-
github.com/bkielbasa/cyclop v1.2.1 // indirect
35+
github.com/bkielbasa/cyclop v1.2.3 // indirect
3536
github.com/blizzy78/varnamelen v0.8.0 // indirect
36-
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
37-
github.com/breml/bidichk v0.2.7 // indirect
38-
github.com/breml/errchkjson v0.3.6 // indirect
39-
github.com/butuzov/ireturn v0.3.0 // indirect
40-
github.com/butuzov/mirror v1.2.0 // indirect
41-
github.com/catenacyber/perfsprint v0.7.1 // indirect
37+
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
38+
github.com/breml/bidichk v0.3.2 // indirect
39+
github.com/breml/errchkjson v0.4.0 // indirect
40+
github.com/butuzov/ireturn v0.3.1 // indirect
41+
github.com/butuzov/mirror v1.3.0 // indirect
42+
github.com/catenacyber/perfsprint v0.8.1 // indirect
4243
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
4344
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4445
github.com/charithe/durationcheck v0.0.10 // indirect
4546
github.com/chavacava/garif v0.1.0 // indirect
46-
github.com/ckaznocha/intrange v0.2.0 // indirect
47-
github.com/curioswitch/go-reassign v0.2.0 // indirect
47+
github.com/ckaznocha/intrange v0.3.0 // indirect
48+
github.com/curioswitch/go-reassign v0.3.0 // indirect
4849
github.com/daixiang0/gci v0.13.5 // indirect
4950
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5051
github.com/denis-tingaikin/go-header v0.5.0 // indirect
5152
github.com/ettle/strcase v0.2.0 // indirect
52-
github.com/fatih/color v1.17.0 // indirect
53+
github.com/fatih/color v1.18.0 // indirect
5354
github.com/fatih/structtag v1.2.0 // indirect
5455
github.com/firefart/nonamedreturns v1.0.5 // indirect
5556
github.com/fsnotify/fsnotify v1.7.0 // indirect
5657
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5758
github.com/fzipp/gocyclo v0.6.0 // indirect
58-
github.com/ghostiam/protogetter v0.3.6 // indirect
59-
github.com/go-critic/go-critic v0.11.4 // indirect
59+
github.com/ghostiam/protogetter v0.3.9 // indirect
60+
github.com/go-critic/go-critic v0.12.0 // indirect
6061
github.com/go-logr/logr v1.4.2 // indirect
6162
github.com/go-toolsmith/astcast v1.1.0 // indirect
6263
github.com/go-toolsmith/astcopy v1.1.0 // indirect
@@ -66,55 +67,57 @@ require (
6667
github.com/go-toolsmith/strparse v1.1.0 // indirect
6768
github.com/go-toolsmith/typep v1.1.0 // indirect
6869
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
69-
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
70-
github.com/gobuffalo/flect v1.0.2 // indirect
70+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
71+
github.com/gobuffalo/flect v1.0.3 // indirect
7172
github.com/gobwas/glob v0.2.3 // indirect
7273
github.com/gofrs/flock v0.12.1 // indirect
7374
github.com/gogo/protobuf v1.3.2 // indirect
7475
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
75-
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
76+
github.com/golangci/go-printf-func-name v0.1.0 // indirect
77+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
7678
github.com/golangci/misspell v0.6.0 // indirect
77-
github.com/golangci/modinfo v0.3.4 // indirect
7879
github.com/golangci/plugin-module-register v0.1.1 // indirect
79-
github.com/golangci/revgrep v0.5.3 // indirect
80+
github.com/golangci/revgrep v0.8.0 // indirect
8081
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
8182
github.com/google/go-cmp v0.6.0 // indirect
8283
github.com/google/gofuzz v1.2.0 // indirect
8384
github.com/gordonklaus/ineffassign v0.1.0 // indirect
8485
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
8586
github.com/gostaticanalysis/comment v1.4.2 // indirect
86-
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
87+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
8788
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
89+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
8890
github.com/hashicorp/go-version v1.7.0 // indirect
91+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8992
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
9093
github.com/hexops/gotextdiff v1.0.3 // indirect
9194
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9295
github.com/jgautheron/goconst v1.7.1 // indirect
9396
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
94-
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
95-
github.com/jjti/go-spancheck v0.6.2 // indirect
97+
github.com/jjti/go-spancheck v0.6.4 // indirect
9698
github.com/json-iterator/go v1.1.12 // indirect
97-
github.com/julz/importas v0.1.0 // indirect
98-
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
99-
github.com/kisielk/errcheck v1.7.0 // indirect
99+
github.com/julz/importas v0.2.0 // indirect
100+
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
101+
github.com/kisielk/errcheck v1.8.0 // indirect
100102
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
101103
github.com/kulti/thelper v0.6.3 // indirect
102104
github.com/kunwardeep/paralleltest v1.0.10 // indirect
103-
github.com/kyoh86/exportloopref v0.1.11 // indirect
104-
github.com/lasiar/canonicalheader v1.1.1 // indirect
105-
github.com/ldez/gomoddirectives v0.2.4 // indirect
106-
github.com/ldez/tagliatelle v0.5.0 // indirect
105+
github.com/lasiar/canonicalheader v1.1.2 // indirect
106+
github.com/ldez/exptostd v0.4.1 // indirect
107+
github.com/ldez/gomoddirectives v0.6.1 // indirect
108+
github.com/ldez/grignotin v0.9.0 // indirect
109+
github.com/ldez/tagliatelle v0.7.1 // indirect
110+
github.com/ldez/usetesting v0.4.2 // indirect
107111
github.com/leonklingele/grouper v1.1.2 // indirect
108-
github.com/lufeee/execinquery v1.2.1 // indirect
109112
github.com/macabu/inamedparam v0.1.3 // indirect
110113
github.com/magiconair/properties v1.8.7 // indirect
111114
github.com/maratori/testableexamples v1.0.0 // indirect
112115
github.com/maratori/testpackage v1.1.1 // indirect
113-
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
114-
github.com/mattn/go-colorable v0.1.13 // indirect
116+
github.com/matoous/godox v1.1.0 // indirect
117+
github.com/mattn/go-colorable v0.1.14 // indirect
115118
github.com/mattn/go-isatty v0.0.20 // indirect
116-
github.com/mattn/go-runewidth v0.0.13 // indirect
117-
github.com/mgechev/revive v1.3.9 // indirect
119+
github.com/mattn/go-runewidth v0.0.16 // indirect
120+
github.com/mgechev/revive v1.6.1 // indirect
118121
github.com/mitchellh/go-homedir v1.1.0 // indirect
119122
github.com/mitchellh/mapstructure v1.5.0 // indirect
120123
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -124,11 +127,11 @@ require (
124127
github.com/nakabonne/nestif v0.3.1 // indirect
125128
github.com/nishanths/exhaustive v0.12.0 // indirect
126129
github.com/nishanths/predeclared v0.2.2 // indirect
127-
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
130+
github.com/nunnatsa/ginkgolinter v0.19.0 // indirect
128131
github.com/olekukonko/tablewriter v0.0.5 // indirect
129132
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
130133
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
131-
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
134+
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
132135
github.com/prometheus/client_golang v1.20.4 // indirect
133136
github.com/prometheus/client_model v0.6.1 // indirect
134137
github.com/prometheus/common v0.55.0 // indirect
@@ -138,73 +141,75 @@ require (
138141
github.com/quasilyte/gogrep v0.5.0 // indirect
139142
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
140143
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
141-
github.com/rivo/uniseg v0.2.0 // indirect
144+
github.com/raeperd/recvcheck v0.2.0 // indirect
145+
github.com/rivo/uniseg v0.4.7 // indirect
146+
github.com/rogpeppe/go-internal v1.13.1 // indirect
142147
github.com/ryancurrah/gomodguard v1.3.5 // indirect
143148
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
144149
github.com/sagikazarmark/locafero v0.4.0 // indirect
145150
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
146-
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
147-
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
151+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
152+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
148153
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
149-
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
150-
github.com/securego/gosec/v2 v2.21.2 // indirect
151-
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
154+
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
155+
github.com/securego/gosec/v2 v2.22.1 // indirect
152156
github.com/sirupsen/logrus v1.9.3 // indirect
153157
github.com/sivchari/containedctx v1.0.3 // indirect
154-
github.com/sivchari/tenv v1.10.0 // indirect
155-
github.com/sonatard/noctx v0.0.2 // indirect
158+
github.com/sivchari/tenv v1.12.1 // indirect
159+
github.com/sonatard/noctx v0.1.0 // indirect
156160
github.com/sourcegraph/conc v0.3.0 // indirect
157161
github.com/sourcegraph/go-diff v0.7.0 // indirect
158-
github.com/spf13/afero v1.11.0 // indirect
162+
github.com/spf13/afero v1.12.0 // indirect
159163
github.com/spf13/cast v1.7.0 // indirect
160164
github.com/spf13/cobra v1.8.1 // indirect
161-
github.com/spf13/pflag v1.0.5 // indirect
165+
github.com/spf13/pflag v1.0.6 // indirect
162166
github.com/spf13/viper v1.19.0 // indirect
163167
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
164-
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
168+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
165169
github.com/stretchr/objx v0.5.2 // indirect
166-
github.com/stretchr/testify v1.9.0 // indirect
170+
github.com/stretchr/testify v1.10.0 // indirect
167171
github.com/subosito/gotenv v1.6.0 // indirect
168-
github.com/tdakkota/asciicheck v0.2.0 // indirect
169-
github.com/tetafro/godot v1.4.17 // indirect
170-
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
171-
github.com/timonwong/loggercheck v0.9.4 // indirect
172-
github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
172+
github.com/tdakkota/asciicheck v0.4.0 // indirect
173+
github.com/tetafro/godot v1.4.20 // indirect
174+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
175+
github.com/timonwong/loggercheck v0.10.1 // indirect
176+
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
173177
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
174-
github.com/ultraware/funlen v0.1.0 // indirect
175-
github.com/ultraware/whitespace v0.1.1 // indirect
176-
github.com/uudashr/gocognit v1.1.3 // indirect
178+
github.com/ultraware/funlen v0.2.0 // indirect
179+
github.com/ultraware/whitespace v0.2.0 // indirect
180+
github.com/uudashr/gocognit v1.2.0 // indirect
181+
github.com/uudashr/iface v1.3.1 // indirect
177182
github.com/x448/float16 v0.8.4 // indirect
178183
github.com/xen0n/gosmopolitan v1.2.2 // indirect
179184
github.com/yagipy/maintidx v1.0.0 // indirect
180185
github.com/yeya24/promlinter v0.3.0 // indirect
181186
github.com/ykadowak/zerologlint v0.1.5 // indirect
182187
gitlab.com/bosi/decorder v0.4.2 // indirect
183-
go-simpler.org/musttag v0.12.2 // indirect
184-
go-simpler.org/sloglint v0.7.2 // indirect
185-
go.uber.org/automaxprocs v1.5.3 // indirect
188+
go-simpler.org/musttag v0.13.0 // indirect
189+
go-simpler.org/sloglint v0.9.0 // indirect
190+
go.uber.org/automaxprocs v1.6.0 // indirect
186191
go.uber.org/multierr v1.11.0 // indirect
187192
go.uber.org/zap v1.27.0 // indirect
188193
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
189-
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
190-
golang.org/x/mod v0.21.0 // indirect
191-
golang.org/x/net v0.29.0 // indirect
192-
golang.org/x/sync v0.8.0 // indirect
193-
golang.org/x/sys v0.25.0 // indirect
194-
golang.org/x/text v0.18.0 // indirect
195-
google.golang.org/protobuf v1.34.2 // indirect
194+
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
195+
golang.org/x/mod v0.23.0 // indirect
196+
golang.org/x/net v0.35.0 // indirect
197+
golang.org/x/sync v0.11.0 // indirect
198+
golang.org/x/sys v0.30.0 // indirect
199+
golang.org/x/text v0.22.0 // indirect
200+
google.golang.org/protobuf v1.36.4 // indirect
196201
gopkg.in/inf.v0 v0.9.1 // indirect
197202
gopkg.in/ini.v1 v1.67.0 // indirect
198203
gopkg.in/yaml.v2 v2.4.0 // indirect
199204
gopkg.in/yaml.v3 v3.0.1 // indirect
200-
k8s.io/api v0.31.1 // indirect
201-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
202-
k8s.io/apimachinery v0.31.1 // indirect
205+
k8s.io/api v0.32.0 // indirect
206+
k8s.io/apiextensions-apiserver v0.32.0 // indirect
207+
k8s.io/apimachinery v0.32.0 // indirect
203208
k8s.io/klog/v2 v2.130.1 // indirect
204-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
209+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
205210
mvdan.cc/gofumpt v0.7.0 // indirect
206211
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
207-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
208-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
212+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
213+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
209214
sigs.k8s.io/yaml v1.4.0 // indirect
210215
)

0 commit comments

Comments
 (0)