Skip to content

Commit 801ea8d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8796 from killianmuldoon/pr-update-golangci-lint
🌱 Update golangci-lint to v1.53.3
2 parents ab2f3dc + 3e16abc commit 801ea8d

File tree

165 files changed

+961
-970
lines changed

Some content is hidden

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

165 files changed

+961
-970
lines changed

‎.github/workflows/golangci-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ jobs:
3030
- name: golangci-lint
3131
uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # tag=v3.6.0
3232
with:
33-
version: v1.52.1
33+
version: v1.53.3
3434
working-directory: ${{matrix.working-directory}}

‎.golangci.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ linters:
1717
- bidichk
1818
- bodyclose
1919
- containedctx
20-
- depguard
2120
- dogsled
2221
- dupword
2322
- durationcheck
@@ -60,13 +59,6 @@ linters:
6059
linters-settings:
6160
gci:
6261
local-prefixes: "sigs.k8s.io/cluster-api"
63-
ginkgolinter:
64-
# Suppress the wrong length assertion warning.
65-
suppress-len-assertion: false
66-
# Suppress the wrong nil assertion warning.
67-
suppress-nil-assertion: false
68-
# Suppress the wrong error assertion warning.
69-
suppress-err-assertion: true
7062
godot:
7163
# declarations - for top level declaration comments (default);
7264
# toplevel - for top level comments;

‎api/v1alpha4/cluster_types_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func TestClusterIPFamily(t *testing.T) {
9595
g := NewWithT(t)
9696
ipFamily, err := tt.c.GetIPFamily()
9797
g.Expect(ipFamily).To(Equal(tt.expectRes))
98-
g.Expect(err).NotTo(HaveOccurred())
98+
g.Expect(err).ToNot(HaveOccurred())
9999
})
100100
}
101101

@@ -129,7 +129,7 @@ func TestClusterIPFamily(t *testing.T) {
129129
g := NewWithT(t)
130130
ipFamily, err := tt.c.GetIPFamily()
131131
g.Expect(ipFamily).To(Equal(tt.expectRes))
132-
g.Expect(err).NotTo(HaveOccurred())
132+
g.Expect(err).ToNot(HaveOccurred())
133133
})
134134
}
135135

‎api/v1beta1/cluster_types_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func TestClusterIPFamily(t *testing.T) {
9595
g := NewWithT(t)
9696
ipFamily, err := tt.c.GetIPFamily()
9797
g.Expect(ipFamily).To(Equal(tt.expectRes))
98-
g.Expect(err).NotTo(HaveOccurred())
98+
g.Expect(err).ToNot(HaveOccurred())
9999
})
100100
}
101101

@@ -129,7 +129,7 @@ func TestClusterIPFamily(t *testing.T) {
129129
g := NewWithT(t)
130130
ipFamily, err := tt.c.GetIPFamily()
131131
g.Expect(ipFamily).To(Equal(tt.expectRes))
132-
g.Expect(err).NotTo(HaveOccurred())
132+
g.Expect(err).ToNot(HaveOccurred())
133133
})
134134
}
135135

‎api/v1beta1/machine_webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func TestMachineClusterNameImmutable(t *testing.T) {
206206
g.Expect(err).To(HaveOccurred())
207207
g.Expect(warnings).To(BeEmpty())
208208
} else {
209-
g.Expect(err).NotTo(HaveOccurred())
209+
g.Expect(err).ToNot(HaveOccurred())
210210
g.Expect(warnings).To(BeEmpty())
211211
}
212212
})

‎api/v1beta1/machinedeployment_webhook_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,10 @@ func TestMachineDeploymentValidation(t *testing.T) {
401401
g.Expect(warnings).To(BeEmpty())
402402
} else {
403403
warnings, err := md.ValidateCreate()
404-
g.Expect(err).NotTo(HaveOccurred())
404+
g.Expect(err).ToNot(HaveOccurred())
405405
g.Expect(warnings).To(BeEmpty())
406406
warnings, err = md.ValidateUpdate(md)
407-
g.Expect(err).NotTo(HaveOccurred())
407+
g.Expect(err).ToNot(HaveOccurred())
408408
g.Expect(warnings).To(BeEmpty())
409409
}
410410
})
@@ -519,7 +519,7 @@ func TestMachineDeploymentClusterNameImmutable(t *testing.T) {
519519
if tt.expectErr {
520520
g.Expect(err).To(HaveOccurred())
521521
} else {
522-
g.Expect(err).NotTo(HaveOccurred())
522+
g.Expect(err).ToNot(HaveOccurred())
523523
}
524524
g.Expect(warnings).To(BeEmpty())
525525
})
@@ -549,22 +549,22 @@ func defaultValidateTestCustomDefaulter(object admission.Validator, customDefaul
549549
g := NewWithT(t)
550550
g.Expect(customDefaulter.Default(ctx, createCopy)).To(Succeed())
551551
warnings, err := createCopy.ValidateCreate()
552-
g.Expect(err).NotTo(HaveOccurred())
552+
g.Expect(err).ToNot(HaveOccurred())
553553
g.Expect(warnings).To(BeEmpty())
554554
})
555555
t.Run("validate-on-update", func(t *testing.T) {
556556
g := NewWithT(t)
557557
g.Expect(customDefaulter.Default(ctx, defaultingUpdateCopy)).To(Succeed())
558558
g.Expect(customDefaulter.Default(ctx, updateCopy)).To(Succeed())
559559
warnings, err := defaultingUpdateCopy.ValidateUpdate(updateCopy)
560-
g.Expect(err).NotTo(HaveOccurred())
560+
g.Expect(err).ToNot(HaveOccurred())
561561
g.Expect(warnings).To(BeEmpty())
562562
})
563563
t.Run("validate-on-delete", func(t *testing.T) {
564564
g := NewWithT(t)
565565
g.Expect(customDefaulter.Default(ctx, deleteCopy)).To(Succeed())
566566
warnings, err := deleteCopy.ValidateDelete()
567-
g.Expect(err).NotTo(HaveOccurred())
567+
g.Expect(err).ToNot(HaveOccurred())
568568
g.Expect(warnings).To(BeEmpty())
569569
})
570570
}

