fix(lint): appease linter

thunderboltsid · thunderboltsid · commit 881510ed799a · 2025-07-23T15:00:58.000+02:00
diff --git a/common/pkg/capi/clustertopology/handlers/lifecycle/parallel_test.go b/common/pkg/capi/clustertopology/handlers/lifecycle/parallel_test.go
@@ -248,7 +248,7 @@ func Test_runHooksInParallel(t *testing.T) {
 
 			gotResponse := &runtimehooksv1.BeforeClusterUpgradeResponse{}
 			runHooksInParallel(
-				context.Background(),
+				t.Context(),
 				hookFuncs,
 				&runtimehooksv1.BeforeClusterUpgradeRequest{},
 				gotResponse,
diff --git a/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go b/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go
@@ -221,7 +221,7 @@ func TestMetaGeneratePatches(t *testing.T) {
 			h := NewMetaGeneratePatchesHandler("", nil, tt.mutaters...).(GeneratePatches)
 
 			resp := &runtimehooksv1.GeneratePatchesResponse{}
-			h.GeneratePatches(context.Background(), &runtimehooksv1.GeneratePatchesRequest{
+			h.GeneratePatches(t.Context(), &runtimehooksv1.GeneratePatchesRequest{
 				Items: []runtimehooksv1.GeneratePatchesRequestItem{
 					request.NewKubeadmConfigTemplateRequestItem("kubeadm-config"),
 					request.NewKubeadmControlPlaneTemplateRequestItem("kubeadm-control-plane"),
diff --git a/common/pkg/capi/utils/utils_test.go b/common/pkg/capi/utils/utils_test.go
@@ -4,7 +4,6 @@
 package utils
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
@@ -223,7 +222,7 @@ func TestManagementOrFutureManagementCluster(t *testing.T) {
 			t.Parallel()
 			cl := buildFakeClientForTest(t, tt.initialClusters, tt.nodes)
 
-			cluster, err := ManagementOrFutureManagementCluster(context.Background(), cl)
+			cluster, err := ManagementOrFutureManagementCluster(t.Context(), cl)
 			if tt.wantErr != nil {
 				require.EqualError(t, err, tt.wantErr.Error())
 			} else {
diff --git a/common/pkg/testutils/capitest/variables.go b/common/pkg/testutils/capitest/variables.go
@@ -4,7 +4,6 @@
 package capitest
 
 import (
-	"context"
 	"encoding/json"
 	"testing"
 
@@ -60,7 +59,7 @@ func ValidateDiscoverVariablesAs[V mutation.DiscoverVariables, T any](
 	h := handlerCreator()
 	resp := &runtimehooksv1.DiscoverVariablesResponse{}
 	h.DiscoverVariables(
-		context.Background(),
+		t.Context(),
 		&runtimehooksv1.DiscoverVariablesRequest{},
 		resp,
 	)
diff --git a/pkg/controllers/failuredomainrollout/controller_test.go b/pkg/controllers/failuredomainrollout/controller_test.go
@@ -4,7 +4,6 @@
 package failuredomainrollout
 
 import (
-	"context"
 	"testing"
 	"time"
 
@@ -290,7 +289,7 @@ func TestReconciler_shouldTriggerRollout(t *testing.T) {
 				Client: fakeClient,
 			}
 
-			needsRollout, reason, err := r.shouldTriggerRollout(context.Background(), tt.cluster, tt.kcp)
+			needsRollout, reason, err := r.shouldTriggerRollout(t.Context(), tt.cluster, tt.kcp)
 			require.NoError(t, err)
 			require.Equal(t, tt.expectedRollout, needsRollout)
 			if tt.expectedReason != "" {
@@ -525,7 +524,7 @@ func TestReconciler_shouldImproveDistribution(t *testing.T) {
 			}
 
 			// Get current distribution from the fake client
-			currentDistribution, err := r.getMachineDistribution(context.Background(), cluster)
+			currentDistribution, err := r.getMachineDistribution(t.Context(), cluster)
 			require.NoError(t, err)
 
 			shouldImprove := r.shouldImproveDistribution(
@@ -1453,7 +1452,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 				NamespacedName: client.ObjectKeyFromObject(tt.cluster),
 			}
 
-			result, err := r.Reconcile(context.Background(), req)
+			result, err := r.Reconcile(t.Context(), req)
 			require.NoError(t, err, "Reconciliation should not fail")
 
 			// Check for requeue scenarios
@@ -1467,7 +1466,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 
 				// Verify the KCP was NOT updated in requeue scenarios
 				var updatedKCP controlplanev1.KubeadmControlPlane
-				err = fakeClient.Get(context.Background(), client.ObjectKeyFromObject(tt.kcp), &updatedKCP)
+				err = fakeClient.Get(t.Context(), client.ObjectKeyFromObject(tt.kcp), &updatedKCP)
 				require.NoError(t, err, "Should be able to get KCP")
 				require.Equal(
 					t,
@@ -1480,7 +1479,7 @@ func TestReconciler_Reconcile(t *testing.T) {
 
 				// Verify the KCP was updated correctly for normal scenarios
 				var updatedKCP controlplanev1.KubeadmControlPlane
-				err = fakeClient.Get(context.Background(), client.ObjectKeyFromObject(tt.kcp), &updatedKCP)
+				err = fakeClient.Get(t.Context(), client.ObjectKeyFromObject(tt.kcp), &updatedKCP)
 				require.NoError(t, err, "Should be able to get updated KCP")
 
 				if tt.expectRolloutTriggered {
diff --git a/pkg/handlers/generic/lifecycle/csi/handler_test.go b/pkg/handlers/generic/lifecycle/csi/handler_test.go
@@ -156,7 +156,7 @@ func Test_AfterControlPlaneInitialized(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 			client := fake.NewClientBuilder().Build()
 			handler := New(client, testProviderHandlers)
 			resp := &runtimehooksv1.AfterControlPlaneInitializedResponse{}
diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go b/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go
@@ -4,7 +4,6 @@
 package servicelbgc
 
 import (
-	"context"
 	"testing"
 
 	"github.com/go-logr/logr"
@@ -202,14 +201,14 @@ func Test_deleteServicesWithLoadBalancer(t *testing.T) {
 				svc := &tt.startServices[i]
 				require.NoError(
 					t,
-					fakeClient.Create(context.Background(), svc),
+					fakeClient.Create(t.Context(), svc),
 					"error creating Service",
 				)
 			}
 
 			for {
 				err := deleteServicesWithLoadBalancer(
-					context.Background(),
+					t.Context(),
 					fakeClient,
 					logr.Discard(),
 				)
@@ -227,7 +226,7 @@ func Test_deleteServicesWithLoadBalancer(t *testing.T) {
 			services := &corev1.ServiceList{}
 			require.NoError(
 				t,
-				fakeClient.List(context.Background(), services),
+				fakeClient.List(t.Context(), services),
 				"error listing Services",
 			)
 			assert.Equal(t, tt.endServices, services.Items)
diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler_test.go b/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler_test.go
@@ -124,7 +124,7 @@ func testCases(t *testing.T) []testCase {
 func TestAfterControlPlaneInitialized(t *testing.T) {
 	for _, tt := range testCases(t) {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 			client := fake.NewClientBuilder().Build()
 			handler := New(client, testProviderHandlers)
 			resp := &runtimehooksv1.AfterControlPlaneInitializedResponse{}
@@ -157,7 +157,7 @@ func TestAfterControlPlaneInitialized(t *testing.T) {
 func TestBeforeClusterUpgrade(t *testing.T) {
 	for _, tt := range testCases(t) {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 			client := fake.NewClientBuilder().Build()
 			handler := New(client, testProviderHandlers)
 			resp := &runtimehooksv1.BeforeClusterUpgradeResponse{}
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go
@@ -4,7 +4,6 @@
 package providers
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -174,7 +173,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			}
 
 			files, preKubeadmCommands, postKubeadmCommands, err := provider.GenerateFilesAndCommands(
-				context.Background(),
+				t.Context(),
 				tt.controlPlaneEndpointSpec,
 				tt.cluster,
 			)
diff --git a/pkg/handlers/generic/mutation/mirrors/inject_test.go b/pkg/handlers/generic/mutation/mirrors/inject_test.go
@@ -4,7 +4,6 @@
 package mirrors
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
@@ -559,7 +558,7 @@ func Test_containerdConfigFromRegistryAddon(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			got, err := containerdConfigFromRegistryAddon(context.Background(), tt.c, tt.cluster)
+			got, err := containerdConfigFromRegistryAddon(t.Context(), tt.c, tt.cluster)
 			if tt.wantErr != nil {
 				require.EqualError(t, err, tt.wantErr.Error())
 			} else {
diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject.go b/pkg/handlers/nutanix/mutation/machinedetails/inject.go
@@ -151,7 +151,7 @@ func (h *nutanixMachineDetailsPatchHandler) Mutate(
 	)
 }
 
-// ensureClusterFieldExists ensures the cluster field exists in the unstructured object
+// ensureClusterFieldExists ensures the cluster field exists in the unstructured object.
 func ensureClusterFieldExists(obj *unstructured.Unstructured) error {
 	clusterPath := []string{"spec", "template", "spec", "cluster"}
 	if !hasNestedField(obj.Object, clusterPath) {
@@ -163,7 +163,7 @@ func ensureClusterFieldExists(obj *unstructured.Unstructured) error {
 	return nil
 }
 
-// ensureSubnetFieldExists ensures the subnet field exists in the unstructured object
+// ensureSubnetFieldExists ensures the subnet field exists in the unstructured object.
 func ensureSubnetFieldExists(obj *unstructured.Unstructured) error {
 	subnetPath := []string{"spec", "template", "spec", "subnet"}
 	if !hasNestedField(obj.Object, subnetPath) {
@@ -173,7 +173,7 @@ func ensureSubnetFieldExists(obj *unstructured.Unstructured) error {
 	return nil
 }
 
-// hasNestedField checks if a nested field exists in an unstructured object
+// hasNestedField checks if a nested field exists in an unstructured object.
 func hasNestedField(obj map[string]interface{}, path []string) bool {
 	current := obj
 	for _, key := range path {
diff --git a/pkg/handlers/utils/owner_reference_test.go b/pkg/handlers/utils/owner_reference_test.go
@@ -4,7 +4,6 @@
 package utils
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
@@ -115,7 +114,7 @@ func Test_EnsureOwnerReferenceForSecret(t *testing.T) {
 			t.Parallel()
 
 			err := EnsureClusterOwnerReferenceForObject(
-				context.Background(),
+				t.Context(),
 				tt.client,
 				corev1.TypedLocalObjectReference{
 					Kind: "Secret",
@@ -134,7 +133,7 @@ func Test_EnsureOwnerReferenceForSecret(t *testing.T) {
 			// verify that the owner reference was added
 			secret := &corev1.Secret{}
 			err = tt.client.Get(
-				context.Background(),
+				t.Context(),
 				client.ObjectKey{Namespace: tt.cluster.Namespace, Name: tt.secretName},
 				secret,
 			)
diff --git a/pkg/wait/wait_test.go b/pkg/wait/wait_test.go
@@ -166,7 +166,7 @@ func TestWait(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			err := ForObject(
-				context.Background(),
+				t.Context(),
 				tt.input,
 			)
 			if !tt.errCheck(err) {
diff --git a/pkg/webhook/cluster/nutanix_validator.go b/pkg/webhook/cluster/nutanix_validator.go
@@ -110,7 +110,7 @@ func validateTopologyFailureDomainConfig(
 	}
 
 	// Validate worker failure domain configuration
-	if workerErrs := validateWorkerFailureDomainConfig(clusterConfig, cluster); workerErrs != nil {
+	if workerErrs := validateWorkerFailureDomainConfig(cluster); workerErrs != nil {
 		fldErrs = append(fldErrs, workerErrs...)
 	}
 
@@ -177,10 +177,7 @@ func validateControlPlaneFailureDomainConfig(clusterConfig *variables.ClusterCon
 
 // validateWorkerFailureDomainConfig validates XOR behavior: either failureDomain is set
 // OR cluster and subnets are set with machineDetails, but not both, for workers.
-func validateWorkerFailureDomainConfig(
-	clusterConfig *variables.ClusterConfigSpec,
-	cluster *clusterv1.Cluster,
-) field.ErrorList {
+func validateWorkerFailureDomainConfig(cluster *clusterv1.Cluster) field.ErrorList {
 	fldErrs := field.ErrorList{}
 	workerConfigVarPath := field.NewPath("spec", "topology", "variables", "workerConfig")
 	workerConfigMDVarOverridePath := field.NewPath(
diff --git a/pkg/webhook/preflight/generic/registry_test.go b/pkg/webhook/preflight/generic/registry_test.go
@@ -378,7 +378,7 @@ func TestRegistryCheck(t *testing.T) {
 			}
 
 			// Execute the check
-			got := check.Run(context.Background())
+			got := check.Run(t.Context())
 
 			// Verify the result
 			assert.Equal(t, tc.want.Allowed, got.Allowed, "(allowed) mismatch for test "+tc.name)
diff --git a/pkg/webhook/preflight/generic/spec_test.go b/pkg/webhook/preflight/generic/spec_test.go
@@ -4,7 +4,6 @@
 package generic
 
 import (
-	"context"
 	"testing"
 
 	"github.com/go-logr/logr/testr"
@@ -123,7 +122,7 @@ func TestNewConfigurationCheck(t *testing.T) {
 			}
 
 			check := newConfigurationCheck(cd)
-			result := check.Run(context.Background())
+			result := check.Run(t.Context())
 
 			assert.Equal(t, tt.expectedResult, result)
 		})
diff --git a/pkg/webhook/preflight/nutanix/checker_test.go b/pkg/webhook/preflight/nutanix/checker_test.go
@@ -211,7 +211,7 @@ func TestNutanixChecker_Init(t *testing.T) {
 			}
 
 			// Call Init
-			ctx := context.Background()
+			ctx := t.Context()
 			checks := checker.Init(ctx, nil, &clusterv1.Cluster{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-cluster",
diff --git a/pkg/webhook/preflight/nutanix/credentials_test.go b/pkg/webhook/preflight/nutanix/credentials_test.go
diff --git a/pkg/webhook/preflight/nutanix/failuredomain_test.go b/pkg/webhook/preflight/nutanix/failuredomain_test.go
diff --git a/pkg/webhook/preflight/nutanix/image_test.go b/pkg/webhook/preflight/nutanix/image_test.go
diff --git a/pkg/webhook/preflight/nutanix/imagekubernetesversioncheck_test.go b/pkg/webhook/preflight/nutanix/imagekubernetesversioncheck_test.go
diff --git a/pkg/webhook/preflight/nutanix/specs_test.go b/pkg/webhook/preflight/nutanix/specs_test.go
diff --git a/pkg/webhook/preflight/nutanix/storagecontainer_test.go b/pkg/webhook/preflight/nutanix/storagecontainer_test.go
diff --git a/pkg/webhook/preflight/preflight_test.go b/pkg/webhook/preflight/preflight_test.go

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func Test_AfterControlPlaneInitialized(t *testing.T) {`
`156`	`156`	`}`
`157`	`157`	`for _, tt := range tests {`
`158`	`158`	`t.Run(tt.name, func(t *testing.T) {`
`159`		`- ctx := context.Background()`
	`159`	`+ ctx := t.Context()`
`160`	`160`	`client := fake.NewClientBuilder().Build()`
`161`	`161`	`handler := New(client, testProviderHandlers)`
`162`	`162`	`resp := &runtimehooksv1.AfterControlPlaneInitializedResponse{}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`package providers`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "context"`
`8`	`7`	`"testing"`
`9`	`8`
`10`	`9`	`"github.com/stretchr/testify/assert"`
`@@ -174,7 +173,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {`
`174`	`173`	`}`
`175`	`174`
`176`	`175`	`files, preKubeadmCommands, postKubeadmCommands, err := provider.GenerateFilesAndCommands(`
`177`		`- context.Background(),`
	`176`	`+ t.Context(),`
`178`	`177`	`tt.controlPlaneEndpointSpec,`
`179`	`178`	`tt.cluster,`
`180`	`179`	`)`