fix lint issues

Author: arshadd-b

api/v1beta2/conditions_consts.go

@@ -362,7 +362,7 @@ const (
 
 // IBMPowerVSImage's Ready condition and corresponding reasons that will be used in v1Beta2 API version.
 const (
-	// IBMPowerVSImageReadyCondition is true if the IBMPowerVSImage's deletionTimestamp is not set, IBMPowerVSImage's
+	// IBMPowerVSImageReadyCondition is true if the IBMPowerVSImage's deletionTimestamp is not set, IBMPowerVSImage's.
 	IBMPowerVSImageReadyCondition = clusterv1beta1.ReadyV1Beta2Condition
 
 	// IBMPowerVSImageReadyV1Beta2Condition documents the status of the image that is controlled

api/v1beta2/types.go

@@ -65,6 +65,7 @@ var (
 	// PowerVSImageStateImporting is the string representing an image in a failed state.
 	PowerVSImageStateImporting = PowerVSImageState("importing")
 
+	// PowerVSImageStateCompleted is the string representing an image in a completed state.
 	PowerVSImageStateCompleted = PowerVSImageState("completed")
 )
 

cloud/scope/powervs_image.go

@@ -201,7 +201,7 @@ func (i *PowerVSImageScope) CreateImageCOSBucket(ctx context.Context) (*models.I
 }
 
 // DeleteImage will delete the image.
-func (i *PowerVSImageScope) DeleteImage(ctx context.Context) error {
+func (i *PowerVSImageScope) DeleteImage() error {
 	if err := i.IBMPowerVSClient.DeleteImage(i.IBMPowerVSImage.Status.ImageID); err != nil {
 		record.Warnf(i.IBMPowerVSImage, "FailedDeleteImage", "Failed image deletion - %v", err)
 		return err
@@ -216,7 +216,7 @@ func (i *PowerVSImageScope) GetImportJob() (*models.Job, error) {
 }
 
 // DeleteImportJob will delete the image import job.
-func (i *PowerVSImageScope) DeleteImportJob(ctx context.Context) error {
+func (i *PowerVSImageScope) DeleteImportJob() error {
 	if err := i.IBMPowerVSClient.DeleteJob(i.IBMPowerVSImage.Status.JobID); err != nil {
 		record.Warnf(i.IBMPowerVSImage, "FailedDeleteImageImportJob", "Failed image import job deletion - %v", err)
 		return err

cloud/scope/powervs_image_test.go

@@ -229,7 +229,7 @@ func TestDeleteImage(t *testing.T) {
 			scope := setupPowerVSImageScope(pvsImage, mockpowervs)
 			scope.IBMPowerVSImage.Status.ImageID = pvsImage + idSuffix
 			mockpowervs.EXPECT().DeleteImage(gomock.AssignableToTypeOf(id)).Return(nil)
-			err := scope.DeleteImage(ctx)
+			err := scope.DeleteImage()
 			g.Expect(err).To(BeNil())
 		})
 
@@ -240,7 +240,7 @@ func TestDeleteImage(t *testing.T) {
 			scope := setupPowerVSImageScope(pvsImage, mockpowervs)
 			scope.IBMPowerVSImage.Status.ImageID = pvsImage + idSuffix
 			mockpowervs.EXPECT().DeleteImage(gomock.AssignableToTypeOf(id)).Return(errors.New("Failed to delete image"))
-			err := scope.DeleteImage(ctx)
+			err := scope.DeleteImage()
 			g.Expect(err).To(Not(BeNil()))
 		})
 	})
@@ -270,7 +270,7 @@ func TestDeleteImportJob(t *testing.T) {
 			scope := setupPowerVSImageScope(pvsImage, mockpowervs)
 			scope.IBMPowerVSImage.Status.JobID = "foo-job-id"
 			mockpowervs.EXPECT().DeleteJob(gomock.AssignableToTypeOf(id)).Return(nil)
-			err := scope.DeleteImportJob(ctx)
+			err := scope.DeleteImportJob()
 			g.Expect(err).To(BeNil())
 		})
 
@@ -281,7 +281,7 @@ func TestDeleteImportJob(t *testing.T) {
 			scope := setupPowerVSImageScope(pvsImage, mockpowervs)
 			scope.IBMPowerVSImage.Status.JobID = "foo-job-id"
 			mockpowervs.EXPECT().DeleteJob(gomock.AssignableToTypeOf(id)).Return(errors.New("Failed to delete image import job"))
-			err := scope.DeleteImportJob(ctx)
+			err := scope.DeleteImportJob()
 			g.Expect(err).To(Not(BeNil()))
 		})
 	})

controllers/ibmpowervsimage_controller.go

@@ -37,10 +37,10 @@ import (
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	clusterv1util "sigs.k8s.io/cluster-api/util"
-	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" //nolint:staticcheck
-	v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
-	"sigs.k8s.io/cluster-api/util/finalizers" //nolint:staticcheck
+	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"         //nolint:staticcheck
+	v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2" //nolint:staticcheck
+	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"                   //nolint:staticcheck
+	"sigs.k8s.io/cluster-api/util/finalizers"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/cloud/scope"
@@ -288,15 +288,15 @@ func (r *IBMPowerVSImageReconciler) reconcileDelete(ctx context.Context, scope *
 			log.Info("JobID is not yet set, hence not invoking the PowerVS API to delete the image import job")
 			return ctrl.Result{}, nil
 		}
-		if err := scope.DeleteImportJob(ctx); err != nil {
+		if err := scope.DeleteImportJob(); err != nil {
 			log.Error(err, "Error deleting IBMPowerVSImage Import Job")
 			return ctrl.Result{}, fmt.Errorf("error deleting IBMPowerVSImage Import Job: %w", err)
 		}
 		return ctrl.Result{}, nil
 	}
 
 	if scope.IBMPowerVSImage.Spec.DeletePolicy != string(infrav1.DeletePolicyRetain) {
-		if err := scope.DeleteImage(ctx); err != nil {
+		if err := scope.DeleteImage(); err != nil {
 			log.Error(err, "Error deleting IBMPowerVSImage")
 			v1beta1conditions.MarkFalse(scope.IBMPowerVSImage, infrav1.ImageReadyCondition, clusterv1beta1.DeletionFailedReason, clusterv1beta1.ConditionSeverityWarning, "")
 			v1beta2conditions.Set(scope.IBMPowerVSImage, metav1.Condition{