🐛 Add for new linters to fix old syntax (#10699)

* add new linters Signed-off-by: sivchari <shibuuuu5@gmail.com> * apply for copyloopvar Signed-off-by: sivchari <shibuuuu5@gmail.com> * apply for intrange Signed-off-by: sivchari <shibuuuu5@gmail.com> * upgrade golangci-lint Signed-off-by: sivchari <shibuuuu5@gmail.com> * fix: intrange Signed-off-by: sivchari <shibuuuu5@gmail.com> * apply for gosec Signed-off-by: sivchari <shibuuuu5@gmail.com> * re-apply for copyloopvar Signed-off-by: sivchari <shibuuuu5@gmail.com> * re-apply for intrange Signed-off-by: sivchari <shibuuuu5@gmail.com> * delete exportloopref Signed-off-by: sivchari <shibuuuu5@gmail.com> * re-fix lint errors Signed-off-by: sivchari <shibuuuu5@gmail.com> --------- Signed-off-by: sivchari <shibuuuu5@gmail.com>
kubernetes-sigs · Jun 4, 2024 · 90311ae · 90311ae
1 parent 5b4fc70
commit 90311ae
Show file tree

Hide file tree

Showing 46 changed files with 52 additions and 87 deletions.
diff --git a/.github/workflows/pr-golangci-lint.yaml b/.github/workflows/pr-golangci-lint.yaml
@@ -30,6 +30,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # tag=v6.0.1
         with:
-          version: v1.57.2
+          version: v1.59.0
           args: --out-format=colored-line-number
           working-directory: ${{matrix.working-directory}}
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,12 +19,12 @@ linters:
   - bidichk
   - bodyclose
   - containedctx
+  - copyloopvar
   - dogsled
   - dupword
   - durationcheck
   - errcheck
   - errchkjson
-  - exportloopref
   - gci
   - ginkgolinter
   - goconst
@@ -38,6 +38,7 @@ linters:
   - govet
   - importas
   - ineffassign
+  - intrange
   - loggercheck
   - misspell
   - nakedret

diff --git a/bootstrap/kubeadm/internal/cloudinit/controlplane_test.go b/bootstrap/kubeadm/internal/cloudinit/controlplane_test.go
@@ -44,7 +44,6 @@ func TestTemplateYAMLIndent(t *testing.T) {
 	}
 
 	for _, tc := range testcases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			g := NewWithT(t)
 

diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go
@@ -58,7 +58,7 @@ func TestKubeadmConfigReconciler_MachineToBootstrapMapFuncReturn(t *testing.T) {
 	objs := []client.Object{cluster}
 	machineObjs := []client.Object{}
 	var expectedConfigName string
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		configName := fmt.Sprintf("my-config-%d", i)
 		m := builder.Machine(metav1.NamespaceDefault, fmt.Sprintf("my-machine-%d", i)).
 			WithVersion("v1.19.1").
@@ -80,7 +80,7 @@ func TestKubeadmConfigReconciler_MachineToBootstrapMapFuncReturn(t *testing.T) {
 		Client:              fakeClient,
 		SecretCachingClient: fakeClient,
 	}
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		o := machineObjs[i]
 		configs := reconciler.MachineToBootstrapMapFunc(ctx, o)
 		if i == 1 {
@@ -675,7 +675,6 @@ func TestReconcileIfJoinCertificatesAvailableConditioninNodesAndControlPlaneIsRe
 	}
 
 	for _, rt := range useCases {
-		rt := rt // pin!
 		t.Run(rt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
@@ -753,7 +752,6 @@ func TestReconcileIfJoinNodePoolsAndControlPlaneIsReady(t *testing.T) {
 	}
 
 	for _, rt := range useCases {
-		rt := rt // pin!
 		t.Run(rt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
@@ -1819,7 +1817,7 @@ func TestKubeadmConfigReconciler_ClusterToKubeadmConfigs(t *testing.T) {
 	cluster := builder.Cluster(metav1.NamespaceDefault, "my-cluster").Build()
 	objs := []client.Object{cluster}
 	expectedNames := []string{}
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		configName := fmt.Sprintf("my-config-%d", i)
 		m := builder.Machine(metav1.NamespaceDefault, fmt.Sprintf("my-machine-%d", i)).
 			WithVersion("v1.19.1").

diff --git a/bootstrap/kubeadm/internal/ignition/clc/clc_test.go b/bootstrap/kubeadm/internal/ignition/clc/clc_test.go
@@ -561,8 +561,6 @@ func TestRender(t *testing.T) {
 	}
 
 	for _, tt := range tc {
-		tt := tt
-
 		t.Run(tt.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/bootstrap/kubeadm/internal/ignition/ignition_test.go b/bootstrap/kubeadm/internal/ignition/ignition_test.go
@@ -42,8 +42,6 @@ func Test_NewNode(t *testing.T) {
 		}
 
 		for name, input := range cases {
-			input := input
-
 			t.Run(name, func(t *testing.T) {
 				t.Parallel()
 
@@ -160,8 +158,6 @@ func Test_NewJoinControlPlane(t *testing.T) {
 		}
 
 		for name, input := range cases {
-			input := input
-
 			t.Run(name, func(t *testing.T) {
 				t.Parallel()
 
@@ -278,8 +274,6 @@ func Test_NewInitControlPlane(t *testing.T) {
 		}
 
 		for name, input := range cases {
-			input := input
-
 			t.Run(name, func(t *testing.T) {
 				t.Parallel()
 

diff --git a/bootstrap/kubeadm/internal/locking/control_plane_init_mutex_test.go b/bootstrap/kubeadm/internal/locking/control_plane_init_mutex_test.go
@@ -99,7 +99,6 @@ func TestControlPlaneInitMutex_Lock(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			gs := NewWithT(t)
 
@@ -259,7 +258,6 @@ func TestControlPlaneInitMutex_UnLock(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			gs := NewWithT(t)
 

diff --git a/bootstrap/kubeadm/internal/webhooks/kubeadmconfigtemplate_test.go b/bootstrap/kubeadm/internal/webhooks/kubeadmconfigtemplate_test.go
@@ -83,8 +83,6 @@ func TestKubeadmConfigTemplateValidation(t *testing.T) {
 	}
 
 	for name, tt := range cases {
-		tt := tt
-
 		webhook := &KubeadmConfigTemplate{}
 
 		t.Run(name, func(t *testing.T) {

diff --git a/cmd/clusterctl/client/cluster/components.go b/cmd/clusterctl/client/cluster/components.go
@@ -287,7 +287,6 @@ func (p *providerComponents) ValidateNoObjectsExist(ctx context.Context, provide
 	// Filter the resources according to the delete options
 	crsHavingObjects := []string{}
 	for _, crd := range customResources.Items {
-		crd := crd
 		storageVersion, err := storageVersionForCRD(&crd)
 		if err != nil {
 			return err

diff --git a/cmd/clusterctl/client/cluster/mover.go b/cmd/clusterctl/client/cluster/mover.go
@@ -361,7 +361,7 @@ func (o *objectMover) move(ctx context.Context, graph *objectGraph, toProxy Prox
 
 	// Create all objects group by group, ensuring all the ownerReferences are re-created.
 	log.Info("Creating objects in the target cluster")
-	for groupIndex := 0; groupIndex < len(moveSequence.groups); groupIndex++ {
+	for groupIndex := range len(moveSequence.groups) {
 		if err := o.createGroup(ctx, moveSequence.getGroup(groupIndex), toProxy, mutators...); err != nil {
 			return err
 		}
@@ -419,7 +419,7 @@ func (o *objectMover) toDirectory(ctx context.Context, graph *objectGraph, direc
 
 	// Save all objects group by group
 	log.Info(fmt.Sprintf("Saving files to %s", directory))
-	for groupIndex := 0; groupIndex < len(moveSequence.groups); groupIndex++ {
+	for groupIndex := range len(moveSequence.groups) {
 		if err := o.backupGroup(ctx, moveSequence.getGroup(groupIndex), directory); err != nil {
 			return err
 		}
@@ -459,7 +459,7 @@ func (o *objectMover) fromDirectory(ctx context.Context, graph *objectGraph, toP
 
 	// Create all objects group by group, ensuring all the ownerReferences are re-created.
 	log.Info("Restoring objects into the target cluster")
-	for groupIndex := 0; groupIndex < len(moveSequence.groups); groupIndex++ {
+	for groupIndex := range len(moveSequence.groups) {
 		if err := o.restoreGroup(ctx, moveSequence.getGroup(groupIndex), toProxy); err != nil {
 			return err
 		}

diff --git a/cmd/clusterctl/client/cluster/upgrader.go b/cmd/clusterctl/client/cluster/upgrader.go
@@ -474,7 +474,6 @@ func (u *providerUpgrader) scaleDownProvider(ctx context.Context, provider clust
 
 	// Scale down provider Deployments.
 	for _, deployment := range deploymentList.Items {
-		deployment := deployment
 		log.V(5).Info("Scaling down", "Deployment", klog.KObj(&deployment))
 		if err := scaleDownDeployment(ctx, cs, deployment); err != nil {
 			return err

diff --git a/cmd/clusterctl/client/repository/repository_github.go b/cmd/clusterctl/client/repository/repository_github.go
@@ -349,7 +349,6 @@ func (g *gitHubRepository) getVersions(ctx context.Context) ([]string, error) {
 	}
 	versions := []string{}
 	for _, r := range allReleases {
-		r := r // pin
 		if r.TagName == nil {
 			continue
 		}

diff --git a/cmd/clusterctl/client/tree/util.go b/cmd/clusterctl/client/tree/util.go
@@ -45,7 +45,6 @@ func GetOtherConditions(obj client.Object) []*clusterv1.Condition {
 	}
 	var conditions []*clusterv1.Condition
 	for _, c := range getter.GetConditions() {
-		c := c
 		if c.Type != clusterv1.ReadyCondition {
 			conditions = append(conditions, &c)
 		}

diff --git a/cmd/clusterctl/cmd/version_checker.go b/cmd/clusterctl/cmd/version_checker.go
@@ -236,7 +236,7 @@ func writeStateFile(path string, vs *VersionState) error {
 	if err != nil {
 		return err
 	}
-	if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
+	if err := os.MkdirAll(filepath.Dir(path), 0750); err != nil {
 		return err
 	}
 	return os.WriteFile(path, vsb, 0600)

diff --git a/controllers/remote/keyedmutex_test.go b/controllers/remote/keyedmutex_test.go
@@ -59,7 +59,7 @@ func TestKeyedMutex(t *testing.T) {
 
 		// Run this twice to ensure Clusters can be locked again
 		// after they have been unlocked.
-		for i := 0; i < 2; i++ {
+		for range 2 {
 			// Lock all Clusters (should work).
 			for _, key := range clusters {
 				g.Expect(km.TryLock(key)).To(BeTrue())

diff --git a/controlplane/kubeadm/internal/controllers/controller_test.go b/controlplane/kubeadm/internal/controllers/controller_test.go
@@ -496,7 +496,7 @@ func TestKubeadmControlPlaneReconciler_adoption(t *testing.T) {
 			Workload: fakeWorkloadCluster{},
 		}
 		objs := []client.Object{builder.GenericInfrastructureMachineTemplateCRD, cluster.DeepCopy(), kcp.DeepCopy(), tmpl.DeepCopy()}
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			name := fmt.Sprintf("test-%d", i)
 			m := &clusterv1.Machine{
 				ObjectMeta: metav1.ObjectMeta{
@@ -564,7 +564,7 @@ func TestKubeadmControlPlaneReconciler_adoption(t *testing.T) {
 			Workload: fakeWorkloadCluster{},
 		}
 		objs := []client.Object{builder.GenericInfrastructureMachineTemplateCRD, cluster.DeepCopy(), kcp.DeepCopy(), tmpl.DeepCopy()}
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			name := fmt.Sprintf("test-%d", i)
 			m := &clusterv1.Machine{
 				ObjectMeta: metav1.ObjectMeta{
@@ -679,7 +679,7 @@ func TestKubeadmControlPlaneReconciler_adoption(t *testing.T) {
 			Workload: fakeWorkloadCluster{},
 		}
 		objs := []client.Object{builder.GenericInfrastructureMachineTemplateCRD, cluster.DeepCopy(), kcp.DeepCopy(), tmpl.DeepCopy()}
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			name := fmt.Sprintf("test-%d", i)
 			m := &clusterv1.Machine{
 				ObjectMeta: metav1.ObjectMeta{
@@ -2090,7 +2090,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 		initObjs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy()}
 
 		machines := collections.New()
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			m, _ := createMachineNodePair(fmt.Sprintf("test-%d", i), cluster, kcp, true)
 			initObjs = append(initObjs, m)
 			machines.Insert(m)
@@ -2154,7 +2154,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 		initObjs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy(), workerMachine.DeepCopy()}
 
 		machines := collections.New()
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			m, _ := createMachineNodePair(fmt.Sprintf("test-%d", i), cluster, kcp, true)
 			initObjs = append(initObjs, m)
 			machines.Insert(m)
@@ -2212,7 +2212,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 		initObjs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy(), workerMachinePool.DeepCopy()}
 
 		machines := collections.New()
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			m, _ := createMachineNodePair(fmt.Sprintf("test-%d", i), cluster, kcp, true)
 			initObjs = append(initObjs, m)
 			machines.Insert(m)

diff --git a/controlplane/kubeadm/internal/controllers/scale_test.go b/controlplane/kubeadm/internal/controllers/scale_test.go
@@ -137,7 +137,7 @@ func TestKubeadmControlPlaneReconciler_scaleUpControlPlane(t *testing.T) {
 			Workload: fakeWorkloadCluster{},
 		}
 
-		for i := 0; i < 2; i++ {
+		for i := range 2 {
 			m, _ := createMachineNodePair(fmt.Sprintf("test-%d", i), cluster, kcp, true)
 			setMachineHealthy(m)
 			fmc.Machines.Insert(m)
@@ -197,7 +197,7 @@ func TestKubeadmControlPlaneReconciler_scaleUpControlPlane(t *testing.T) {
 		cluster.Status.InfrastructureReady = true
 
 		beforeMachines := collections.New()
-		for i := 0; i < 2; i++ {
+		for i := range 2 {
 			m, _ := createMachineNodePair(fmt.Sprintf("test-%d", i), cluster.DeepCopy(), kcp.DeepCopy(), true)
 			beforeMachines.Insert(m)
 		}

diff --git a/controlplane/kubeadm/internal/controllers/status_test.go b/controlplane/kubeadm/internal/controllers/status_test.go
@@ -134,7 +134,7 @@ func TestKubeadmControlPlaneReconciler_updateStatusAllMachinesNotReady(t *testin
 
 	machines := map[string]*clusterv1.Machine{}
 	objs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy()}
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		name := fmt.Sprintf("test-%d", i)
 		m, n := createMachineNodePair(name, cluster, kcp, false)
 		objs = append(objs, n, m)
@@ -207,7 +207,7 @@ func TestKubeadmControlPlaneReconciler_updateStatusAllMachinesReady(t *testing.T
 
 	objs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy(), kubeadmConfigMap()}
 	machines := map[string]*clusterv1.Machine{}
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		name := fmt.Sprintf("test-%d", i)
 		m, n := createMachineNodePair(name, cluster, kcp, true)
 		objs = append(objs, n, m)
@@ -287,7 +287,7 @@ func TestKubeadmControlPlaneReconciler_updateStatusMachinesReadyMixed(t *testing
 	g.Expect(err).ToNot(HaveOccurred())
 	machines := map[string]*clusterv1.Machine{}
 	objs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy()}
-	for i := 0; i < 4; i++ {
+	for i := range 4 {
 		name := fmt.Sprintf("test-%d", i)
 		m, n := createMachineNodePair(name, cluster, kcp, false)
 		machines[m.Name] = m
@@ -369,7 +369,7 @@ func TestKubeadmControlPlaneReconciler_machinesCreatedIsIsTrueEvenWhenTheNodesAr
 	machines := map[string]*clusterv1.Machine{}
 	objs := []client.Object{cluster.DeepCopy(), kcp.DeepCopy()}
 	// Create the desired number of machines
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		name := fmt.Sprintf("test-%d", i)
 		m, n := createMachineNodePair(name, cluster, kcp, false)
 		machines[m.Name] = m

diff --git a/controlplane/kubeadm/internal/controllers/upgrade_test.go b/controlplane/kubeadm/internal/controllers/upgrade_test.go
@@ -197,7 +197,7 @@ func TestKubeadmControlPlaneReconciler_RolloutStrategy_ScaleDown(t *testing.T) {
 		},
 	}
 	objs := []client.Object{builder.GenericInfrastructureMachineTemplateCRD, cluster.DeepCopy(), kcp.DeepCopy(), tmpl.DeepCopy()}
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		name := fmt.Sprintf("test-%d", i)
 		m := &clusterv1.Machine{
 			ObjectMeta: metav1.ObjectMeta{

diff --git a/exp/internal/controllers/machinepool_controller_phases.go b/exp/internal/controllers/machinepool_controller_phases.go
@@ -516,7 +516,7 @@ func (r *MachinePoolReconciler) waitForMachineCreation(ctx context.Context, mach
 	// The polling is against a local memory cache.
 	const waitForCacheUpdateInterval = 100 * time.Millisecond
 
-	for i := 0; i < len(machineList); i++ {
+	for i := range len(machineList) {
 		machine := machineList[i]
 		pollErr := wait.PollUntilContextTimeout(ctx, waitForCacheUpdateInterval, waitForCacheUpdateTimeout, true, func(ctx context.Context) (bool, error) {
 			key := client.ObjectKey{Namespace: machine.Namespace, Name: machine.Name}

diff --git a/exp/internal/controllers/machinepool_controller_phases_test.go b/exp/internal/controllers/machinepool_controller_phases_test.go
@@ -1903,7 +1903,7 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
 
 func getInfraMachines(replicas int, mpName, clusterName, nsName string) []unstructured.Unstructured {
 	infraMachines := make([]unstructured.Unstructured, replicas)
-	for i := 0; i < replicas; i++ {
+	for i := range replicas {
 		infraMachines[i] = unstructured.Unstructured{
 			Object: map[string]interface{}{
 				"kind":       builder.GenericInfrastructureMachineKind,
@@ -1924,7 +1924,7 @@ func getInfraMachines(replicas int, mpName, clusterName, nsName string) []unstru
 
 func getMachines(replicas int, mpName, clusterName, nsName string) []clusterv1.Machine {
 	machines := make([]clusterv1.Machine, replicas)
-	for i := 0; i < replicas; i++ {
+	for i := range replicas {
 		machines[i] = clusterv1.Machine{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      fmt.Sprintf("%s-machine-%d", mpName, i),

diff --git a/exp/topology/desiredstate/desired_state.go b/exp/topology/desiredstate/desired_state.go
@@ -632,7 +632,6 @@ func (g *generator) computeMachineDeployment(ctx context.Context, s *scope.Scope
 
 	var machineDeploymentClass *clusterv1.MachineDeploymentClass
 	for _, mdClass := range s.Blueprint.ClusterClass.Spec.Workers.MachineDeployments {
-		mdClass := mdClass
 		if mdClass.Class == className {
 			machineDeploymentClass = &mdClass
 			break
@@ -958,7 +957,6 @@ func (g *generator) computeMachinePool(_ context.Context, s *scope.Scope, machin
 
 	var machinePoolClass *clusterv1.MachinePoolClass
 	for _, mpClass := range s.Blueprint.ClusterClass.Spec.Workers.MachinePools {
-		mpClass := mpClass
 		if mpClass.Class == className {
 			machinePoolClass = &mpClass
 			break

diff --git a/exp/util/util_test.go b/exp/util/util_test.go
@@ -130,7 +130,6 @@ func TestGetMachinePoolByLabels(t *testing.T) {
 	}
 
 	for _, tc := range testcases {
-		tc := tc
 		t.Run(tc.name, func(*testing.T) {
 			clientFake := fake.NewClientBuilder().
 				WithScheme(fakeScheme).

diff --git a/hack/tools/prowjob-gen/generator.go b/hack/tools/prowjob-gen/generator.go
@@ -223,7 +223,7 @@ func mustHas(needle interface{}, haystack interface{}) (bool, error) {
 		l2 := reflect.ValueOf(haystack)
 		var item interface{}
 		l := l2.Len()
-		for i := 0; i < l; i++ {
+		for i := range l {
 			item = l2.Index(i).Interface()
 			if reflect.DeepEqual(needle, item) {
 				return true, nil