Skip to content

Commit 52377f0

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2141 from JoelSpeed/update-fix-linter
Update linter fixing to use golangci-lint
2 parents c1a063b + 8fd16e2 commit 52377f0

File tree

385 files changed

+22894
-10621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+22894
-10621
lines changed

‎Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ PULL_BASE_SHA ?= master
4444

4545
.PHONY: lint
4646
lint:
47-
hack/golangci-lint.sh run --new-from-rev=${PULL_BASE_SHA}
47+
hack/golangci-lint.sh run --new-from-rev=${PULL_BASE_SHA} ${EXTRA_ARGS}
4848

49-
# While https://github.com/golangci/golangci-lint/issues/1779 is not fixed,
50-
# we need to run the fix separately from the lint command.
51-
# GolangCI-Lint will not actually run the fixer for us.
52-
# In the future we can remove this and have the linter auto-fix.
5349
.PHONY: lint-fix
54-
lint-fix:
55-
hack/lint-fix.sh
50+
lint-fix: EXTRA_ARGS=--fix
51+
lint-fix: lint
5652

5753
# Ignore the exit code of the fix lint, it will always error as there are unfixed issues
5854
# that cannot be fixed from historic commits.

‎hack/lint-fix.sh

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

‎tools/.custom-gcl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version: v1.62.0
1+
version: v1.63.4
22
name: golangci-kal
33
destination: ./bin
44
plugins:
55
- module: 'github.com/JoelSpeed/kal'
6-
version: v0.0.0-20241217211810-b52f67ed8ff3
6+
version: v0.0.0-20250106180308-e8da2ea1f7d6

‎tools/go.mod

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ toolchain go1.23.0
66

