fix lint error

Signed-off-by: sivchari <[email protected]>

Author: sivchari

bootstrap/kubeadm/internal/cloudinit/controlplane_init.go

@@ -60,7 +60,7 @@ type ControlPlaneInput struct {
 // NewInitControlPlane returns the user data string to be used on a controlplane instance.
 func NewInitControlPlane(input *ControlPlaneInput) ([]byte, error) {
 	input.Header = cloudConfigHeader
-	input.WriteFiles = input.Certificates.AsFiles()
+	input.WriteFiles = input.AsFiles()
 	input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
 	input.SentinelFileCommand = sentinelFileCommand
 	userData, err := generate("InitControlplane", controlPlaneCloudInit, input)

bootstrap/kubeadm/internal/cloudinit/controlplane_join.go

@@ -58,7 +58,7 @@ type ControlPlaneJoinInput struct {
 // NewJoinControlPlane returns the user data string to be used on a new control plane instance.
 func NewJoinControlPlane(input *ControlPlaneJoinInput) ([]byte, error) {
 	// TODO: Consider validating that the correct certificates exist. It is different for external/stacked etcd
-	input.WriteFiles = input.Certificates.AsFiles()
+	input.WriteFiles = input.AsFiles()
 	input.ControlPlane = true
 	if err := input.prepare(); err != nil {
 		return nil, err

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

@@ -2646,7 +2646,7 @@ func addKubeadmConfigToMachine(config *bootstrapv1.KubeadmConfig, machine *clust
 	if machine == nil {
 		panic("no machine passed to function")
 	}
-	config.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
+	config.OwnerReferences = []metav1.OwnerReference{
 		{
 			Kind:       "Machine",
 			APIVersion: clusterv1.GroupVersion.String(),
@@ -2668,7 +2668,7 @@ func addKubeadmConfigToMachinePool(config *bootstrapv1.KubeadmConfig, machinePoo
 	if machinePool == nil {
 		panic("no machinePool passed to function")
 	}
-	config.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
+	config.OwnerReferences = []metav1.OwnerReference{
 		{
 			Kind:       "MachinePool",
 			APIVersion: expv1.GroupVersion.String(),

bootstrap/kubeadm/internal/ignition/ignition.go

@@ -79,7 +79,7 @@ func NewJoinControlPlane(input *ControlPlaneJoinInput) ([]byte, string, error) {
 		return nil, "", fmt.Errorf("controlplane join input can't be nil")
 	}
 
-	input.WriteFiles = input.Certificates.AsFiles()
+	input.WriteFiles = input.AsFiles()
 	input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
 	input.KubeadmCommand = fmt.Sprintf(kubeadmCommandTemplate, joinSubcommand, input.KubeadmVerbosity)
 
@@ -96,7 +96,7 @@ func NewInitControlPlane(input *ControlPlaneInput) ([]byte, string, error) {
 		return nil, "", fmt.Errorf("controlplane input can't be nil")
 	}
 
-	input.WriteFiles = input.Certificates.AsFiles()
+	input.WriteFiles = input.AsFiles()
 	input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
 	input.KubeadmCommand = fmt.Sprintf(kubeadmCommandTemplate, initSubcommand, input.KubeadmVerbosity)
 

bootstrap/kubeadm/types/upstreamv1beta4/bootstraptokenstring.go

@@ -59,7 +59,7 @@ func (bts *BootstrapTokenString) UnmarshalJSON(b []byte) error {
 	}
 
 	// Remove unnecessary " characters coming from the JSON parser
-	token := strings.Replace(string(b), `"`, ``, -1)
+	token := strings.ReplaceAll(string(b), `"`, ``)
 	// Convert the string Token to a BootstrapTokenString object
 	newbts, err := NewBootstrapTokenString(token)
 	if err != nil {

cmd/clusterctl/client/alpha/machinedeployment.go

@@ -91,7 +91,8 @@ func findMachineDeploymentRevision(toRevision int64, allMSs []*clusterv1.Machine
 	)
 	for _, ms := range allMSs {
 		if v, err := revision(ms); err == nil {
-			if toRevision == 0 {
+			switch toRevision {
+			case 0:
 				if latestRevision < v {
 					// newest one we've seen so far
 					previousRevision = latestRevision
@@ -103,7 +104,7 @@ func findMachineDeploymentRevision(toRevision int64, allMSs []*clusterv1.Machine
 					previousRevision = v
 					previousMachineSet = ms
 				}
-			} else if toRevision == v {
+			case v:
 				return ms, nil
 			}
 		}

cmd/clusterctl/client/alpha/rollout_resumer.go

@@ -72,7 +72,7 @@ func resumeMachineDeployment(ctx context.Context, proxy cluster.Proxy, name, nam
 // resumeKubeadmControlPlane removes paused annotation.
 func resumeKubeadmControlPlane(ctx context.Context, proxy cluster.Proxy, name, namespace string) error {
 	// In the paused annotation we must replace slashes to ~1, see https://datatracker.ietf.org/doc/html/rfc6901#section-3.
-	pausedAnnotation := strings.Replace(clusterv1.PausedAnnotation, "/", "~1", -1)
+	pausedAnnotation := strings.ReplaceAll(clusterv1.PausedAnnotation, "/", "~1")
 	patch := client.RawPatch(types.JSONPatchType, []byte(fmt.Sprintf("[{\"op\": \"remove\", \"path\": \"/metadata/annotations/%s\"}]", pausedAnnotation)))
 
 	return patchKubeadmControlPlane(ctx, proxy, name, namespace, patch)

cmd/clusterctl/client/cluster/cert_manager.go

@@ -347,7 +347,7 @@ func (cm *certManagerClient) shouldUpgrade(desiredVersion string, objs, installO
 	// the number of objects when version of objects are equal
 	relevantObjs := []unstructured.Unstructured{}
 	for _, o := range objs {
-		if !(o.GetKind() == "Endpoints" || o.GetKind() == "EndpointSlice") {
+		if o.GetKind() != "Endpoints" && o.GetKind() != "EndpointSlice" {
 			relevantObjs = append(relevantObjs, o)
 		}
 	}

cmd/clusterctl/client/cluster/components_test.go

@@ -522,7 +522,7 @@ func Test_providerComponents_ValidateNoObjectsExist(t *testing.T) {
 			},
 		},
 	}
-	crd.ObjectMeta.Labels[clusterctlv1.ClusterctlLabel] = ""
+	crd.Labels[clusterctlv1.ClusterctlLabel] = ""
 
 	cr := &unstructured.Unstructured{}
 	cr.SetAPIVersion("some.group/v1")

cmd/clusterctl/client/cluster/mover_test.go

@@ -726,8 +726,8 @@ var backupRestoreTests = []struct {
 }
 
 func fixFilesGVS(file string) string {
-	s := strings.Replace(file, "$CAPI", clusterv1.GroupVersion.String(), -1)
-	return strings.Replace(s, "$INFRA", clusterv1.GroupVersionInfrastructure.String(), -1)
+	s := strings.ReplaceAll(file, "$CAPI", clusterv1.GroupVersion.String())
+	return strings.ReplaceAll(s, "$INFRA", clusterv1.GroupVersionInfrastructure.String())
 }
 
 func Test_objectMover_backupTargetObject(t *testing.T) {
@@ -752,14 +752,10 @@ func Test_objectMover_backupTargetObject(t *testing.T) {
 				fromProxy: graph.proxy,
 			}
 
-			dir, err := os.MkdirTemp("/tmp", "cluster-api")
-			if err != nil {
-				t.Error(err)
-			}
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
 			for _, node := range graph.uidToNode {
-				err = mover.backupTargetObject(ctx, node, dir)
+				err := mover.backupTargetObject(ctx, node, dir)
 				if tt.wantErr {
 					g.Expect(err).To(HaveOccurred())
 					return
@@ -823,12 +819,7 @@ func Test_objectMover_restoreTargetObject(t *testing.T) {
 
 			ctx := context.Background()
 
-			// temporary directory
-			dir, err := os.MkdirTemp("/tmp", "cluster-api")
-			if err != nil {
-				g.Expect(err).ToNot(HaveOccurred())
-			}
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
 			// Create an objectGraph bound a source cluster with all the CRDs for the types involved in the test.
 			graph := getObjectGraph()
@@ -952,13 +943,9 @@ func Test_objectMover_toDirectory(t *testing.T) {
 				fromProxy: graph.proxy,
 			}
 
-			dir, err := os.MkdirTemp("/tmp", "cluster-api")
-			if err != nil {
-				t.Error(err)
-			}
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
-			err = mover.toDirectory(ctx, graph, dir)
+			err := mover.toDirectory(ctx, graph, dir)
 			if tt.wantErr {
 				g.Expect(err).To(HaveOccurred())
 				return
@@ -1013,11 +1000,7 @@ func Test_objectMover_filesToObjs(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
-			dir, err := os.MkdirTemp("/tmp", "cluster-api")
-			if err != nil {
-				t.Error(err)
-			}
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
 			for _, fileName := range tt.files {
 				path := filepath.Join(dir, fileName)
@@ -1074,12 +1057,7 @@ func Test_objectMover_fromDirectory(t *testing.T) {
 
 			ctx := context.Background()
 
-			// temporary directory
-			dir, err := os.MkdirTemp("/tmp", "cluster-api")
-			if err != nil {
-				g.Expect(err).ToNot(HaveOccurred())
-			}
-			defer os.RemoveAll(dir)
+			dir := t.TempDir()
 
 			// Create an objectGraph bound a source cluster with all the CRDs for the types involved in the test.
 			graph := getObjectGraph()