Merge pull request #2728 from adityabhatia/bump-golangci-lint-1.56.1

🌱 bump golangci-lint to v1.56.1
kubernetes-sigs · Feb 9, 2024 · 0b59c31 · 0b59c31
2 parents 74d6c06 + b638ee7
commit 0b59c31
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 46 deletions.
diff --git a/.github/workflows/pr-golangci-lint.yaml b/.github/workflows/pr-golangci-lint.yaml
@@ -29,6 +29,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # tag=v3.7.0
         with:
-          version: v1.55.2
+          version: v1.56.1
           args: --out-format=colored-line-number
           working-directory: ${{matrix.working-directory}}
diff --git a/controllers/clustermodule_reconciler.go b/controllers/clustermodule_reconciler.go
@@ -221,10 +221,10 @@ func (r Reconciler) PopulateWatchesOnController(mgr manager.Manager, controller
 		source.Kind(mgr.GetCache(), &controlplanev1.KubeadmControlPlane{}),
 		handler.EnqueueRequestsFromMapFunc(r.toAffinityInput),
 		predicate.Funcs{
-			GenericFunc: func(genericEvent event.GenericEvent) bool {
+			GenericFunc: func(event.GenericEvent) bool {
 				return false
 			},
-			UpdateFunc: func(updateEvent event.UpdateEvent) bool {
+			UpdateFunc: func(event.UpdateEvent) bool {
 				return false
 			},
 		},
@@ -236,10 +236,10 @@ func (r Reconciler) PopulateWatchesOnController(mgr manager.Manager, controller
 		source.Kind(mgr.GetCache(), &clusterv1.MachineDeployment{}),
 		handler.EnqueueRequestsFromMapFunc(r.toAffinityInput),
 		predicate.Funcs{
-			GenericFunc: func(genericEvent event.GenericEvent) bool {
+			GenericFunc: func(event.GenericEvent) bool {
 				return false
 			},
-			UpdateFunc: func(updateEvent event.UpdateEvent) bool {
+			UpdateFunc: func(event.UpdateEvent) bool {
 				return false
 			},
 		},

diff --git a/controllers/clustermodule_reconciler_test.go b/controllers/clustermodule_reconciler_test.go
@@ -311,7 +311,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 		},
 		{
 			name: "when machine deployment is being deleted",
-			beforeFn: func(object client.Object) {
+			beforeFn: func(client.Object) {
 				tym := metav1.NewTime(time.Now())
 				md.ObjectMeta.DeletionTimestamp = &tym
 				md.ObjectMeta.Finalizers = append(md.ObjectMeta.Finalizers, "keep-this-for-the-test")
@@ -335,7 +335,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 		},
 		{
 			name: "when machine deployment is being deleted & cluster module info is set in object",
-			beforeFn: func(object client.Object) {
+			beforeFn: func(client.Object) {
 				tym := metav1.NewTime(time.Now())
 				md.ObjectMeta.DeletionTimestamp = &tym
 				md.ObjectMeta.Finalizers = append(md.ObjectMeta.Finalizers, "keep-this-for-the-test")
@@ -365,7 +365,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 		},
 		{
 			name: "when control plane & machine deployment are being deleted & cluster module info is set in object",
-			beforeFn: func(object client.Object) {
+			beforeFn: func(client.Object) {
 				tym := metav1.NewTime(time.Now())
 				kcp.ObjectMeta.DeletionTimestamp = &tym
 				kcp.ObjectMeta.Finalizers = append(kcp.ObjectMeta.Finalizers, "keep-this-for-the-test")
@@ -392,7 +392,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 		},
 		{
 			name: "when control plane & machine deployment are being deleted & cluster module info is not set",
-			beforeFn: func(object client.Object) {
+			beforeFn: func(client.Object) {
 				tym := metav1.NewTime(time.Now())
 				kcp.ObjectMeta.DeletionTimestamp = &tym
 				kcp.ObjectMeta.Finalizers = append(kcp.ObjectMeta.Finalizers, "keep-this-for-the-test")

diff --git a/controllers/vspheremachine_controller.go b/controllers/vspheremachine_controller.go
@@ -154,7 +154,7 @@ func AddMachineControllerToManager(ctx context.Context, controllerManagerContext
 			ctrlbldr.WithPredicates(predicate.Funcs{
 				// ignore creation events since this controller is responsible for
 				// the creation of the type.
-				CreateFunc: func(e event.CreateEvent) bool {
+				CreateFunc: func(event.CreateEvent) bool {
 					return false
 				},
 			}),

diff --git a/controllers/vspherevm_controller.go b/controllers/vspherevm_controller.go
@@ -120,9 +120,9 @@ func AddVMControllerToManager(ctx context.Context, controllerManagerCtx *capvcon
 						newCluster := e.ObjectNew.(*infrav1.VSphereCluster)
 						return !clustermodule.Compare(oldCluster.Spec.ClusterModules, newCluster.Spec.ClusterModules)
 					},
-					CreateFunc:  func(e event.CreateEvent) bool { return false },
-					DeleteFunc:  func(e event.DeleteEvent) bool { return false },
-					GenericFunc: func(e event.GenericEvent) bool { return false },
+					CreateFunc:  func(event.CreateEvent) bool { return false },
+					DeleteFunc:  func(event.DeleteEvent) bool { return false },
+					GenericFunc: func(event.GenericEvent) bool { return false },
 				}),
 		).
 		Watches(

diff --git a/internal/test/helpers/envtest.go b/internal/test/helpers/envtest.go
@@ -158,7 +158,7 @@ func NewTestEnvironment(ctx context.Context) *TestEnvironment {
 		Username:   simr.Username(),
 		Password:   simr.Password(),
 	}
-	managerOpts.AddToManager = func(ctx context.Context, controllerCtx *capvcontext.ControllerManagerContext, mgr ctrlmgr.Manager) error {
+	managerOpts.AddToManager = func(_ context.Context, _ *capvcontext.ControllerManagerContext, mgr ctrlmgr.Manager) error {
 		if err := (&webhooks.VSphereClusterTemplateWebhook{}).SetupWebhookWithManager(mgr); err != nil {
 			return err
 		}

diff --git a/internal/webhooks/vspheredeploymentzone_test.go b/internal/webhooks/vspheredeploymentzone_test.go
@@ -49,7 +49,7 @@ func TestVSphereDeploymentZone_Default(t *testing.T) {
 	for _, tt := range tests {
 		// Need to reinit the test variable
 		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
+		t.Run(tt.name, func(*testing.T) {
 			vdz := infrav1.VSphereDeploymentZone{
 				Spec: infrav1.VSphereDeploymentZoneSpec{
 					ControlPlane: tt.boolPtr,

diff --git a/internal/webhooks/vspherefailuredomain_test.go b/internal/webhooks/vspherefailuredomain_test.go
@@ -137,7 +137,7 @@ func TestVSphereFailureDomain_ValidateCreate(t *testing.T) {
 	for _, tt := range tests {
 		// Need to reinit the test variable
 		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
+		t.Run(tt.name, func(*testing.T) {
 			webhook := &VSphereFailureDomainWebhook{}
 			_, err := webhook.ValidateCreate(context.Background(), &tt.failureDomain)
 			if tt.errExpected == nil || !*tt.errExpected {

diff --git a/internal/webhooks/vspheremachine_test.go b/internal/webhooks/vspheremachine_test.go
@@ -98,7 +98,7 @@ func TestVSphereMachine_ValidateCreate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			webhook := &VSphereMachineWebhook{}
 			_, err := webhook.ValidateCreate(context.Background(), tc.vsphereMachine)
 			if tc.wantErr {
@@ -169,7 +169,7 @@ func TestVSphereMachine_ValidateUpdate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			webhook := &VSphereMachineWebhook{}
 			_, err := webhook.ValidateUpdate(context.Background(), tc.oldVSphereMachine, tc.vsphereMachine)
 			if tc.wantErr {

diff --git a/internal/webhooks/vspheremachinetemplate_test.go b/internal/webhooks/vspheremachinetemplate_test.go
@@ -71,7 +71,7 @@ func TestVSphereMachineTemplate_ValidateCreate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			webhook := &VSphereMachineTemplateWebhook{}
 			_, err := webhook.ValidateCreate(context.Background(), tc.vsphereMachine)
 			if tc.wantErr {
@@ -129,7 +129,7 @@ func TestVSphereMachineTemplate_ValidateUpdate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			webhook := &VSphereMachineTemplateWebhook{}
 			ctx := context.Background()
 			if tc.req != nil {

diff --git a/internal/webhooks/vspherevm_test.go b/internal/webhooks/vspherevm_test.go
@@ -116,7 +116,7 @@ func TestVSphereVM_ValidateCreate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			webhook := &VSphereVMWebhook{}
 			_, err := webhook.ValidateCreate(context.Background(), tc.vSphereVM)
 			if tc.wantErr {
@@ -211,7 +211,7 @@ func TestVSphereVM_ValidateUpdate(t *testing.T) {
 		},
 	}
 	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			webhook := &VSphereVMWebhook{}
 			_, err := webhook.ValidateUpdate(context.Background(), tc.oldVSphereVM, tc.vSphereVM)
 			if tc.wantErr {

diff --git a/packaging/flavorgen/cmd/root.go b/packaging/flavorgen/cmd/root.go
@@ -58,7 +58,7 @@ func RootCmd() *cobra.Command {
 	rootCmd := &cobra.Command{
 		Use:   "flavorgen",
 		Short: "flavorgen generates clusterctl templates for Cluster API Provider vSphere",
-		RunE: func(command *cobra.Command, args []string) error {
+		RunE: func(command *cobra.Command, _ []string) error {
 			return RunRoot(command)
 		},
 		SilenceUsage: true,

diff --git a/packaging/flavorgen/flavors/crs/types/cloudprovider_encoding.go b/packaging/flavorgen/flavors/crs/types/cloudprovider_encoding.go
@@ -146,7 +146,7 @@ func parseGcfgTag(field reflect.StructField) (string, bool, bool) {
 		lenTagParts := len(tagParts)
 		if lenTagParts > 0 {
 			tagName := tagParts[0]
-			if len(tagName) > 0 && tagName != "-" {
+			if tagName != "" && tagName != "-" {
 				name = tagName
 			}
 		}

diff --git a/packaging/flavorgen/flavors/crs/types/cloudprovider_encoding_test.go b/packaging/flavorgen/flavors/crs/types/cloudprovider_encoding_test.go
@@ -261,7 +261,7 @@ folder = "kubernetes"
 
 	for _, tc := range testcases {
 		tc := tc
-		t.Run(tc.testName, func(t *testing.T) {
+		t.Run(tc.testName, func(*testing.T) {
 			buf, err := tc.configObj.MarshalINI()
 			if err != nil {
 				if tc.expectedError == nil {

diff --git a/pkg/identity/identity_suite_test.go b/pkg/identity/identity_suite_test.go
@@ -98,7 +98,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	Expect(k8sclient.Create(ctx, ns)).NotTo(HaveOccurred())
 
 	return nil
-}, func(data []byte) {})
+}, func([]byte) {})
 
 var _ = SynchronizedAfterSuite(func() {}, func() {
 	if err := env.Stop(); err != nil {

diff --git a/pkg/manager/options.go b/pkg/manager/options.go
@@ -113,7 +113,7 @@ func (o *Options) defaults() {
 	if ns, ok := os.LookupEnv("POD_NAMESPACE"); ok {
 		o.PodNamespace = ns
 	} else if data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
-		if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
+		if ns := strings.TrimSpace(string(data)); ns != "" {
 			o.PodNamespace = ns
 		}
 	} else {

diff --git a/pkg/manager/options_test.go b/pkg/manager/options_test.go
@@ -72,7 +72,7 @@ password: '%s'
 			t.Fatal(err)
 		}
 
-		t.Run(test.name, func(t *testing.T) {
+		t.Run(test.name, func(*testing.T) {
 			o := &Options{
 				// needs an object ref to be present
 				KubeConfig:      &rest.Config{},

diff --git a/pkg/services/govmomi/util_test.go b/pkg/services/govmomi/util_test.go
@@ -98,7 +98,7 @@ func Test_ShouldRetryTask(t *testing.T) {
 			}
 		})
 
-		t.Run("for task in error state", func(t *testing.T) {
+		t.Run("for task in error state", func(*testing.T) {
 			task := baseTask(types.TaskInfoStateError, "task is stuck")
 
 			reconciled, err := checkAndRetryTask(ctx, vmCtx, &task)

diff --git a/pkg/session/session.go b/pkg/session/session.go
@@ -327,7 +327,7 @@ func (s *Session) GetVersion() (infrav1.VCenterVersion, error) {
 
 // Clear is meant to destroy all the cached sessions.
 func Clear() {
-	sessionCache.Range(func(key, s any) bool {
+	sessionCache.Range(func(_, s any) bool {
 		cachedSession := s.(*Session)
 		_ = cachedSession.Logout(context.Background())
 		return true

diff --git a/pkg/util/machines_test.go b/pkg/util/machines_test.go
@@ -958,7 +958,7 @@ func TestConvertProviderIDToUUID(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			actualUUID := util.ConvertProviderIDToUUID(tc.providerID)
 			g.Expect(actualUUID).To(gomega.Equal(tc.expectedUUID))
 		})
@@ -1001,7 +1001,7 @@ func TestConvertUUIDtoProviderID(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			actualProviderID := util.ConvertUUIDToProviderID(tc.uuid)
 			g.Expect(actualProviderID).To(gomega.Equal(tc.expectedProviderID))
 		})

diff --git a/pkg/util/supervisor_test.go b/pkg/util/supervisor_test.go
@@ -165,7 +165,7 @@ func TestSetControllerReferenceWithOverride(t *testing.T) {
 
 	for _, tc := range cases {
 		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(tc.name, func(*testing.T) {
 			controllerManagerContext := fake.NewControllerManagerContext(tc.controlled)
 			actualErr := SetControllerReferenceWithOverride(tc.newOwner, tc.controlled, controllerManagerContext.Scheme)
 			if tc.expectErr {

diff --git a/test/infrastructure/tmp-to-be-deleted/runtime/cache/client_test.go b/test/infrastructure/tmp-to-be-deleted/runtime/cache/client_test.go
@@ -66,7 +66,7 @@ func Test_cache_client(t *testing.T) {
 			g.Expect(apierrors.IsBadRequest(err)).To(BeTrue())
 		})
 
-		t.Run("fails if unknown kind", func(t *testing.T) {
+		t.Run("fails if unknown kind", func(*testing.T) {
 			// TODO implement test case
 		})
 
@@ -226,7 +226,7 @@ func Test_cache_client(t *testing.T) {
 			g.Expect(apierrors.IsBadRequest(err)).To(BeTrue())
 		})
 
-		t.Run("fails if unknown kind", func(t *testing.T) {
+		t.Run("fails if unknown kind", func(*testing.T) {
 			// TODO implement test case
 		})
 
@@ -298,7 +298,7 @@ func Test_cache_client(t *testing.T) {
 			g.Expect(apierrors.IsBadRequest(err)).To(BeTrue())
 		})
 
-		t.Run("fails if unknown kind", func(t *testing.T) {
+		t.Run("fails if unknown kind", func(*testing.T) {
 			// TODO implement test case
 		})
 
@@ -364,7 +364,7 @@ func Test_cache_client(t *testing.T) {
 			g.Expect(apierrors.IsBadRequest(err)).To(BeTrue())
 		})
 
-		t.Run("fails if unknown kind", func(t *testing.T) {
+		t.Run("fails if unknown kind", func(*testing.T) {
 			// TODO implement test case
 		})
 
@@ -583,7 +583,7 @@ func Test_cache_client(t *testing.T) {
 			g.Expect(apierrors.IsBadRequest(err)).To(BeTrue())
 		})
 
-		t.Run("fails if unknown kind", func(t *testing.T) {
+		t.Run("fails if unknown kind", func(*testing.T) {
 			// TODO implement test case
 		})
 

diff --git a/test/infrastructure/tmp-to-be-deleted/runtime/cache/gc.go b/test/infrastructure/tmp-to-be-deleted/runtime/cache/gc.go
@@ -64,7 +64,7 @@ func (c *cache) startGarbageCollector(ctx context.Context) error {
 		wg.Wait()
 	}()
 
-	if err := wait.PollUntilContextTimeout(ctx, 50*time.Millisecond, 5*time.Second, false, func(ctx context.Context) (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(ctx, 50*time.Millisecond, 5*time.Second, false, func(context.Context) (done bool, err error) {
 		if atomic.LoadInt64(&workers) < int64(c.garbageCollectorConcurrency) {
 			return false, nil
 		}

diff --git a/test/infrastructure/tmp-to-be-deleted/runtime/cache/sync.go b/test/infrastructure/tmp-to-be-deleted/runtime/cache/sync.go
@@ -81,7 +81,7 @@ func (c *cache) startSyncer(ctx context.Context) error {
 		wg.Wait()
 	}()
 
-	if err := wait.PollUntilContextTimeout(ctx, 50*time.Millisecond, 5*time.Second, false, func(ctx context.Context) (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(ctx, 50*time.Millisecond, 5*time.Second, false, func(context.Context) (done bool, err error) {
 		if !syncLoopStarted {
 			return false, nil
 		}
@@ -90,7 +90,7 @@ func (c *cache) startSyncer(ctx context.Context) error {
 		return fmt.Errorf("failed to start sync loop: %v", err)
 	}
 
-	if err := wait.PollUntilContextTimeout(ctx, 50*time.Millisecond, 5*time.Second, false, func(ctx context.Context) (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(ctx, 50*time.Millisecond, 5*time.Second, false, func(context.Context) (done bool, err error) {
 		if atomic.LoadInt64(&workers) < int64(c.syncConcurrency) {
 			return false, nil
 		}

diff --git a/test/infrastructure/tmp-to-be-deleted/server/api/handler.go b/test/infrastructure/tmp-to-be-deleted/server/api/handler.go
@@ -597,7 +597,7 @@ func (h *apiServerHandler) apiV1PortForward(req *restful.Request, resp *restful.
 		streamChan,
 		podName,
 		podNamespace,
-		func(ctx context.Context, podName, podNamespace, _ string, stream io.ReadWriteCloser) error {
+		func(ctx context.Context, _, _, _ string, stream io.ReadWriteCloser) error {
 			// Given that in the in-memory provider there is no real infrastructure, and thus no real workload cluster,
 			// we are going to forward all the connection back to the same server (the CAPIM controller pod).
 			return h.doPortForward(ctx, req.Request.Host, stream)

diff --git a/test/infrastructure/tmp-to-be-deleted/server/api/portforward/httpstreams.go b/test/infrastructure/tmp-to-be-deleted/server/api/portforward/httpstreams.go
@@ -34,7 +34,7 @@ import (
 // HTTPStreamReceived is the httpstream.NewStreamHandler for port
 // forward streams. Each valid stream is sent to the streams channel.
 func HTTPStreamReceived(streamsCh chan httpstream.Stream) func(httpstream.Stream, <-chan struct{}) error {
-	return func(stream httpstream.Stream, replySent <-chan struct{}) error {
+	return func(stream httpstream.Stream, _ <-chan struct{}) error {
 		// make sure it has a valid stream type header
 		streamType := stream.Headers().Get(corev1.StreamType)
 		if streamType == "" {

diff --git a/test/infrastructure/tmp-to-be-deleted/server/etcd/handler_test.go b/test/infrastructure/tmp-to-be-deleted/server/etcd/handler_test.go
@@ -43,7 +43,7 @@ func Test_etcd_scalingflow(t *testing.T) {
 	g := NewWithT(t)
 	ctx := metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{":authority": "etcd-1"}))
 	manager := inmemoryruntime.NewManager(scheme)
-	resourceGroupResolver := func(host string) (string, error) { return "group1", nil }
+	resourceGroupResolver := func(string) (string, error) { return "group1", nil }
 	c := &clusterServerServer{
 		baseServer: &baseServer{
 			log:                   log.FromContext(ctx),
@@ -99,7 +99,7 @@ func Test_etcd_scalingflow(t *testing.T) {
 	var etcdMemberToRemove uint64 = 2
 	var etcdMemberToBeLeader uint64 = 3
 
-	t.Run("move leader and remove etcd member", func(t *testing.T) {
+	t.Run("move leader and remove etcd member", func(*testing.T) {
 		_, err := m.MoveLeader(ctx, &pb.MoveLeaderRequest{TargetID: etcdMemberToBeLeader})
 		g.Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/infrastructure/tmp-to-be-deleted/server/mux.go b/test/infrastructure/tmp-to-be-deleted/server/mux.go
@@ -396,7 +396,7 @@ func (m *WorkloadClustersMux) AddAPIServer(wclName, podName string, caCert *x509
 
 	// Wait until the sever is working.
 	var pollErr error
-	err = wait.PollUntilContextTimeout(context.TODO(), 10*time.Millisecond, 1*time.Second, true, func(ctx context.Context) (done bool, err error) {
+	err = wait.PollUntilContextTimeout(context.TODO(), 10*time.Millisecond, 1*time.Second, true, func(context.Context) (done bool, err error) {
 		d := &net.Dialer{Timeout: 50 * time.Millisecond}
 		conn, err := tls.DialWithDialer(d, "tcp", wcl.HostPort(), &tls.Config{
 			InsecureSkipVerify: true, //nolint:gosec // config is used to connect to our own port.