77
require (
88
cloud.google.com/go/storage v1.43.0
9-
github.com/JoelSpeed/kal v0.0.0-20241217211810-b52f67ed8ff3
9+
github.com/JoelSpeed/kal v0.0.0-20250106180308-e8da2ea1f7d6
1010
github.com/dave/dst v0.27.3
1111
github.com/ghodss/yaml v1.0.0
1212
github.com/go-git/go-git/v5 v5.12.0
1313
github.com/gogo/protobuf v1.3.2
14-
github.com/golangci/golangci-lint v1.62.2
14+
github.com/golangci/golangci-lint v1.63.4
1515
github.com/google/go-cmp v0.6.0
1616
github.com/mikefarah/yq/v4 v4.44.5
1717
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a
@@ -20,7 +20,7 @@ require (
2020
github.com/spf13/cobra v1.8.1
2121
github.com/spf13/pflag v1.0.5
2222
github.com/vmware-archive/yaml-patch v0.0.11
23-
golang.org/x/tools v0.27.0
23+
golang.org/x/tools v0.28.0
2424
gopkg.in/yaml.v3 v3.0.1
2525
k8s.io/apiextensions-apiserver v0.31.1
2626
k8s.io/apimachinery v0.31.2
@@ -48,10 +48,10 @@ require (
4848
cloud.google.com/go/compute/metadata v0.5.1 // indirect
4949
cloud.google.com/go/iam v1.2.0 // indirect
5050
dario.cat/mergo v1.0.0 // indirect
51-
github.com/4meepo/tagalign v1.3.4 // indirect
51+
github.com/4meepo/tagalign v1.4.1 // indirect
5252
github.com/Abirdcfly/dupword v0.1.3 // indirect
5353
github.com/Antonboom/errname v1.0.0 // indirect
54-
github.com/Antonboom/nilnil v1.0.0 // indirect
54+
github.com/Antonboom/nilnil v1.0.1 // indirect
5555
github.com/Antonboom/testifylint v1.5.2 // indirect
5656
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
5757
github.com/Crocmagnon/fatcontext v0.5.3 // indirect
@@ -62,33 +62,34 @@ require (
6262
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
6363
github.com/ProtonMail/go-crypto v1.0.0 // indirect
6464
github.com/a8m/envsubst v1.4.2 // indirect
65-
github.com/alecthomas/go-check-sumtype v0.2.0 // indirect
65+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
6666
github.com/alecthomas/participle/v2 v2.1.1 // indirect
6767
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
6868
github.com/alexkohler/prealloc v1.0.0 // indirect
6969
github.com/alingse/asasalint v0.0.11 // indirect
70+
github.com/alingse/nilnesserr v0.1.1 // indirect
7071
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7172
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
7273
github.com/ashanbrown/forbidigo v1.6.0 // indirect
73-
github.com/ashanbrown/makezero v1.1.1 // indirect
74+
github.com/ashanbrown/makezero v1.2.0 // indirect
7475
github.com/beorn7/perks v1.0.1 // indirect
7576
github.com/bkielbasa/cyclop v1.2.3 // indirect
7677
github.com/blang/semver/v4 v4.0.0 // indirect
7778
github.com/blizzy78/varnamelen v0.8.0 // indirect
78-
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
79+
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
7980
github.com/breml/bidichk v0.3.2 // indirect
8081
github.com/breml/errchkjson v0.4.0 // indirect
81-
github.com/butuzov/ireturn v0.3.0 // indirect
82-
github.com/butuzov/mirror v1.2.0 // indirect
82+
github.com/butuzov/ireturn v0.3.1 // indirect
83+
github.com/butuzov/mirror v1.3.0 // indirect
8384
github.com/catenacyber/perfsprint v0.7.1 // indirect
8485
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
8586
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
8687
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8788
github.com/charithe/durationcheck v0.0.10 // indirect
8889
github.com/chavacava/garif v0.1.0 // indirect
89-
github.com/ckaznocha/intrange v0.2.1 // indirect
90+
github.com/ckaznocha/intrange v0.3.0 // indirect
9091
github.com/cloudflare/circl v1.3.7 // indirect
91-
github.com/curioswitch/go-reassign v0.2.0 // indirect
92+
github.com/curioswitch/go-reassign v0.3.0 // indirect
9293
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
9394
github.com/daixiang0/gci v0.13.5 // indirect
9495
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -122,7 +123,7 @@ require (
122123
github.com/go-toolsmith/strparse v1.1.0 // indirect
123124
github.com/go-toolsmith/typep v1.1.0 // indirect
124125
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
125-
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
126+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
126127
github.com/gobuffalo/flect v1.0.2 // indirect
127128
github.com/gobwas/glob v0.2.3 // indirect
128129
github.com/goccy/go-json v0.10.3 // indirect
@@ -132,9 +133,8 @@ require (
132133
github.com/golang/protobuf v1.5.4 // indirect
133134
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
134135
github.com/golangci/go-printf-func-name v0.1.0 // indirect
135-
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
136+
github.com/golangci/gofmt v0.0.0-20241223200906-057b0627d9b9 // indirect
136137
github.com/golangci/misspell v0.6.0 // indirect
137-
github.com/golangci/modinfo v0.3.4 // indirect
138138
github.com/golangci/plugin-module-register v0.1.1 // indirect
139139
github.com/golangci/revgrep v0.5.3 // indirect
140140
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
@@ -151,7 +151,9 @@ require (
151151
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
152152
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
153153
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
154+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
154155
github.com/hashicorp/go-version v1.7.0 // indirect
156+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
155157
github.com/hashicorp/hcl v1.0.0 // indirect
156158
github.com/hexops/gotextdiff v1.0.3 // indirect
157159
github.com/imdario/mergo v0.3.7 // indirect
@@ -161,10 +163,10 @@ require (
161163
github.com/jgautheron/goconst v1.7.1 // indirect
162164
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
163165
github.com/jinzhu/copier v0.4.0 // indirect
164-
github.com/jjti/go-spancheck v0.6.2 // indirect
166+
github.com/jjti/go-spancheck v0.6.4 // indirect
165167
github.com/josharian/intern v1.0.0 // indirect
166168
github.com/json-iterator/go v1.1.12 // indirect
167-
github.com/julz/importas v0.1.0 // indirect
169+
github.com/julz/importas v0.2.0 // indirect
168170
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
169171
github.com/kevinburke/ssh_config v1.2.0 // indirect
170172
github.com/kisielk/errcheck v1.8.0 // indirect
@@ -174,8 +176,11 @@ require (
174176
github.com/kunwardeep/paralleltest v1.0.10 // indirect
175177
github.com/kyoh86/exportloopref v0.1.11 // indirect
176178
github.com/lasiar/canonicalheader v1.1.2 // indirect
177-
github.com/ldez/gomoddirectives v0.2.4 // indirect
178-
github.com/ldez/tagliatelle v0.5.0 // indirect
179+
github.com/ldez/exptostd v0.3.1 // indirect
180+
github.com/ldez/gomoddirectives v0.6.0 // indirect
181+
github.com/ldez/grignotin v0.7.0 // indirect
182+
github.com/ldez/tagliatelle v0.7.1 // indirect
183+
github.com/ldez/usetesting v0.4.2 // indirect
179184
github.com/leonklingele/grouper v1.1.2 // indirect
180185
github.com/macabu/inamedparam v0.1.3 // indirect
181186
github.com/magiconair/properties v1.8.7 // indirect
@@ -196,7 +201,7 @@ require (
196201
github.com/nakabonne/nestif v0.3.1 // indirect
197202
github.com/nishanths/exhaustive v0.12.0 // indirect
198203
github.com/nishanths/predeclared v0.2.2 // indirect
199-
github.com/nunnatsa/ginkgolinter v0.18.3 // indirect
204+
github.com/nunnatsa/ginkgolinter v0.18.4 // indirect
200205
github.com/olekukonko/tablewriter v0.0.5 // indirect
201206
github.com/pelletier/go-toml v1.9.5 // indirect
202207
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -212,15 +217,15 @@ require (
212217
github.com/quasilyte/gogrep v0.5.0 // indirect
213218
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
214219
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
215-
github.com/raeperd/recvcheck v0.1.2 // indirect
220+
github.com/raeperd/recvcheck v0.2.0 // indirect
216221
github.com/rivo/uniseg v0.4.7 // indirect
217222
github.com/rogpeppe/go-internal v1.13.1 // indirect
218223
github.com/ryancurrah/gomodguard v1.3.5 // indirect
219224
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
220-
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
221-
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
225+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
226+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
222227
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
223-
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
228+
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
224229
github.com/securego/gosec/v2 v2.21.4 // indirect
225230
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
226231
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
@@ -235,21 +240,21 @@ require (
235240
github.com/spf13/jwalterweatherman v1.1.0 // indirect
236241
github.com/spf13/viper v1.12.0 // indirect
237242
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
238-
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
243+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
239244
github.com/stoewer/go-strcase v1.2.0 // indirect
240245
github.com/stretchr/objx v0.5.2 // indirect
241246
github.com/stretchr/testify v1.10.0 // indirect
242247
github.com/subosito/gotenv v1.4.1 // indirect
243-
github.com/tdakkota/asciicheck v0.2.0 // indirect
244-
github.com/tetafro/godot v1.4.18 // indirect
245-
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
248+
github.com/tdakkota/asciicheck v0.3.0 // indirect
249+
github.com/tetafro/godot v1.4.20 // indirect
250+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
246251
github.com/timonwong/loggercheck v0.10.1 // indirect
247-
github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
252+
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
248253
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
249-
github.com/ultraware/funlen v0.1.0 // indirect
250-
github.com/ultraware/whitespace v0.1.1 // indirect
251-
github.com/uudashr/gocognit v1.1.3 // indirect
252-
github.com/uudashr/iface v1.2.1 // indirect
254+
github.com/ultraware/funlen v0.2.0 // indirect
255+
github.com/ultraware/whitespace v0.2.0 // indirect
256+
github.com/uudashr/gocognit v1.2.0 // indirect
257+
github.com/uudashr/iface v1.3.0 // indirect
253258
github.com/x448/float16 v0.8.4 // indirect
254259
github.com/xanzy/ssh-agent v0.3.3 // indirect
255260
github.com/xen0n/gosmopolitan v1.2.2 // indirect
@@ -273,16 +278,16 @@ require (
273278
go.uber.org/automaxprocs v1.6.0 // indirect
274279
go.uber.org/multierr v1.11.0 // indirect
275280
go.uber.org/zap v1.26.0 // indirect
276-
golang.org/x/crypto v0.29.0 // indirect
281+
golang.org/x/crypto v0.30.0 // indirect
277282
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
278283
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
279284
golang.org/x/mod v0.22.0 // indirect
280-
golang.org/x/net v0.31.0 // indirect
285+
golang.org/x/net v0.32.0 // indirect
281286
golang.org/x/oauth2 v0.23.0 // indirect
282-
golang.org/x/sync v0.9.0 // indirect
283-
golang.org/x/sys v0.27.0 // indirect
284-
golang.org/x/term v0.26.0 // indirect
285-
golang.org/x/text v0.20.0 // indirect
287+
golang.org/x/sync v0.10.0 // indirect
288+
golang.org/x/sys v0.28.0 // indirect
289+
golang.org/x/term v0.27.0 // indirect
290+
golang.org/x/text v0.21.0 // indirect
286291
golang.org/x/time v0.6.0 // indirect
287292
google.golang.org/api v0.198.0 // indirect
288293
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect

0 commit comments

Comments
 (0)