Skip to content

Commit fe3bdfd

Browse files
authored
Merge pull request #916 from aramase/golangci-lint
chore: update golangci-lint to v1.45.2 and pin to go 1.17
2 parents 9e39ed6 + 2c0743e commit fe3bdfd

File tree

3 files changed

+483
-207
lines changed

3 files changed

+483
-207
lines changed

.golangci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ run:
33
skip-dirs: []
44
skip-files:
55
- "zz_generated.*\\.go$"
6+
# some of the linters don't work correctly with 1.18
7+
# xref: https://github.com/golangci/golangci-lint/issues/2649
8+
# we are not using generics, so we can pin this to 1.17
9+
# the base image used for prow is updated to use 1.18, so pinning the version
10+
go: '1.17'
611

712
linters:
813
disable-all: true

hack/tools/go.mod

Lines changed: 82 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,49 @@ go 1.17
44

55
require (
66
github.com/golang/protobuf v1.5.2
7-
github.com/golangci/golangci-lint v1.41.1
7+
github.com/golangci/golangci-lint v1.45.2
88
k8s.io/code-generator v0.22.2
99
sigs.k8s.io/controller-tools v0.7.0
1010
sigs.k8s.io/kustomize/kustomize/v3 v3.10.0
1111
)
1212

1313
require (
14-
4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect
15-
github.com/BurntSushi/toml v0.3.1 // indirect
14+
4d63.com/gochecknoglobals v0.1.0 // indirect
15+
github.com/Antonboom/errname v0.1.5 // indirect
16+
github.com/Antonboom/nilnil v0.1.0 // indirect
17+
github.com/BurntSushi/toml v1.0.0 // indirect
1618
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
1719
github.com/Masterminds/semver v1.5.0 // indirect
18-
github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
20+
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
1921
github.com/PuerkitoBio/purell v1.1.1 // indirect
2022
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2123
github.com/alexkohler/prealloc v1.0.0 // indirect
2224
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
23-
github.com/ashanbrown/forbidigo v1.2.0 // indirect
24-
github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde // indirect
25+
github.com/ashanbrown/forbidigo v1.3.0 // indirect
26+
github.com/ashanbrown/makezero v1.1.1 // indirect
2527
github.com/beorn7/perks v1.0.1 // indirect
2628
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2729
github.com/bkielbasa/cyclop v1.2.0 // indirect
30+
github.com/blizzy78/varnamelen v0.6.1 // indirect
2831
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
29-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
30-
github.com/charithe/durationcheck v0.0.8 // indirect
32+
github.com/breml/bidichk v0.2.2 // indirect
33+
github.com/breml/errchkjson v0.2.3 // indirect
34+
github.com/butuzov/ireturn v0.1.1 // indirect
35+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
36+
github.com/charithe/durationcheck v0.0.9 // indirect
3137
github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect
32-
github.com/daixiang0/gci v0.2.8 // indirect
38+
github.com/daixiang0/gci v0.3.3 // indirect
3339
github.com/davecgh/go-spew v1.1.1 // indirect
34-
github.com/denis-tingajkin/go-header v0.4.2 // indirect
40+
github.com/denis-tingaikin/go-header v0.4.3 // indirect
3541
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
36-
github.com/esimonov/ifshort v1.0.2 // indirect
42+
github.com/esimonov/ifshort v1.0.4 // indirect
3743
github.com/ettle/strcase v0.1.1 // indirect
3844
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
39-
github.com/fatih/color v1.12.0 // indirect
45+
github.com/fatih/color v1.13.0 // indirect
4046
github.com/fatih/structtag v1.2.0 // indirect
41-
github.com/fsnotify/fsnotify v1.4.9 // indirect
42-
github.com/fzipp/gocyclo v0.3.1 // indirect
43-
github.com/go-critic/go-critic v0.5.6 // indirect
47+
github.com/fsnotify/fsnotify v1.5.1 // indirect
48+
github.com/fzipp/gocyclo v0.4.0 // indirect
49+
github.com/go-critic/go-critic v0.6.2 // indirect
4450
github.com/go-errors/errors v1.0.1 // indirect
4551
github.com/go-logr/logr v0.4.0 // indirect
4652
github.com/go-openapi/analysis v0.19.5 // indirect
@@ -56,15 +62,15 @@ require (
5662
github.com/go-stack/stack v1.8.0 // indirect
5763
github.com/go-toolsmith/astcast v1.0.0 // indirect
5864
github.com/go-toolsmith/astcopy v1.0.0 // indirect
59-
github.com/go-toolsmith/astequal v1.0.0 // indirect
65+
github.com/go-toolsmith/astequal v1.0.1 // indirect
6066
github.com/go-toolsmith/astfmt v1.0.0 // indirect
6167
github.com/go-toolsmith/astp v1.0.0 // indirect
6268
github.com/go-toolsmith/strparse v1.0.0 // indirect
6369
github.com/go-toolsmith/typep v1.0.2 // indirect
6470
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
6571
github.com/gobuffalo/flect v0.2.3 // indirect
6672
github.com/gobwas/glob v0.2.3 // indirect
67-
github.com/gofrs/flock v0.8.0 // indirect
73+
github.com/gofrs/flock v0.8.1 // indirect
6874
github.com/gogo/protobuf v1.3.2 // indirect
6975
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
7076
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
@@ -73,127 +79,135 @@ require (
7379
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
7480
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
7581
github.com/golangci/misspell v0.3.5 // indirect
76-
github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 // indirect
82+
github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
7783
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
78-
github.com/google/go-cmp v0.5.6 // indirect
84+
github.com/google/go-cmp v0.5.7 // indirect
7985
github.com/google/gofuzz v1.1.0 // indirect
8086
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
81-
github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect
82-
github.com/gostaticanalysis/analysisutil v0.4.1 // indirect
83-
github.com/gostaticanalysis/comment v1.4.1 // indirect
84-
github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 // indirect
87+
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
88+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
89+
github.com/gostaticanalysis/comment v1.4.2 // indirect
90+
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
8591
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
8692
github.com/hashicorp/errwrap v1.0.0 // indirect
87-
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
93+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8894
github.com/hashicorp/go-multierror v1.1.1 // indirect
8995
github.com/hashicorp/go-safetemp v1.0.0 // indirect
90-
github.com/hashicorp/go-version v1.1.0 // indirect
96+
github.com/hashicorp/go-version v1.4.0 // indirect
9197
github.com/hashicorp/hcl v1.0.0 // indirect
98+
github.com/hexops/gotextdiff v1.0.3 // indirect
9299
github.com/imdario/mergo v0.3.8 // indirect
93100
github.com/inconshreveable/mousetrap v1.0.0 // indirect
94101
github.com/jgautheron/goconst v1.5.1 // indirect
95-
github.com/jingyugao/rowserrcheck v1.1.0 // indirect
102+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
96103
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
97104
github.com/josharian/intern v1.0.0 // indirect
98-
github.com/json-iterator/go v1.1.11 // indirect
99-
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect
105+
github.com/json-iterator/go v1.1.12 // indirect
106+
github.com/julz/importas v0.1.0 // indirect
100107
github.com/kisielk/errcheck v1.6.0 // indirect
101108
github.com/kisielk/gotool v1.0.0 // indirect
102-
github.com/kulti/thelper v0.4.0 // indirect
103-
github.com/kunwardeep/paralleltest v1.0.2 // indirect
109+
github.com/kulti/thelper v0.5.1 // indirect
110+
github.com/kunwardeep/paralleltest v1.0.3 // indirect
104111
github.com/kyoh86/exportloopref v0.1.8 // indirect
105-
github.com/ldez/gomoddirectives v0.2.1 // indirect
106-
github.com/ldez/tagliatelle v0.2.0 // indirect
112+
github.com/ldez/gomoddirectives v0.2.2 // indirect
113+
github.com/ldez/tagliatelle v0.3.1 // indirect
114+
github.com/leonklingele/grouper v1.1.0 // indirect
107115
github.com/magiconair/properties v1.8.5 // indirect
108116
github.com/mailru/easyjson v0.7.6 // indirect
109117
github.com/maratori/testpackage v1.0.1 // indirect
110118
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
111-
github.com/mattn/go-colorable v0.1.8 // indirect
112-
github.com/mattn/go-isatty v0.0.12 // indirect
119+
github.com/mattn/go-colorable v0.1.12 // indirect
120+
github.com/mattn/go-isatty v0.0.14 // indirect
113121
github.com/mattn/go-runewidth v0.0.9 // indirect
114122
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
115123
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
116-
github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 // indirect
117-
github.com/mgechev/revive v1.0.7 // indirect
124+
github.com/mgechev/revive v1.1.4 // indirect
118125
github.com/mitchellh/go-homedir v1.1.0 // indirect
119126
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
120-
github.com/mitchellh/mapstructure v1.4.1 // indirect
127+
github.com/mitchellh/mapstructure v1.4.3 // indirect
121128
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
122-
github.com/modern-go/reflect2 v1.0.1 // indirect
129+
github.com/modern-go/reflect2 v1.0.2 // indirect
123130
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
124131
github.com/moricho/tparallel v0.2.1 // indirect
125-
github.com/nakabonne/nestif v0.3.0 // indirect
132+
github.com/nakabonne/nestif v0.3.1 // indirect
126133
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
127-
github.com/nishanths/exhaustive v0.1.0 // indirect
134+
github.com/nishanths/exhaustive v0.7.11 // indirect
128135
github.com/nishanths/predeclared v0.2.1 // indirect
129136
github.com/olekukonko/tablewriter v0.0.5 // indirect
130-
github.com/pelletier/go-toml v1.9.3 // indirect
137+
github.com/pelletier/go-toml v1.9.4 // indirect
131138
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
132139
github.com/pkg/errors v0.9.1 // indirect
133140
github.com/pmezard/go-difflib v1.0.0 // indirect
134-
github.com/polyfloyd/go-errorlint v0.0.0-20210510181950-ab96adb96fea // indirect
141+
github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b // indirect
135142
github.com/prometheus/client_golang v1.11.0 // indirect
136143
github.com/prometheus/client_model v0.2.0 // indirect
137144
github.com/prometheus/common v0.26.0 // indirect
138145
github.com/prometheus/procfs v0.6.0 // indirect
139146
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d // indirect
140-
github.com/quasilyte/go-ruleguard v0.3.4 // indirect
147+
github.com/quasilyte/go-ruleguard v0.3.15 // indirect
148+
github.com/quasilyte/gogrep v0.0.0-20220103110004-ffaa07af02e3 // indirect
141149
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
142-
github.com/ryancurrah/gomodguard v1.2.2 // indirect
150+
github.com/ryancurrah/gomodguard v1.2.3 // indirect
143151
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
144152
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
145-
github.com/securego/gosec/v2 v2.8.0 // indirect
153+
github.com/securego/gosec/v2 v2.10.0 // indirect
146154
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
147155
github.com/sirupsen/logrus v1.8.1 // indirect
156+
github.com/sivchari/containedctx v1.0.2 // indirect
157+
github.com/sivchari/tenv v1.4.7 // indirect
148158
github.com/sonatard/noctx v0.0.1 // indirect
149159
github.com/sourcegraph/go-diff v0.6.1 // indirect
150160
github.com/spf13/afero v1.6.0 // indirect
151-
github.com/spf13/cast v1.3.1 // indirect
152-
github.com/spf13/cobra v1.2.1 // indirect
161+
github.com/spf13/cast v1.4.1 // indirect
162+
github.com/spf13/cobra v1.4.0 // indirect
153163
github.com/spf13/jwalterweatherman v1.1.0 // indirect
154164
github.com/spf13/pflag v1.0.5 // indirect
155-
github.com/spf13/viper v1.8.1 // indirect
156-
github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect
165+
github.com/spf13/viper v1.10.1 // indirect
166+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
157167
github.com/stretchr/objx v0.2.0 // indirect
158-
github.com/stretchr/testify v1.7.0 // indirect
168+
github.com/stretchr/testify v1.7.1 // indirect
159169
github.com/subosito/gotenv v1.2.0 // indirect
160-
github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect
161-
github.com/tetafro/godot v1.4.7 // indirect
162-
github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect
163-
github.com/tomarrell/wrapcheck/v2 v2.1.0 // indirect
164-
github.com/tommy-muehle/go-mnd/v2 v2.4.0 // indirect
170+
github.com/sylvia7788/contextcheck v1.0.4 // indirect
171+
github.com/tdakkota/asciicheck v0.1.1 // indirect
172+
github.com/tetafro/godot v1.4.11 // indirect
173+
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
174+
github.com/tomarrell/wrapcheck/v2 v2.5.0 // indirect
175+
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
165176
github.com/ulikunitz/xz v0.5.8 // indirect
166177
github.com/ultraware/funlen v0.0.3 // indirect
167-
github.com/ultraware/whitespace v0.0.4 // indirect
168-
github.com/uudashr/gocognit v1.0.1 // indirect
178+
github.com/ultraware/whitespace v0.0.5 // indirect
179+
github.com/uudashr/gocognit v1.0.5 // indirect
169180
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
170-
github.com/yeya24/promlinter v0.1.0 // indirect
181+
github.com/yagipy/maintidx v1.0.0 // indirect
182+
github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1 // indirect
171183
github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf // indirect
184+
gitlab.com/bosi/decorder v0.2.1 // indirect
172185
go.mongodb.org/mongo-driver v1.1.2 // indirect
173186
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
174-
golang.org/x/mod v0.4.2 // indirect
175-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
176-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
177-
golang.org/x/text v0.3.6 // indirect
178-
golang.org/x/tools v0.1.5 // indirect
187+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
188+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
189+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
190+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
191+
golang.org/x/text v0.3.7 // indirect
192+
golang.org/x/tools v0.1.10 // indirect
179193
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
180-
google.golang.org/protobuf v1.26.0 // indirect
194+
google.golang.org/protobuf v1.27.1 // indirect
181195
gopkg.in/inf.v0 v0.9.1 // indirect
182-
gopkg.in/ini.v1 v1.62.0 // indirect
196+
gopkg.in/ini.v1 v1.66.2 // indirect
183197
gopkg.in/yaml.v2 v2.4.0 // indirect
184198
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
185-
honnef.co/go/tools v0.2.0 // indirect
199+
honnef.co/go/tools v0.2.2 // indirect
186200
k8s.io/api v0.22.2 // indirect
187201
k8s.io/apiextensions-apiserver v0.22.2 // indirect
188202
k8s.io/apimachinery v0.22.2 // indirect
189203
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
190204
k8s.io/klog/v2 v2.9.0 // indirect
191205
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
192206
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
193-
mvdan.cc/gofumpt v0.1.1 // indirect
207+
mvdan.cc/gofumpt v0.3.0 // indirect
194208
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
195209
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
196-
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect
210+
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 // indirect
197211
sigs.k8s.io/kustomize/api v0.8.0 // indirect
198212
sigs.k8s.io/kustomize/cmd/config v0.9.1 // indirect
199213
sigs.k8s.io/kustomize/kyaml v0.10.9 // indirect

0 commit comments

Comments
 (0)