Skip to content

Commit 9d72308

Browse files
furkatgofurov7Ankitasw
furkatgofurov7
authored and
Ankitasw
committed
Bump golangci-lint to v1.53.3 and make necessary changes
Signed-off-by: Furkat Gofurov <[email protected]>
1 parent 602ba5c commit 9d72308

20 files changed

+112
-116
lines changed

‎.golangci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ linters-settings:
8787
alias: apiextensionsv1
8888
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
8989
alias: metav1
90-
- pkg: k8s.io/apimachinery/pkg/api/errors
91-
alias: apierrors
9290
- pkg: k8s.io/apimachinery/pkg/util/errors
9391
alias: kerrors
9492
- pkg: sigs.k8s.io/controller-runtime/pkg/conversion
@@ -165,6 +163,12 @@ linters-settings:
165163
go: "1.20"
166164
stylecheck:
167165
go: "1.20"
166+
depguard:
167+
rules:
168+
main:
169+
deny:
170+
- pkg: "io/ioutil"
171+
desc: "ioutil is deprecated starting with Go 1.16"
168172
issues:
169173
max-same-issues: 0
170174
max-issues-per-linter: 0

‎api/v1beta2/awscluster_webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ func TestAWSClusterValidateCreate(t *testing.T) {
476476
g.Eventually(func() bool {
477477
err := testEnv.Get(ctx, key, c)
478478
return err == nil
479-
}, 10*time.Second).Should(Equal(true))
479+
}, 10*time.Second).Should(BeTrue())
480480

481481
if tt.expect != nil {
482482
tt.expect(g, c.Spec.ControlPlaneLoadBalancer)

‎api/v1beta2/bastion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func validateSSHKeyName(sshKeyName *string) field.ErrorList {
5656
// nil is accepted
5757
case sshKeyName != nil && *sshKeyName == "":
5858
// empty string is accepted
59-
case sshKeyName != nil && !sshKeyValidNameRegex.Match([]byte(*sshKeyName)):
59+
case sshKeyName != nil && !sshKeyValidNameRegex.MatchString(*sshKeyName):
6060
allErrs = append(allErrs, field.Invalid(field.NewPath("sshKeyName"), sshKeyName, "Name is invalid. Must be specified in ASCII and must not start or end in whitespace"))
6161
}
6262
return allErrs

‎bootstrap/eks/controllers/eksconfig_controller.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (r *EKSConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
143143
}
144144
}()
145145

146-
return r.joinWorker(ctx, cluster, config, configOwner)
146+
return ctrl.Result{}, r.joinWorker(ctx, cluster, config, configOwner)
147147
}
148148

149149
func (r *EKSConfigReconciler) resolveFiles(ctx context.Context, cfg *eksbootstrapv1.EKSConfig) ([]eksbootstrapv1.File, error) {
@@ -181,7 +181,7 @@ func (r *EKSConfigReconciler) resolveSecretFileContent(ctx context.Context, ns s
181181
return data, nil
182182
}
183183

184-
func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1.Cluster, config *eksbootstrapv1.EKSConfig, configOwner *bsutil.ConfigOwner) (ctrl.Result, error) {
184+
func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1.Cluster, config *eksbootstrapv1.EKSConfig, configOwner *bsutil.ConfigOwner) error {
185185
log := logger.FromContext(ctx)
186186

187187
// only need to reconcile the secret for Machine kinds once, but MachinePools need updates for new launch templates
@@ -195,15 +195,15 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
195195
err := r.Client.Get(ctx, secretKey, existingSecret)
196196
switch {
197197
case err == nil:
198-
return ctrl.Result{}, nil
198+
return nil
199199
case !apierrors.IsNotFound(err):
200200
log.Error(err, "unable to check for existing bootstrap secret")
201-
return ctrl.Result{}, err
201+
return err
202202
}
203203
}
204204