‎api/v1beta1/machinehealthcheck_webhook_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ func TestMachineHealthCheckLabelSelectorAsSelectorValidation(t *testing.T) {
100100
g.Expect(warnings).To(BeEmpty())
101101
} else {
102102
warnings, err := mhc.ValidateCreate()
103-
g.Expect(err).NotTo(HaveOccurred())
103+
g.Expect(err).ToNot(HaveOccurred())
104104
g.Expect(warnings).To(BeEmpty())
105105
warnings, err = mhc.ValidateUpdate(mhc)
106-
g.Expect(err).NotTo(HaveOccurred())
106+
g.Expect(err).ToNot(HaveOccurred())
107107
g.Expect(warnings).To(BeEmpty())
108108
}
109109
})
@@ -172,7 +172,7 @@ func TestMachineHealthCheckClusterNameImmutable(t *testing.T) {
172172
if tt.expectErr {
173173
g.Expect(err).To(HaveOccurred())
174174
} else {
175-
g.Expect(err).NotTo(HaveOccurred())
175+
g.Expect(err).ToNot(HaveOccurred())
176176
}
177177
g.Expect(warnings).To(BeEmpty())
178178
})
@@ -229,10 +229,10 @@ func TestMachineHealthCheckUnhealthyConditions(t *testing.T) {
229229
g.Expect(warnings).To(BeEmpty())
230230
} else {
231231
warnings, err := mhc.ValidateCreate()
232-
g.Expect(err).NotTo(HaveOccurred())
232+
g.Expect(err).ToNot(HaveOccurred())
233233
g.Expect(warnings).To(BeEmpty())
234234
warnings, err = mhc.ValidateUpdate(mhc)
235-
g.Expect(err).NotTo(HaveOccurred())
235+
g.Expect(err).ToNot(HaveOccurred())
236236
g.Expect(warnings).To(BeEmpty())
237237
}
238238
})
@@ -312,10 +312,10 @@ func TestMachineHealthCheckNodeStartupTimeout(t *testing.T) {
312312
g.Expect(warnings).To(BeEmpty())
313313
} else {
314314
warnings, err := mhc.ValidateCreate()
315-
g.Expect(err).NotTo(HaveOccurred())
315+
g.Expect(err).ToNot(HaveOccurred())
316316
g.Expect(warnings).To(BeEmpty())
317317
warnings, err = mhc.ValidateUpdate(mhc)
318-
g.Expect(err).NotTo(HaveOccurred())
318+
g.Expect(err).ToNot(HaveOccurred())
319319
g.Expect(warnings).To(BeEmpty())
320320
}
321321
}
@@ -379,10 +379,10 @@ func TestMachineHealthCheckMaxUnhealthy(t *testing.T) {
379379
g.Expect(warnings).To(BeEmpty())
380380
} else {
381381
warnings, err := mhc.ValidateCreate()
382-
g.Expect(err).NotTo(HaveOccurred())
382+
g.Expect(err).ToNot(HaveOccurred())
383383
g.Expect(warnings).To(BeEmpty())
384384
warnings, err = mhc.ValidateUpdate(mhc)
385-
g.Expect(err).NotTo(HaveOccurred())
385+
g.Expect(err).ToNot(HaveOccurred())
386386
g.Expect(warnings).To(BeEmpty())
387387
}
388388
}
@@ -401,7 +401,7 @@ func TestMachineHealthCheckSelectorValidation(t *testing.T) {
401401
},
402402
}
403403
err := mhc.validate(nil)
404-
g.Expect(err).ToNot(BeNil())
404+
g.Expect(err).To(HaveOccurred())
405405
g.Expect(err.Error()).To(ContainSubstring("selector must not be empty"))
406406
}
407407

