resolving more staticcheck and wsl_v5 linter issues

Signed-off-by: Ariel Kass <[email protected]>

Author: Ariel Kass

controllers/finalizers.go

@@ -40,6 +40,7 @@ func (r *VolumeReplicationReconciler) addFinalizerToVR(ctx context.Context, logg
 	if !contains(vr.Finalizers, volumeReplicationFinalizer) {
 		logger.Info("adding finalizer to volumeReplication object", "Finalizer", volumeReplicationFinalizer)
 		vr.Finalizers = append(vr.Finalizers, volumeReplicationFinalizer)
+
 		err := r.Update(ctx, vr)
 		if err != nil {
 			return fmt.Errorf("failed to add finalizer (%s) to VolumeReplication resource"+
@@ -56,6 +57,7 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromVR(ctx context.Context,
 	if contains(vr.Finalizers, volumeReplicationFinalizer) {
 		logger.Info("removing finalizer from volumeReplication object", "Finalizer", volumeReplicationFinalizer)
 		vr.Finalizers = remove(vr.Finalizers, volumeReplicationFinalizer)
+
 		err := r.Update(ctx, vr)
 		if err != nil {
 			return fmt.Errorf("failed to remove finalizer (%s) from VolumeReplication resource"+
@@ -89,6 +91,7 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromPVC(ctx context.Context
 	if contains(pvc.Finalizers, pvcReplicationFinalizer) {
 		logger.Info("removing finalizer from PersistentVolumeClaim object", "Finalizer", pvcReplicationFinalizer)
 		pvc.Finalizers = remove(pvc.Finalizers, pvcReplicationFinalizer)
+		
 		err := r.Update(ctx, pvc)
 		if err != nil {
 			return fmt.Errorf("failed to remove finalizer (%s) from PersistentVolumeClaim resource"+
@@ -105,6 +108,7 @@ func (r *VolumeReplicationReconciler) addFinalizerToVG(ctx context.Context, logg
 	if !contains(vg.Finalizers, vgReplicationFinalizer) {
 		logger.Info("adding finalizer to VolumeGroup object", "Finalizer", vgReplicationFinalizer)
 		vg.Finalizers = append(vg.Finalizers, vgReplicationFinalizer)
+
 		err := r.Update(ctx, vg)
 		if err != nil {
 			return fmt.Errorf("failed to add finalizer (%s) to VolumeGroup resource"+
@@ -122,6 +126,7 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromVG(ctx context.Context,
 	if contains(vg.Finalizers, vgReplicationFinalizer) {
 		logger.Info("removing finalizer from VolumeGroup object", "Finalizer", vgReplicationFinalizer)
 		vg.Finalizers = remove(vg.Finalizers, vgReplicationFinalizer)
+		
 		err := r.Update(ctx, vg)
 		if err != nil {
 			return fmt.Errorf("failed to remove finalizer (%s) from VolumeGroup resource"+

controllers/pvc.go

@@ -33,7 +33,7 @@ func (r VolumeReplicationReconciler) getPVCDataSource(ctx context.Context, logge
 	*corev1.PersistentVolumeClaim, *corev1.PersistentVolume, error,
 ) {
 	pvc := &corev1.PersistentVolumeClaim{}
-	err := r.Client.Get(ctx, req, pvc)
+	err := r.Get(ctx, req, pvc)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logger.Error(err, "PVC not found", "PVC Name", req.Name)
@@ -49,7 +49,7 @@ func (r VolumeReplicationReconciler) getPVCDataSource(ctx context.Context, logge
 	// Get PV object for the PVC
 	pvName := pvc.Spec.VolumeName
 	pv := &corev1.PersistentVolume{}
-	err = r.Client.Get(ctx, types.NamespacedName{Name: pvName}, pv)
+	err = r.Get(ctx, types.NamespacedName{Name: pvName}, pv)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logger.Error(err, "PV not found", "PV Name", pvName)

controllers/secret.go

@@ -29,7 +29,7 @@ import (
 func (r *VolumeReplicationReconciler) getSecret(ctx context.Context, logger logr.Logger, name, namespace string) (map[string]string, error) {
 	namespacedName := types.NamespacedName{Name: name, Namespace: namespace}
 	secret := &corev1.Secret{}
-	err := r.Client.Get(ctx, namespacedName, secret)
+	err := r.Get(ctx, namespacedName, secret)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			logger.Error(err, "secret not found", "Secret Name", name, "Secret Namespace", namespace)

controllers/vg.go

@@ -32,7 +32,7 @@ func (r VolumeReplicationReconciler) getVGDataSource(ctx context.Context, logger
 	*volumegroupv1.VolumeGroup, *volumegroupv1.VolumeGroupContent, error,
 ) {
 	vg := &volumegroupv1.VolumeGroup{}
-	err := r.Client.Get(ctx, req, vg)
+	err := r.Get(ctx, req, vg)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logger.Error(err, "VG not found", "VG Name", req.Name)
@@ -44,7 +44,7 @@ func (r VolumeReplicationReconciler) getVGDataSource(ctx context.Context, logger
 	vgc := &volumegroupv1.VolumeGroupContent{}
 	volumeGroupContentName := *vg.Spec.Source.VolumeGroupContentName
 	namespacedVGC := types.NamespacedName{Name: volumeGroupContentName, Namespace: vg.Namespace}
-	err = r.Client.Get(ctx, namespacedVGC, vgc)
+	err = r.Get(ctx, namespacedVGC, vgc)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logger.Error(err, "VolumeGroupContent not found", "VolumeGroupContent Name", volumeGroupContentName)

controllers/volumereplication_controller.go

@@ -82,7 +82,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	// Fetch VolumeReplication instance
 	instance := &replicationv1alpha1.VolumeReplication{}
-	err := r.Client.Get(ctx, req.NamespacedName, instance)
+	err := r.Get(ctx, req.NamespacedName, instance)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.
@@ -280,7 +280,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 	}
 
 	instance.Status.LastStartTime = getCurrentTime()
-	err = r.Client.Update(ctx, instance)
+	err = r.Update(ctx, instance)
 	if err != nil {
 		logger.Error(err, "failed to update status")
 
@@ -466,7 +466,7 @@ func (r *VolumeReplicationReconciler) updateReplicationStatus(
 	instance.Status.Message = message
 	instance.Status.ObservedGeneration = instance.Generation
 
-	err := r.Client.Status().Update(ctx, instance)
+	err := r.Status().Update(ctx, instance)
 	if err != nil {
 		logger.Error(err, "failed to update status")
 
@@ -505,7 +505,7 @@ func (r *VolumeReplicationReconciler) waitForVolumeReplicationResource(logger lo
 	})
 
 	for {
-		err := r.Client.List(context.TODO(), unstructuredResource)
+		err := r.List(context.TODO(), unstructuredResource)
 		if err == nil {
 			return nil
 		}

controllers/volumereplicationclass.go

@@ -31,7 +31,7 @@ import (
 //nolint:gocritic
 func (r VolumeReplicationReconciler) getVolumeReplicationClass(ctx context.Context, logger logr.Logger, vrcName string) (*replicationv1alpha1.VolumeReplicationClass, error) {
 	vrcObj := &replicationv1alpha1.VolumeReplicationClass{}
-	err := r.Client.Get(ctx, types.NamespacedName{Name: vrcName}, vrcObj)
+	err := r.Get(ctx, types.NamespacedName{Name: vrcName}, vrcObj)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logger.Error(err, "VolumeReplicationClass not found", "VolumeReplicationClass", vrcName)