Skip to content

Commit 8cb3dd5

Browse files
kishen-vdependabot[bot]
kishen-v
and
dependabot[bot]
authored
Loosen the linter's rule to allow bumping of golangci-lint (kubernetes-sigs#2457)
* Bump github.com/golangci/golangci-lint/v2 in /hack/tools Bumps [github.com/golangci/golangci-lint/v2](https://github.com/golangci/golangci-lint) from 2.1.6 to 2.3.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/main/CHANGELOG.md) - [Commits](golangci/golangci-lint@v2.1.6...v2.3.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint/v2 dependency-version: 2.3.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Loosen linter rule for package names and fix an SA issue --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 146d864 commit 8cb3dd5

File tree

4 files changed

+130
-120
lines changed

4 files changed

+130
-120
lines changed

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ linters:
121121
- linters:
122122
- revive
123123
text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'
124+
# To be fixed: This is done to unblock the bumping of golint.
125+
- linters:
126+
- revive
127+
text: 'var-naming: avoid meaningless package names'
124128
- linters:
125129
- errcheck
126130
text: Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?(S|s)?etenv). is not checked

‎hack/tools/go.mod‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.0
66

77
require (
88
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
9-
github.com/golangci/golangci-lint/v2 v2.1.6
9+
github.com/golangci/golangci-lint/v2 v2.3.1
1010
github.com/itchyny/gojq v0.12.17
1111
github.com/joelanford/go-apidiff v0.8.3
1212
github.com/onsi/ginkgo/v2 v2.23.4
@@ -25,20 +25,22 @@ require (
2525
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
2626
4d63.com/gochecknoglobals v0.2.2 // indirect
2727
cel.dev/expr v0.23.0 // indirect
28-
cloud.google.com/go v0.121.1 // indirect
28+
cloud.google.com/go v0.121.2 // indirect
2929
cloud.google.com/go/auth v0.16.2 // indirect
3030
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3131
cloud.google.com/go/compute/metadata v0.7.0 // indirect
3232
cloud.google.com/go/iam v1.5.2 // indirect
3333
cloud.google.com/go/monitoring v1.24.2 // indirect
3434
cloud.google.com/go/storage v1.55.0 // indirect
35+
codeberg.org/chavacava/garif v0.2.0 // indirect
3536
cuelabs.dev/go/oci/ociregistry v0.0.0-20240314152124-224736b49f2e // indirect
3637
cuelang.org/go v0.8.1 // indirect
3738
dario.cat/mergo v1.0.2 // indirect
3839
filippo.io/edwards25519 v1.1.0 // indirect
3940
github.com/4meepo/tagalign v1.4.2 // indirect
40-
github.com/Abirdcfly/dupword v0.1.3 // indirect
41+
github.com/Abirdcfly/dupword v0.1.6 // indirect
4142
github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/alibabacloudsdkgo/helper v0.2.0 // indirect
43+
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
4244
github.com/Antonboom/errname v1.1.0 // indirect
4345
github.com/Antonboom/nilnil v1.1.0 // indirect
4446
github.com/Antonboom/testifylint v1.6.1 // indirect
@@ -68,7 +70,7 @@ require (
6870
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
6971
github.com/VividCortex/ewma v1.2.0 // indirect
7072
github.com/agnivade/levenshtein v1.2.0 // indirect
71-
github.com/alecthomas/chroma/v2 v2.17.2 // indirect
73+
github.com/alecthomas/chroma/v2 v2.19.0 // indirect
7274
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
7375
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
7476
github.com/alexkohler/prealloc v1.0.0 // indirect
@@ -86,8 +88,8 @@ require (
8688
github.com/alingse/nilnesserr v0.2.0 // indirect
8789
github.com/aliyun/credentials-go v1.3.1 // indirect
8890
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
89-
github.com/ashanbrown/forbidigo v1.6.0 // indirect
90-
github.com/ashanbrown/makezero v1.2.0 // indirect
91+
github.com/ashanbrown/forbidigo/v2 v2.1.0 // indirect
92+
github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
9193
github.com/aws/aws-sdk-go v1.55.5 // indirect
9294
github.com/aws/aws-sdk-go-v2 v1.32.5 // indirect
9395
github.com/aws/aws-sdk-go-v2/config v1.28.5 // indirect
@@ -113,6 +115,7 @@ require (
113115
github.com/blang/semver/v4 v4.0.0 // indirect
114116
github.com/blizzy78/varnamelen v0.8.0 // indirect
115117
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
118+
github.com/bombsimon/wsl/v5 v5.1.1 // indirect
116119
github.com/breml/bidichk v0.3.3 // indirect
117120
github.com/breml/errchkjson v0.4.1 // indirect
118121
github.com/buildkite/agent/v3 v3.62.0 // indirect
@@ -121,15 +124,14 @@ require (
121124
github.com/butuzov/ireturn v0.4.0 // indirect
122125
github.com/butuzov/mirror v1.3.0 // indirect
123126
github.com/catenacyber/perfsprint v0.9.1 // indirect
124-
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
127+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
125128
github.com/cespare/xxhash/v2 v2.3.0 // indirect
126129
github.com/charithe/durationcheck v0.0.10 // indirect
127130
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
128131
github.com/charmbracelet/lipgloss v1.1.0 // indirect
129132
github.com/charmbracelet/x/ansi v0.8.0 // indirect
130133
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
131134
github.com/charmbracelet/x/term v0.2.1 // indirect
132-
github.com/chavacava/garif v0.1.0 // indirect
133135
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
134136
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
135137
github.com/ckaznocha/intrange v0.3.1 // indirect
@@ -143,7 +145,7 @@ require (
143145
github.com/curioswitch/go-reassign v0.3.0 // indirect
144146
github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 // indirect
145147
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
146-
github.com/daixiang0/gci v0.13.6 // indirect
148+
github.com/daixiang0/gci v0.13.7 // indirect
147149
github.com/dave/dst v0.27.3 // indirect
148150
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
149151
github.com/denis-tingaikin/go-header v0.5.0 // indirect
@@ -203,7 +205,7 @@ require (
203205
github.com/go-toolsmith/astp v1.1.0 // indirect
204206
github.com/go-toolsmith/strparse v1.1.0 // indirect
205207
github.com/go-toolsmith/typep v1.1.0 // indirect
206-
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
208+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
207209
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
208210
github.com/goark/errs v1.3.2 // indirect
209211
github.com/goark/go-cvss v1.6.6 // indirect
@@ -219,9 +221,10 @@ require (
219221
github.com/golangci/go-printf-func-name v0.1.0 // indirect
220222
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
221223
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
222-
github.com/golangci/misspell v0.6.0 // indirect
223-
github.com/golangci/plugin-module-register v0.1.1 // indirect
224+
github.com/golangci/misspell v0.7.0 // indirect
225+
github.com/golangci/plugin-module-register v0.1.2 // indirect
224226
github.com/golangci/revgrep v0.8.0 // indirect
227+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
225228
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
226229
github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 // indirect
227230
github.com/google/certificate-transparency-go v1.1.8 // indirect
@@ -232,7 +235,7 @@ require (
232235
github.com/google/go-github/v58 v58.0.0 // indirect
233236
github.com/google/go-querystring v1.1.0 // indirect
234237
github.com/google/licenseclassifier/v2 v2.0.0 // indirect
235-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
238+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
236239
github.com/google/s2a-go v0.1.9 // indirect
237240
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
238241
github.com/google/uuid v1.6.0 // indirect
@@ -256,9 +259,9 @@ require (
256259
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
257260
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
258261
github.com/jellydator/ttlcache/v3 v3.2.0 // indirect
259-
github.com/jgautheron/goconst v1.8.1 // indirect
262+
github.com/jgautheron/goconst v1.8.2 // indirect
260263
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
261-
github.com/jjti/go-spancheck v0.6.4 // indirect
264+
github.com/jjti/go-spancheck v0.6.5 // indirect
262265
github.com/jmespath/go-jmespath v0.4.0 // indirect
263266
github.com/josharian/intern v1.0.0 // indirect
264267
github.com/json-iterator/go v1.1.12 // indirect
@@ -272,24 +275,25 @@ require (
272275
github.com/kulti/thelper v0.6.3 // indirect
273276
github.com/kunwardeep/paralleltest v1.0.14 // indirect
274277
github.com/lasiar/canonicalheader v1.1.2 // indirect
275-
github.com/ldez/exptostd v0.4.3 // indirect
276-
github.com/ldez/gomoddirectives v0.6.1 // indirect
277-
github.com/ldez/grignotin v0.9.0 // indirect
278+
github.com/ldez/exptostd v0.4.4 // indirect
279+
github.com/ldez/gomoddirectives v0.7.0 // indirect
280+
github.com/ldez/grignotin v0.10.0 // indirect
278281
github.com/ldez/tagliatelle v0.7.1 // indirect
279-
github.com/ldez/usetesting v0.4.3 // indirect
282+
github.com/ldez/usetesting v0.5.0 // indirect
280283
github.com/leonklingele/grouper v1.1.2 // indirect
281284
github.com/letsencrypt/boulder v0.0.0-20231026200631-000cd05d5491 // indirect
282285
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
283286
github.com/macabu/inamedparam v0.2.0 // indirect
284287
github.com/mailru/easyjson v0.7.7 // indirect
285-
github.com/manuelarte/funcorder v0.2.1 // indirect
288+
github.com/manuelarte/embeddedstructfieldcheck v0.3.0 // indirect
289+
github.com/manuelarte/funcorder v0.5.0 // indirect
286290
github.com/maratori/testableexamples v1.0.0 // indirect
287291
github.com/maratori/testpackage v1.1.1 // indirect
288292
github.com/matoous/godox v1.1.0 // indirect
289293
github.com/mattn/go-colorable v0.1.14 // indirect
290294
github.com/mattn/go-isatty v0.0.20 // indirect
291295
github.com/mattn/go-runewidth v0.0.16 // indirect
292-
github.com/mgechev/revive v1.9.0 // indirect
296+
github.com/mgechev/revive v1.11.0 // indirect
293297
github.com/miekg/pkcs11 v1.1.1 // indirect
294298
github.com/mitchellh/go-homedir v1.1.0 // indirect
295299
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -307,10 +311,9 @@ require (
307311
github.com/nishanths/exhaustive v0.12.0 // indirect
308312
github.com/nishanths/predeclared v0.2.2 // indirect
309313
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
310-
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
314+
github.com/nunnatsa/ginkgolinter v0.20.0 // indirect
311315
github.com/oklog/ulid v1.3.1 // indirect
312316
github.com/oleiade/reflections v1.0.1 // indirect
313-
github.com/olekukonko/tablewriter v0.0.5 // indirect
314317
github.com/open-policy-agent/opa v0.70.0 // indirect
315318
github.com/opencontainers/go-digest v1.0.0 // indirect
316319
github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -343,13 +346,13 @@ require (
343346
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
344347
github.com/sagikazarmark/locafero v0.7.0 // indirect
345348
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
346-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
349+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
347350
github.com/saschagrunert/go-modiff v1.3.5 // indirect
348351
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
349-
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
352+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
350353
github.com/sassoftware/relic v7.2.1+incompatible // indirect
351354
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
352-
github.com/securego/gosec/v2 v2.22.3 // indirect
355+
github.com/securego/gosec/v2 v2.22.7 // indirect
353356
github.com/segmentio/ksuid v1.0.4 // indirect
354357
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
355358
github.com/shibumi/go-pathspec v1.3.0 // indirect
@@ -363,13 +366,13 @@ require (
363366
github.com/sivchari/containedctx v1.0.3 // indirect
364367
github.com/skeema/knownhosts v1.3.1 // indirect
365368
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
366-
github.com/sonatard/noctx v0.1.0 // indirect
369+
github.com/sonatard/noctx v0.4.0 // indirect
367370
github.com/sourcegraph/conc v0.3.0 // indirect
368371
github.com/sourcegraph/go-diff v0.7.0 // indirect
369372
github.com/spf13/afero v1.14.0 // indirect
370373
github.com/spf13/cast v1.7.1 // indirect
371374
github.com/spf13/cobra v1.9.1 // indirect
372-
github.com/spf13/pflag v1.0.6 // indirect
375+
github.com/spf13/pflag v1.0.7 // indirect
373376
github.com/spf13/viper v1.20.1 // indirect
374377
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
375378
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
@@ -393,7 +396,7 @@ require (
393396
github.com/ultraware/funlen v0.2.0 // indirect
394397
github.com/ultraware/whitespace v0.2.0 // indirect
395398
github.com/uudashr/gocognit v1.2.0 // indirect
396-
github.com/uudashr/iface v1.3.1 // indirect
399+
github.com/uudashr/iface v1.4.1 // indirect
397400
github.com/vbatts/tar-split v0.11.5 // indirect
398401
github.com/x448/float16 v0.8.4 // indirect
399402
github.com/xanzy/go-gitlab v0.102.0 // indirect
@@ -412,7 +415,8 @@ require (
412415
gitlab.alpinelinux.org/alpine/go v0.8.0 // indirect
413416
gitlab.com/bosi/decorder v0.4.2 // indirect
414417
go-simpler.org/musttag v0.13.1 // indirect
415-
go-simpler.org/sloglint v0.11.0 // indirect
418+
go-simpler.org/sloglint v0.11.1 // indirect
419+
go.augendre.info/arangolint v0.2.0 // indirect
416420
go.augendre.info/fatcontext v0.8.0 // indirect
417421
go.mongodb.org/mongo-driver v1.14.0 // indirect
418422
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
@@ -432,22 +436,22 @@ require (
432436
go.yaml.in/yaml/v3 v3.0.3 // indirect
433437
golang.org/x/crypto v0.40.0 // indirect
434438
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
435-
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
436-
golang.org/x/mod v0.25.0 // indirect
439+
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
440+
golang.org/x/mod v0.26.0 // indirect
437441
golang.org/x/net v0.42.0 // indirect
438442
golang.org/x/oauth2 v0.30.0 // indirect
439443
golang.org/x/sync v0.16.0 // indirect
440444
golang.org/x/sys v0.34.0 // indirect
441-
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
445+
golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b // indirect
442446
golang.org/x/term v0.33.0 // indirect
443447
golang.org/x/text v0.27.0 // indirect
444448
golang.org/x/time v0.12.0 // indirect
445-
golang.org/x/tools v0.34.0 // indirect
449+
golang.org/x/tools v0.35.0 // indirect
446450
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
447451
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
448-
google.golang.org/api v0.241.0 // indirect
452+
google.golang.org/api v0.242.0 // indirect
449453
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
450-
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
454+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
451455
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
452456
google.golang.org/grpc v1.73.0 // indirect
453457
google.golang.org/protobuf v1.36.6 // indirect

0 commit comments

Comments
 (0)