205205
if cluster.Spec.ControlPlaneRef == nil || cluster.Spec.ControlPlaneRef.Kind != "AWSManagedControlPlane" {
206-
return ctrl.Result{}, errors.New("Cluster's controlPlaneRef needs to be an AWSManagedControlPlane in order to use the EKS bootstrap provider")
206+
return errors.New("Cluster's controlPlaneRef needs to be an AWSManagedControlPlane in order to use the EKS bootstrap provider")
207207
}
208208

209209
if !cluster.Status.InfrastructureReady {
@@ -212,26 +212,26 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
212212
eksbootstrapv1.DataSecretAvailableCondition,
213213
eksbootstrapv1.WaitingForClusterInfrastructureReason,
214214
clusterv1.ConditionSeverityInfo, "")
215-
return ctrl.Result{}, nil
215+
return nil
216216
}
217217

218218
if !conditions.IsTrue(cluster, clusterv1.ControlPlaneInitializedCondition) {
219219
log.Info("Control Plane has not yet been initialized")
220220
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.WaitingForControlPlaneInitializationReason, clusterv1.ConditionSeverityInfo, "")
221-
return ctrl.Result{}, nil
221+
return nil
222222
}
223223

224224
controlPlane := &ekscontrolplanev1.AWSManagedControlPlane{}
225225
if err := r.Get(ctx, client.ObjectKey{Name: cluster.Spec.ControlPlaneRef.Name, Namespace: cluster.Spec.ControlPlaneRef.Namespace}, controlPlane); err != nil {
226-
return ctrl.Result{}, err
226+
return err
227227
}
228228

229229
log.Info("Generating userdata")
230230
files, err := r.resolveFiles(ctx, config)
231231
if err != nil {
232232
log.Info("Failed to resolve files for user data")
233233
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
234-
return ctrl.Result{}, err
234+
return err
235235
}
236236

237237
nodeInput := &userdata.NodeInput{
@@ -276,17 +276,17 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
276276
if err != nil {
277277
log.Error(err, "Failed to create a worker join configuration")
278278
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, "")
279-
return ctrl.Result{}, err
279+
return err
280280
}
281281

282282
// store userdata as secret
283283
if err := r.storeBootstrapData(ctx, cluster, config, userDataScript); err != nil {
284284
log.Error(err, "Failed to store bootstrap data")
285285
conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition, eksbootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, "")
286-
return ctrl.Result{}, err
286+
return err
287287
}
288288

289-
return ctrl.Result{}, nil
289+
return nil
290290
}
291291

