another attempt to reresolve linter issues

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

Author: Ariel Kass

controllers/pvc_test.go

@@ -111,6 +111,7 @@ func createFakeVolumeReplicationReconciler(t *testing.T, obj ...runtime.Object)
 
 func TestGetVolumeHandle(t *testing.T) {
 	t.Parallel()
+
 	testcases := []struct {
 		name                 string
 		pv                   *corev1.PersistentVolume

controllers/volumereplication_controller.go

@@ -186,6 +186,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 			return ctrl.Result{}, vgErr
 		}
+
 		volumeHandle = vgc.Spec.Source.VolumeGroupHandle
 	default:
 		err = fmt.Errorf("unsupported datasource kind")
@@ -301,7 +302,6 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	var requeueForResync bool
 
-
 	switch instance.Spec.ReplicationState {
 	case replicationv1alpha1.Primary:
 		replicationErr = r.markVolumeAsPrimary(instance, logger, replicationSource, replicationHandle, parameters, secret)
@@ -342,6 +342,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		replicationErr = fmt.Errorf("unsupported volume state")
 		logger.Error(replicationErr, "given volume state is not supported", "ReplicationState", instance.Spec.ReplicationState)
 		setFailureCondition(instance)
+
 		err = r.updateReplicationStatus(ctx, instance, logger, getCurrentReplicationState(instance), replicationErr.Error())
 		if err != nil {
 			logger.Error(err, "failed to update volumeReplication status", "VRName", instance.Name)
@@ -544,6 +545,7 @@ func (r *VolumeReplicationReconciler) markVolumeAsPrimary(volumeReplicationObjec
 			logger.Info("force promoting volume due to known grpc error", "error", resp.Error)
 
 			volumeReplication.Force = true
+
 			resp := volumeReplication.Promote()
 			if resp.Error != nil {
 				logger.Error(resp.Error, "failed to force promote volume")
@@ -614,6 +616,7 @@ func (r *VolumeReplicationReconciler) resyncVolume(volumeReplicationObject *repl
 
 		return false, resp.Error
 	}
+
 	resyncResponse, ok := resp.Response.(*replicationlib.ResyncVolumeResponse)
 	if !ok {
 		err := fmt.Errorf("received response of unexpected type")

main.go

@@ -64,8 +64,10 @@ func init() {
 func main() {
 	var metricsAddr string
 	var leaderElectionNamespace string
-	var enableLeaderElection bool
 	var probeAddr string
+
+	var enableLeaderElection bool
+
 	var opts zap.Options
 
 	if strings.EqualFold(os.Getenv("DEVELOPMENT_MODE"), "true") {

pkg/client/client.go

@@ -42,12 +42,12 @@ func connect(address string, timeout time.Duration) (*grpc.ClientConn, error) {
 
 // New creates and returns the GRPC client.
 func New(address string, timeout time.Duration) (*Client, error) {
-	c := &Client{}
-	cc, err := connect(address, timeout)
+	client := &Client{}
+	connection, err := connect(address, timeout)
 	if err != nil {
-		return c, err
+		return client, err
 	}
-	c.Client = cc
+	c.Client = connection
 	c.Timeout = timeout
 
 	return c, nil