Skip to content

Commit 71d9064

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3771 from Ankitasw/golangci-lint-bump
Bump golangci-lint in /hack/tools and aws-iam-authenticator
2 parents e43049d + e6df8a6 commit 71d9064

File tree

12 files changed

+1557
-171
lines changed

12 files changed

+1557
-171
lines changed

‎api/v1beta2/awsmachine_webhook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestAWSMachine_Create(t *testing.T) {
104104
wantErr: true,
105105
},
106106
{
107-
name: "ensure ensure IOPS exists if type equal to io1 for non root volumes",
107+
name: "ensure IOPS exists if type equal to io1 for non root volumes",
108108
machine: &AWSMachine{
109109
Spec: AWSMachineSpec{
110110
NonRootVolumes: []Volume{
@@ -119,7 +119,7 @@ func TestAWSMachine_Create(t *testing.T) {
119119
wantErr: true,
120120
},
121121
{
122-
name: "ensure ensure IOPS exists if type equal to io2 for non root volumes",
122+
name: "ensure IOPS exists if type equal to io2 for non root volumes",
123123
machine: &AWSMachine{
124124
Spec: AWSMachineSpec{
125125
NonRootVolumes: []Volume{

‎docs/book/cmd/amilist/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func LambdaHandler() error {
6262

6363
data, err := json.MarshalIndent(amis, "", " ")
6464
if err != nil {
65-
ctrl.Log.Error(err, "error marshalling marshalling")
65+
ctrl.Log.Error(err, "error marshalling")
6666
return err
6767
}
6868

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/apparentlymart/go-cidr v1.1.0
1010
github.com/aws/amazon-vpc-cni-k8s v1.11.4
1111
github.com/aws/aws-lambda-go v1.34.1
12-
github.com/aws/aws-sdk-go v1.43.29
12+
github.com/aws/aws-sdk-go v1.44.107
1313
github.com/awslabs/goformation/v4 v4.19.5
1414
github.com/blang/semver v3.5.1+incompatible
1515
github.com/flatcar/ignition v0.36.2
@@ -36,7 +36,7 @@ require (
3636
k8s.io/component-base v0.24.2
3737
k8s.io/klog/v2 v2.80.0
3838
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
39-
sigs.k8s.io/aws-iam-authenticator v0.5.9
39+
sigs.k8s.io/aws-iam-authenticator v0.5.10
4040
sigs.k8s.io/cluster-api v1.2.2
4141
sigs.k8s.io/cluster-api/test v1.2.2
4242
sigs.k8s.io/controller-runtime v0.12.3

‎go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ github.com/aws/amazon-vpc-cni-k8s v1.11.4/go.mod h1:w8f1LLPue3xzRw7F9NPNWZt1B/yj
9797
github.com/aws/aws-lambda-go v1.34.1 h1:M3a/uFYBjii+tDcOJ0wL/WyFi2550FHoECdPf27zvOs=
9898
github.com/aws/aws-lambda-go v1.34.1/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM=
9999
github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
100-
github.com/aws/aws-sdk-go v1.43.28/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
101-
github.com/aws/aws-sdk-go v1.43.29 h1:P6tBpMLwVLS/QwPkaBxfDIF3SmPouoacIk+/7NKnDxY=
102-
github.com/aws/aws-sdk-go v1.43.29/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
100+
github.com/aws/aws-sdk-go v1.44.107 h1:VP7Rq3wzsOV7wrfHqjAAKRksD4We58PaoVSDPKhm8nw=
101+
github.com/aws/aws-sdk-go v1.44.107/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
103102
github.com/awslabs/goformation/v4 v4.19.5 h1:Y+Tzh01tWg8gf//AgGKUamaja7Wx9NPiJf1FpZu4/iU=
104103
github.com/awslabs/goformation/v4 v4.19.5/go.mod h1:JoNpnVCBOUtEz9bFxc9sjy8uBUCLF5c4D1L7RhRTVM8=
105104
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -1262,8 +1261,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
12621261
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12631262
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12641263
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
1265-
sigs.k8s.io/aws-iam-authenticator v0.5.9 h1:r0xXKCAZVBKRZkJRdy/nm8bEQbBjjw+3xi0rzi31RJE=
1266-
sigs.k8s.io/aws-iam-authenticator v0.5.9/go.mod h1:6dId2LCc8oHqeBzP6E8ndp4DflhKTxYLb5ZXwI4YmFA=
1264+
sigs.k8s.io/aws-iam-authenticator v0.5.10 h1:YGPh/SpRxNkWXfGkURKGsgWvz70x41SB4QazrU7R3Wk=
1265+
sigs.k8s.io/aws-iam-authenticator v0.5.10/go.mod h1:3oJI6vy91KxVSb9g+v9gtJsFnFDJoq+ySJhGDBKpKFk=
12671266
sigs.k8s.io/cluster-api v1.2.2 h1:acx31Eyv5s4xeublsbxWpRFjcQ5h4BmDPI0glm3sEoE=
12681267
sigs.k8s.io/cluster-api v1.2.2/go.mod h1:oiuV+mlCV1QxDnuI+PfElFlAfuXHo9ZGVBojoihVtHY=
12691268
sigs.k8s.io/cluster-api/test v1.2.2 h1:DUVmlCVQ0H7zY1doxzS1JuooUjXxTN80i9swc16tZd0=

‎hack/tools/go.mod

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/a8m/envsubst v1.3.0
77
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
88
github.com/golang/mock v1.6.0
9-
github.com/golangci/golangci-lint v1.49.0
9+
github.com/golangci/golangci-lint v1.50.0
1010
github.com/itchyny/gojq v0.12.9
1111
github.com/joelanford/go-apidiff v0.4.0
1212
github.com/onsi/ginkgo v1.16.5
@@ -25,14 +25,15 @@ require (
2525

2626
require (
2727
4d63.com/gochecknoglobals v0.1.0 // indirect
28+
github.com/Abirdcfly/dupword v0.0.7 // indirect
2829
github.com/Antonboom/errname v0.1.7 // indirect
2930
github.com/Antonboom/nilnil v0.1.1 // indirect
3031
github.com/BurntSushi/toml v1.2.0 // indirect
3132
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
3233
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
3334
github.com/Masterminds/semver v1.5.0 // indirect
3435
github.com/Microsoft/go-winio v0.5.0 // indirect
35-
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
36+
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
3637
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
3738
github.com/PuerkitoBio/purell v1.1.1 // indirect
3839
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -54,8 +55,8 @@ require (
5455
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5556
github.com/charithe/durationcheck v0.0.9 // indirect
5657
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
57-
github.com/curioswitch/go-reassign v0.1.2 // indirect
58-
github.com/daixiang0/gci v0.6.3 // indirect
58+
github.com/curioswitch/go-reassign v0.2.0 // indirect
59+
github.com/daixiang0/gci v0.8.0 // indirect
5960
github.com/davecgh/go-spew v1.1.1 // indirect
6061
github.com/denis-tingaikin/go-header v0.4.3 // indirect
6162
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
@@ -69,7 +70,7 @@ require (
6970
github.com/firefart/nonamedreturns v1.0.4 // indirect
7071
github.com/fsnotify/fsnotify v1.5.4 // indirect
7172
github.com/fzipp/gocyclo v0.6.0 // indirect
72-
github.com/go-critic/go-critic v0.6.4 // indirect
73+
github.com/go-critic/go-critic v0.6.5 // indirect
7374
github.com/go-errors/errors v1.0.1 // indirect
7475
github.com/go-git/gcfg v1.5.0 // indirect
7576
github.com/go-git/go-billy/v5 v5.3.1 // indirect
@@ -81,8 +82,8 @@ require (
8182
github.com/go-openapi/swag v0.19.14 // indirect
8283
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
8384
github.com/go-toolsmith/astcast v1.0.0 // indirect
84-
github.com/go-toolsmith/astcopy v1.0.1 // indirect
85-
github.com/go-toolsmith/astequal v1.0.2 // indirect
85+
github.com/go-toolsmith/astcopy v1.0.2 // indirect
86+
github.com/go-toolsmith/astequal v1.0.3 // indirect
8687
github.com/go-toolsmith/astfmt v1.0.0 // indirect
8788
github.com/go-toolsmith/astp v1.0.0 // indirect
8889
github.com/go-toolsmith/strparse v1.0.0 // indirect
@@ -96,14 +97,14 @@ require (
9697
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
9798
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
9899
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
99-
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
100+
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
100101
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
101102
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
102103
github.com/golangci/misspell v0.3.5 // indirect
103104
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
104105
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
105106
github.com/google/gnostic v0.5.7-v3refs // indirect
106-
github.com/google/go-cmp v0.5.8 // indirect
107+
github.com/google/go-cmp v0.5.9 // indirect
107108
github.com/google/gofuzz v1.1.0 // indirect
108109
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
109110
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
@@ -129,6 +130,7 @@ require (
129130
github.com/kevinburke/ssh_config v1.1.0 // indirect
130131
github.com/kisielk/errcheck v1.6.2 // indirect
131132
github.com/kisielk/gotool v1.0.0 // indirect
133+
github.com/kkHAIKE/contextcheck v1.1.2 // indirect
132134
github.com/kulti/thelper v0.6.3 // indirect
133135
github.com/kunwardeep/paralleltest v1.0.6 // indirect
134136
github.com/kyoh86/exportloopref v0.1.8 // indirect
@@ -138,14 +140,15 @@ require (
138140
github.com/lufeee/execinquery v1.2.1 // indirect
139141
github.com/magiconair/properties v1.8.6 // indirect
140142
github.com/mailru/easyjson v0.7.6 // indirect
143+
github.com/maratori/testableexamples v1.0.0 // indirect
141144
github.com/maratori/testpackage v1.1.0 // indirect
142145
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
143146
github.com/mattn/go-colorable v0.1.13 // indirect
144147
github.com/mattn/go-isatty v0.0.16 // indirect
145148
github.com/mattn/go-runewidth v0.0.13 // indirect
146149
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
147150
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
148-
github.com/mgechev/revive v1.2.3 // indirect
151+
github.com/mgechev/revive v1.2.4 // indirect
149152
github.com/mitchellh/go-homedir v1.1.0 // indirect
150153
github.com/mitchellh/mapstructure v1.5.0 // indirect
151154
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -154,23 +157,23 @@ require (
154157
github.com/moricho/tparallel v0.2.1 // indirect
155158
github.com/nakabonne/nestif v0.3.1 // indirect
156159
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
157-
github.com/nishanths/exhaustive v0.8.1 // indirect
160+
github.com/nishanths/exhaustive v0.8.3 // indirect
158161
github.com/nishanths/predeclared v0.2.2 // indirect
159162
github.com/nxadm/tail v1.4.8 // indirect
160163
github.com/olekukonko/tablewriter v0.0.5 // indirect
161164
github.com/onsi/gomega v1.20.0 // indirect
162165
github.com/pelletier/go-toml v1.9.5 // indirect
163-
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
166+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
164167
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
165168
github.com/pkg/errors v0.9.1 // indirect
166169
github.com/pmezard/go-difflib v1.0.0 // indirect
167-
github.com/polyfloyd/go-errorlint v1.0.2 // indirect
170+
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
168171
github.com/prometheus/client_golang v1.12.1 // indirect
169172
github.com/prometheus/client_model v0.2.0 // indirect
170173
github.com/prometheus/common v0.32.1 // indirect
171174
github.com/prometheus/procfs v0.7.3 // indirect
172-
github.com/quasilyte/go-ruleguard v0.3.17 // indirect
173-
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
175+
github.com/quasilyte/go-ruleguard v0.3.18 // indirect
176+
github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
174177
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
175178
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
176179
github.com/rivo/uniseg v0.2.0 // indirect
@@ -179,7 +182,7 @@ require (
179182
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
180183
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
181184
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
182-
github.com/sashamelentyev/usestdlibvars v1.13.0 // indirect
185+
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
183186
github.com/securego/gosec/v2 v2.13.1 // indirect
184187
github.com/sergi/go-diff v1.2.0 // indirect
185188
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
@@ -193,17 +196,16 @@ require (
193196
github.com/spf13/cast v1.5.0 // indirect
194197
github.com/spf13/cobra v1.5.0 // indirect
195198
github.com/spf13/jwalterweatherman v1.1.0 // indirect
196-
github.com/spf13/viper v1.12.0 // indirect
199+
github.com/spf13/viper v1.13.0 // indirect
197200
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
198201
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
199202
github.com/stretchr/objx v0.4.0 // indirect
200203
github.com/stretchr/testify v1.8.0 // indirect
201-
github.com/subosito/gotenv v1.4.0 // indirect
202-
github.com/sylvia7788/contextcheck v1.0.6 // indirect
204+
github.com/subosito/gotenv v1.4.1 // indirect
203205
github.com/tdakkota/asciicheck v0.1.1 // indirect
204206
github.com/tetafro/godot v1.4.11 // indirect
205207
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
206-
github.com/timonwong/logrlint v0.1.0 // indirect
208+
github.com/timonwong/loggercheck v0.9.3 // indirect
207209
github.com/tomarrell/wrapcheck/v2 v2.6.2 // indirect
208210
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
209211
github.com/ultraware/funlen v0.0.3 // indirect
@@ -220,16 +222,16 @@ require (
220222
go.uber.org/zap v1.19.1 // indirect
221223
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
222224
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
223-
golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
225+
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
224226
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
225227
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
226-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
227-
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
228+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
229+
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
228230
golang.org/x/text v0.3.7 // indirect
229231
golang.org/x/tools v0.1.12 // indirect
230232
google.golang.org/protobuf v1.28.0 // indirect
231233
gopkg.in/inf.v0 v0.9.1 // indirect
232-
gopkg.in/ini.v1 v1.66.6 // indirect
234+
gopkg.in/ini.v1 v1.67.0 // indirect
233235
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
234236
gopkg.in/warnings.v0 v0.1.2 // indirect
235237
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -240,7 +242,7 @@ require (
240242
k8s.io/klog v0.2.0 // indirect
241243
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
242244
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
243-
mvdan.cc/gofumpt v0.3.1 // indirect
245+
mvdan.cc/gofumpt v0.4.0 // indirect
244246
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
245247
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
246248
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect

0 commit comments

Comments
 (0)