292292
func (r *EKSConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, option controller.Options) error {

‎bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ func TestEKSConfigReconciler(t *testing.T) {
5656
}
5757
t.Logf(fmt.Sprintf("Calling reconcile on cluster '%s' and config '%s' should requeue", cluster.Name, config.Name))
5858
g.Eventually(func(gomega Gomega) {
59-
result, err := reconciler.joinWorker(ctx, cluster, config, configOwner("Machine"))
59+
err := reconciler.joinWorker(ctx, cluster, config, configOwner("Machine"))
6060
gomega.Expect(err).NotTo(HaveOccurred())
61-
gomega.Expect(result.Requeue).To(BeFalse())
6261
}).Should(Succeed())
6362

6463
t.Logf(fmt.Sprintf("Secret '%s' should exist and be correct", config.Name))
@@ -111,9 +110,8 @@ func TestEKSConfigReconciler(t *testing.T) {
111110
}
112111
t.Logf(fmt.Sprintf("Calling reconcile on cluster '%s' and config '%s' should requeue", cluster.Name, config.Name))
113112
g.Eventually(func(gomega Gomega) {
114-
result, err := reconciler.joinWorker(ctx, cluster, config, configOwner("MachinePool"))
113+
err := reconciler.joinWorker(ctx, cluster, config, configOwner("MachinePool"))
115114
gomega.Expect(err).NotTo(HaveOccurred())
116-
gomega.Expect(result.Requeue).To(BeFalse())
117115
}).Should(Succeed())
118116

119117
t.Logf(fmt.Sprintf("Secret '%s' should exist and be correct", config.Name))
@@ -136,9 +134,8 @@ func TestEKSConfigReconciler(t *testing.T) {
136134
}
137135
t.Logf(dump("config", config))
138136
g.Eventually(func(gomega Gomega) {
139-
result, err := reconciler.joinWorker(ctx, cluster, config, configOwner("MachinePool"))
137+
err := reconciler.joinWorker(ctx, cluster, config, configOwner("MachinePool"))
140138
gomega.Expect(err).NotTo(HaveOccurred())
141-
gomega.Expect(result.Requeue).To(BeFalse())
142139
}).Should(Succeed())
143140
t.Logf(fmt.Sprintf("Secret '%s' should exist and be up to date", config.Name))
144141

@@ -184,9 +181,8 @@ func TestEKSConfigReconciler(t *testing.T) {
184181
}
185182
t.Logf(fmt.Sprintf("Calling reconcile on cluster '%s' and config '%s' should requeue", cluster.Name, config.Name))
186183
g.Eventually(func(gomega Gomega) {
187-
result, err := reconciler.joinWorker(ctx, cluster, config, configOwner("Machine"))
184+
err := reconciler.joinWorker(ctx, cluster, config, configOwner("Machine"))
188185
gomega.Expect(err).NotTo(HaveOccurred())
189-
gomega.Expect(result.Requeue).To(BeFalse())
190186
}).Should(Succeed())
191187

192188
t.Logf(fmt.Sprintf("Secret '%s' should exist and be out of date", config.Name))
@@ -258,9 +254,8 @@ func TestEKSConfigReconciler(t *testing.T) {
258254
}
259255
t.Logf(fmt.Sprintf("Calling reconcile on cluster '%s' and config '%s' should requeue", cluster.Name, config.Name))
260256
g.Eventually(func(gomega Gomega) {
261-
result, err := reconciler.joinWorker(ctx, cluster, config, configOwner("Machine"))
257+
err := reconciler.joinWorker(ctx, cluster, config, configOwner("Machine"))
262258
gomega.Expect(err).NotTo(HaveOccurred())
263-
gomega.Expect(result.Requeue).To(BeFalse())
264259
}).Should(Succeed())
265260

266261
secretList := &corev1.SecretList{}

‎bootstrap/eks/controllers/eksconfig_controller_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
. "github.com/onsi/gomega"
2424
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
25-
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2625

2726
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2827
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
@@ -44,8 +43,7 @@ func TestEKSConfigReconcilerReturnEarlyIfClusterInfraNotReady(t *testing.T) {
4443
}
4544

4645
g.Eventually(func(gomega Gomega) {
47-
result, err := reconciler.joinWorker(context.Background(), cluster, config, configOwner("Machine"))
48-
gomega.Expect(result).To(Equal(reconcile.Result{}))
46+
err := reconciler.joinWorker(context.Background(), cluster, config, configOwner("Machine"))
4947
gomega.Expect(err).NotTo(HaveOccurred())
5048
}).Should(Succeed())
5149
}
@@ -66,8 +64,7 @@ func TestEKSConfigReconcilerReturnEarlyIfClusterControlPlaneNotInitialized(t *te
6664
}
6765

6866
g.Eventually(func(gomega Gomega) {
69-
result, err := reconciler.joinWorker(context.Background(), cluster, config, configOwner("Machine"))
70-
gomega.Expect(result).To(Equal(reconcile.Result{}))
67+
err := reconciler.joinWorker(context.Background(), cluster, config, configOwner("Machine"))
7168
gomega.Expect(err).NotTo(HaveOccurred())
7269
}).Should(Succeed())
7370
}

‎controllers/awscluster_controller.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,14 @@ func (r *AWSClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
191191

192192
// Handle deleted clusters
193193
if !awsCluster.DeletionTimestamp.IsZero() {
194-
return r.reconcileDelete(ctx, clusterScope)
194+
return ctrl.Result{}, r.reconcileDelete(ctx, clusterScope)
195195
}
196196

197197
// Handle non-deleted clusters
198198
return r.reconcileNormal(clusterScope)
199199
}
200200