‎api/v1beta1/machineset_webhook_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ func TestMachineSetLabelSelectorMatchValidation(t *testing.T) {
114114
g.Expect(warnings).To(BeEmpty())
115115
} else {
116116
warnings, err := ms.ValidateCreate()
117-
g.Expect(err).NotTo(HaveOccurred())
117+
g.Expect(err).ToNot(HaveOccurred())
118118
g.Expect(warnings).To(BeEmpty())
119119
warnings, err = ms.ValidateUpdate(ms)
120-
g.Expect(err).NotTo(HaveOccurred())
120+
g.Expect(err).ToNot(HaveOccurred())
121121
g.Expect(warnings).To(BeEmpty())
122122
}
123123
})
@@ -165,7 +165,7 @@ func TestMachineSetClusterNameImmutable(t *testing.T) {
165165
if tt.expectErr {
166166
g.Expect(err).To(HaveOccurred())
167167
} else {
168-
g.Expect(err).NotTo(HaveOccurred())
168+
g.Expect(err).ToNot(HaveOccurred())
169169
}
170170
g.Expect(warnings).To(BeEmpty())
171171
})
@@ -228,10 +228,10 @@ func TestMachineSetVersionValidation(t *testing.T) {
228228
g.Expect(warnings).To(BeEmpty())
229229
} else {
230230
warnings, err := md.ValidateCreate()
231-
g.Expect(err).NotTo(HaveOccurred())
231+
g.Expect(err).ToNot(HaveOccurred())
232232
g.Expect(warnings).To(BeEmpty())
233233
warnings, err = md.ValidateUpdate(md)
234-
g.Expect(err).NotTo(HaveOccurred())
234+
g.Expect(err).ToNot(HaveOccurred())
235235
g.Expect(warnings).To(BeEmpty())
236236
}
237237
})
@@ -300,9 +300,9 @@ func TestValidateSkippedMachineSetPreflightChecks(t *testing.T) {
300300
g := NewWithT(t)
301301
err := validateSkippedMachineSetPreflightChecks(tt.ms)
302302
if tt.expectErr {
303-
g.Expect(err).NotTo(BeNil())
303+
g.Expect(err).To(HaveOccurred())
304304
} else {
305-
g.Expect(err).To(BeNil())
305+
g.Expect(err).ToNot(HaveOccurred())
306306
}
307307
})
308308
}

‎bootstrap/kubeadm/api/v1alpha4/kubeadm_types_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestMarshalJSON(t *testing.T) {
3939
g := NewWithT(t)
4040

4141
b, err := json.Marshal(rt.bts)
42-
g.Expect(err).NotTo(HaveOccurred())
42+
g.Expect(err).ToNot(HaveOccurred())
4343
g.Expect(string(b)).To(Equal(rt.expected))
4444
})
4545
}
@@ -69,7 +69,7 @@ func TestUnmarshalJSON(t *testing.T) {
6969
if rt.expectedError {
7070
g.Expect(err).To(HaveOccurred())
7171
} else {
72-
g.Expect(err).NotTo(HaveOccurred())
72+
g.Expect(err).ToNot(HaveOccurred())
7373
}
7474
g.Expect(newbts).To(Equal(rt.bts))
7575
})
@@ -180,7 +180,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
180180
if rt.expectedError {
181181
g.Expect(err).To(HaveOccurred())
182182
} else {
183-
g.Expect(err).NotTo(HaveOccurred())
183+
g.Expect(err).ToNot(HaveOccurred())
184184
}
185185
g.Expect(actual).To(Equal(rt.bts))
186186
})

‎bootstrap/kubeadm/api/v1beta1/kubeadm_types_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestNodeRegistrationOptionsMarshalJSON(t *testing.T) {
7777
g := NewWithT(t)
7878

7979
b, err := tt.opts.MarshalJSON()
80-
g.Expect(err).NotTo(HaveOccurred())
80+
g.Expect(err).ToNot(HaveOccurred())
8181
g.Expect(string(b)).To(Equal(tt.expected))
8282
})
8383
}
@@ -97,7 +97,7 @@ func TestBootstrapTokenStringMarshalJSON(t *testing.T) {
9797
g := NewWithT(t)
9898

9999
b, err := json.Marshal(rt.bts)
100-
g.Expect(err).NotTo(HaveOccurred())
100+
g.Expect(err).ToNot(HaveOccurred())
101101
g.Expect(string(b)).To(Equal(rt.expected))
102102
})
103103
}
@@ -127,7 +127,7 @@ func TestBootstrapTokenStringUnmarshalJSON(t *testing.T) {
127127
if rt.expectedError {
128128
g.Expect(err).To(HaveOccurred())
129129
} else {
130-
g.Expect(err).NotTo(HaveOccurred())
130+
g.Expect(err).ToNot(HaveOccurred())
131131
}
132132
g.Expect(newbts).To(Equal(rt.bts))
133133
})
@@ -238,7 +238,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
238238
if rt.expectedError {
239239
g.Expect(err).To(HaveOccurred())
240240
} else {
241-
g.Expect(err).NotTo(HaveOccurred())
241+
g.Expect(err).ToNot(HaveOccurred())
242242
}
243243
g.Expect(actual).To(Equal(rt.bts))
244244
})

0 commit comments

Comments
 (0)