resolving varnamelen linter issues

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

Author: Ariel Kass

.github/workflows/config/lint-config.yml

@@ -31,6 +31,13 @@ linters:
     - perfsprint
     - recvcheck
   settings:
+    varnamelen:
+      ignore-names:
+        - pv
+        - pvc
+        - vg
+        - vr
+        - tc
     depguard:
       rules:
         main:

controllers/parameters.go

@@ -37,9 +37,9 @@ const (
 // replicationclass which are matching the prefix.
 func filterPrefixedParameters(prefix string, param map[string]string) map[string]string {
 	newParam := map[string]string{}
-	for k, v := range param {
-		if !strings.HasPrefix(k, prefix) {
-			newParam[k] = v
+	for key, val := range param {
+		if !strings.HasPrefix(key, prefix) {
+			newParam[key] = val
 		}
 	}
 
@@ -49,21 +49,21 @@ func filterPrefixedParameters(prefix string, param map[string]string) map[string
 // validatePrefixParameters checks for unknown reserved keys in parameters and
 // empty values for reserved keys.
 func validatePrefixedParameters(param map[string]string) error {
-	for k, v := range param {
-		if strings.HasPrefix(k, replicationParameterPrefix) {
-			switch k {
+	for key, val := range param {
+		if strings.HasPrefix(key, replicationParameterPrefix) {
+			switch key {
 			case prefixedReplicationSecretNameKey:
-				if v == "" {
+				if val == "" {
 					return errors.New("secret name cannot be empty")
 				}
 			case prefixedReplicationSecretNamespaceKey:
-				if v == "" {
+				if val == "" {
 					return errors.New("secret namespace cannot be empty")
 				}
 			// keep adding known prefixes to this list.
 			default:
 
-				return fmt.Errorf("found unknown parameter key %q with reserved prefix %s", k, replicationParameterPrefix)
+				return fmt.Errorf("found unknown parameter key %q with reserved prefix %s", key, replicationParameterPrefix)
 			}
 		}
 	}

controllers/replication/replication.go

@@ -106,15 +106,15 @@ func (r *Response) HasKnownGRPCError(knownErrors []codes.Code) bool {
 		return false
 	}
 
-	s, ok := status.FromError(r.Error)
+	grpcStatus, ok := status.FromError(r.Error)
 	if !ok {
 		// This is not gRPC error. The operation must have failed before gRPC
 		// method was called, otherwise we would get gRPC error.
 		return false
 	}
 
 	for _, e := range knownErrors {
-		if s.Code() == e {
+		if grpcStatus.Code() == e {
 			return true
 		}
 	}
@@ -124,12 +124,12 @@ func (r *Response) HasKnownGRPCError(knownErrors []codes.Code) bool {
 
 // GetMessageFromError returns the message from the error.
 func GetMessageFromError(err error) string {
-	s, ok := status.FromError(err)
+	grpcStatus, ok := status.FromError(err)
 	if !ok {
 		// This is not gRPC error. The operation must have failed before gRPC
 		// method was called, otherwise we would get gRPC error.
 		return err.Error()
 	}
 
-	return s.Message()
+	return grpcStatus.Message()
 }

controllers/volumereplication_controller.go

@@ -409,19 +409,19 @@ func (r *VolumeReplicationReconciler) SetupWithManager(mgr ctrl.Manager, cfg *co
 	pred := predicate.GenerationChangedPredicate{}
 
 	r.DriverConfig = cfg
-	c, err := grpcClient.New(cfg.DriverEndpoint, cfg.RPCTimeout)
+	grpcClient, err := grpcClient.New(cfg.DriverEndpoint, cfg.RPCTimeout)
 	if err != nil {
 		r.Log.Error(err, "failed to create GRPC Client", "Endpoint", cfg.DriverEndpoint, "GRPC Timeout", cfg.RPCTimeout)
 
 		return err
 	}
-	err = c.Probe()
+	err = grpcClient.Probe()
 	if err != nil {
 		r.Log.Error(err, "failed to connect to driver", "Endpoint", cfg.DriverEndpoint, "GRPC Timeout", cfg.RPCTimeout)
 
 		return err
 	}
-	r.GRPCClient = c
+	r.GRPCClient = grpcClient
 	r.Replication = grpcClient.NewReplicationClient(r.GRPCClient.Client, cfg.RPCTimeout)
 
 	return ctrl.NewControllerManagedBy(mgr).
@@ -616,7 +616,7 @@ func (r *VolumeReplicationReconciler) resyncVolume(volumeReplicationObject *repl
 func (r *VolumeReplicationReconciler) disableVolumeReplication(logger logr.Logger, replicationSource *replicationlib.ReplicationSource, replicationID string,
 	parameters, secrets map[string]string,
 ) error {
-	c := replication.CommonRequestParameters{
+	params := replication.CommonRequestParameters{
 		ReplicationSource: replicationSource,
 		ReplicationID:     replicationID,
 		Parameters:        parameters,
@@ -625,7 +625,7 @@ func (r *VolumeReplicationReconciler) disableVolumeReplication(logger logr.Logge
 	}
 
 	volumeReplication := replication.Replication{
-		Params: c,
+		Params: params,
 	}
 
 	resp := volumeReplication.Disable()
@@ -648,7 +648,7 @@ func (r *VolumeReplicationReconciler) disableVolumeReplication(logger logr.Logge
 func (r *VolumeReplicationReconciler) enableReplication(logger logr.Logger, replicationSource *replicationlib.ReplicationSource, replicationID string,
 	parameters, secrets map[string]string,
 ) error {
-	c := replication.CommonRequestParameters{
+	params := replication.CommonRequestParameters{
 		ReplicationSource: replicationSource,
 		ReplicationID:     replicationID,
 		Parameters:        parameters,
@@ -657,7 +657,7 @@ func (r *VolumeReplicationReconciler) enableReplication(logger logr.Logger, repl
 	}
 
 	volumeReplication := replication.Replication{
-		Params: c,
+		Params: params,
 	}
 
 	resp := volumeReplication.Enable()