201-
func (r *AWSClusterReconciler) reconcileDelete(ctx context.Context, clusterScope *scope.ClusterScope) (reconcile.Result, error) {
201+
func (r *AWSClusterReconciler) reconcileDelete(ctx context.Context, clusterScope *scope.ClusterScope) error {
202202
clusterScope.Info("Reconciling AWSCluster delete")
203203

204204
ec2svc := r.getEC2Service(clusterScope)
@@ -217,39 +217,39 @@ func (r *AWSClusterReconciler) reconcileDelete(ctx context.Context, clusterScope
217217

218218
if err := elbsvc.DeleteLoadbalancers(); err != nil {
219219
clusterScope.Error(err, "error deleting load balancer")
220-
return reconcile.Result{}, err
220+
return err
221221
}
222222

223223
if err := ec2svc.DeleteBastion(); err != nil {
224224
clusterScope.Error(err, "error deleting bastion")
225-
return reconcile.Result{}, err
225+
return err
226226
}
227227

228228
if err := sgService.DeleteSecurityGroups(); err != nil {
229229
clusterScope.Error(err, "error deleting security groups")
230-
return reconcile.Result{}, err
230+
return err
231231
}
232232

233233
if r.ExternalResourceGC {
234234
gcSvc := gc.NewService(clusterScope, gc.WithGCStrategy(r.AlternativeGCStrategy))
235235
if gcErr := gcSvc.ReconcileDelete(ctx); gcErr != nil {
236-
return reconcile.Result{}, fmt.Errorf("failed delete reconcile for gc service: %w", gcErr)
236+
return fmt.Errorf("failed delete reconcile for gc service: %w", gcErr)
237237
}
238238
}
239239

240240
if err := networkSvc.DeleteNetwork(); err != nil {
241241
clusterScope.Error(err, "error deleting network")
242-
return reconcile.Result{}, err
242+
return err
243243
}
244244

245245
if err := s3Service.DeleteBucket(); err != nil {
246-
return reconcile.Result{}, errors.Wrapf(err, "error deleting S3 Bucket")
246+
return errors.Wrapf(err, "error deleting S3 Bucket")
247247
}
248248

249249
// Cluster is deleted so remove the finalizer.
250250
controllerutil.RemoveFinalizer(clusterScope.AWSCluster, infrav1.ClusterFinalizer)
251251

252-
return reconcile.Result{}, nil
252+
return nil
253253
}
254254

255255
func (r *AWSClusterReconciler) reconcileNormal(clusterScope *scope.ClusterScope) (reconcile.Result, error) {

‎controllers/awscluster_controller_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
9898
}
9999
err := testEnv.Get(ctx, key, cluster)
100100
return err == nil
101-
}, 10*time.Second).Should(Equal(true))
101+
}, 10*time.Second).Should(BeTrue())
102102

103103
defer teardown()
104104
defer t.Cleanup(func() {
@@ -197,7 +197,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
197197
}
198198
err := testEnv.Get(ctx, key, cluster)
199199
return err == nil
200-
}, 10*time.Second).Should(Equal(true))
200+
}, 10*time.Second).Should(BeTrue())
201201

202202
defer teardown()
203203
defer t.Cleanup(func() {
@@ -303,7 +303,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
303303
}
304304
err := testEnv.Get(ctx, key, cluster)
305305
return err == nil
306-
}, 10*time.Second).Should(Equal(true))
306+
}, 10*time.Second).Should(BeTrue())
307307
defer t.Cleanup(func() {
308308
g.Expect(testEnv.Cleanup(ctx, &awsCluster, controllerIdentity, ns)).To(Succeed())
309309
})
@@ -333,7 +333,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
333333
_, err = reconciler.reconcileNormal(cs)
334334
g.Expect(err.Error()).To(ContainSubstring("The maximum number of VPCs has been reached"))
335335

336-
_, err = reconciler.reconcileDelete(ctx, cs)
336+
err = reconciler.reconcileDelete(ctx, cs)
337337
g.Expect(err).To(BeNil())
338338
})
339339
t.Run("Should successfully delete AWSCluster with managed VPC", func(t *testing.T) {
@@ -368,7 +368,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
368368
}
369369
err := testEnv.Get(ctx, key, cluster)
370370
return err == nil
371-
}, 10*time.Second).Should(Equal(true))
371+
}, 10*time.Second).Should(BeTrue())
372372

373373
defer t.Cleanup(func() {
374374
g.Expect(testEnv.Cleanup(ctx, &awsCluster, controllerIdentity, ns)).To(Succeed())
@@ -410,7 +410,7 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
410410
return sgSvc
411411
}
412412

413-
_, err = reconciler.reconcileDelete(ctx, cs)
413+
err = reconciler.reconcileDelete(ctx, cs)
414414
g.Expect(err).To(BeNil())
415415
expectAWSClusterConditions(g, cs.AWSCluster, []conditionAssertion{{infrav1.LoadBalancerReadyCondition, corev1.ConditionFalse, clusterv1.ConditionSeverityInfo, clusterv1.DeletedReason},
416416
{infrav1.BastionHostReadyCondition, corev1.ConditionFalse, clusterv1.ConditionSeverityInfo, clusterv1.DeletedReason},

‎controllers/awscluster_controller_unit_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
412412
},
413413
)
414414
g.Expect(err).To(BeNil())
415-
_, err = reconciler.reconcileDelete(ctx, cs)
415+
err = reconciler.reconcileDelete(ctx, cs)
416416
g.Expect(err).To(BeNil())
417417
g.Expect(awsCluster.GetFinalizers()).ToNot(ContainElement(infrav1.ClusterFinalizer))
418418
})
@@ -438,7 +438,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
438438
},
439439
)
440440
g.Expect(err).To(BeNil())
441-
_, err = reconciler.reconcileDelete(ctx, cs)
441+
err = reconciler.reconcileDelete(ctx, cs)
442442
g.Expect(err).ToNot(BeNil())
443443
g.Expect(awsCluster.GetFinalizers()).To(ContainElement(infrav1.ClusterFinalizer))
444444
})
@@ -461,7 +461,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
461461
},
462462
)
463463
g.Expect(err).To(BeNil())
464-
_, err = reconciler.reconcileDelete(ctx, cs)
464+
err = reconciler.reconcileDelete(ctx, cs)
465465
g.Expect(err).ToNot(BeNil())
466466
g.Expect(awsCluster.GetFinalizers()).To(ContainElement(infrav1.ClusterFinalizer))
467467
})
@@ -485,7 +485,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
485485
},
486486
)
487487
g.Expect(err).To(BeNil())
488-
_, err = reconciler.reconcileDelete(ctx, cs)
488+
err = reconciler.reconcileDelete(ctx, cs)
489489
g.Expect(err).ToNot(BeNil())
490490
g.Expect(awsCluster.GetFinalizers()).To(ContainElement(infrav1.ClusterFinalizer))
491491
})
@@ -510,7 +510,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
510510
},
511511
)
512512
g.Expect(err).To(BeNil())
513-
_, err = reconciler.reconcileDelete(ctx, cs)
513+
err = reconciler.reconcileDelete(ctx, cs)
514514
g.Expect(err).ToNot(BeNil())
515515
g.Expect(awsCluster.GetFinalizers()).To(ContainElement(infrav1.ClusterFinalizer))
516516
})
@@ -621,7 +621,7 @@ func createCluster(g *WithT, awsCluster *infrav1.AWSCluster, namespace string) {
621621
}
622622
err := testEnv.Get(ctx, key, cluster)
623623
return err == nil
624-
}, 10*time.Second).Should(Equal(true))
624+
}, 10*time.Second).Should(BeTrue())
625625
}
626626
}
627627

‎controllers/awsmachine_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ func createAWSMachine(g *WithT, awsMachine *infrav1.AWSMachine) {
442442
Namespace: awsMachine.Namespace,
443443
}
444444
return testEnv.Get(ctx, key, machine) == nil
445-
}, 10*time.Second).Should(Equal(true))
445+
}, 10*time.Second).Should(BeTrue())
446446
}
447447

448448
func getAWSMachine() *infrav1.AWSMachine {

0 commit comments

Comments
 (0)