fix: resolve linting issues

- Replace string literals with testNamespaceName constant
- Reduce complexity in addConfigMapToHash function
- Add blank lines before return statements
- Fix whitespace/cuddling issues per wsl linter

Author: PavanNeerudu

internal/controller/configmap_changes_test.go

@@ -83,6 +83,7 @@ func TestConfigMapChangesAreAppliedToTheProvider(t *testing.T) {
 		if err := env.Get(ctx, client.ObjectKeyFromObject(coreProvider), coreProvider); err != nil {
 			return false
 		}
+
 		return conditions.IsTrue(coreProvider, operatorv1.ProviderInstalledCondition)
 	}, timeout).Should(BeTrue())
 
@@ -135,6 +136,7 @@ func TestConfigMapChangesAreAppliedToTheProvider(t *testing.T) {
 			return false
 		}
 		hash := provider.GetAnnotations()[appliedSpecHashAnnotation]
+
 		return hash != ""
 	}, timeout).Should(BeTrue(), "Provider should have a hash annotation after reconciliation")
 
@@ -159,6 +161,7 @@ func TestConfigMapChangesAreAppliedToTheProvider(t *testing.T) {
 		}
 
 		currentHash := provider.GetAnnotations()[appliedSpecHashAnnotation]
+
 		return currentHash != "" && currentHash != initialHash
 	}, 30*time.Second).Should(BeTrue())
 

internal/controller/configmaps_to_providers.go

@@ -65,6 +65,7 @@ func newConfigMapToProviderFuncMapForProviderList(k8sClient client.Client, provi
 
 			if selector.Matches(configMapLabels) {
 				log.V(1).Info("ConfigMap matches provider selector, enqueueing reconcile request")
+
 				requests = append(requests, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(provider)})
 			}
 		}

internal/controller/configmaps_to_providers_test.go

@@ -31,7 +31,7 @@ import (
 func TestProviderConfigMapMapper(t *testing.T) {
 	g := NewWithT(t)
 
-	namespace := "test-namespace"
+	namespace := testNamespaceName
 	configMapLabels := map[string]string{
 		"provider-components": "edge",
 		"version":             "v0.1.19",
@@ -138,7 +138,7 @@ func TestProviderConfigMapMapper(t *testing.T) {
 func TestProviderConfigMapMapperWithExpressions(t *testing.T) {
 	g := NewWithT(t)
 
-	namespace := "test-namespace"
+	namespace := testNamespaceName
 	configMapLabels := map[string]string{
 		"provider-components": "edge",
 		"version":             "v0.1.19",
@@ -193,7 +193,7 @@ func TestProviderConfigMapMapperWithExpressions(t *testing.T) {
 func TestProviderConfigMapMapperNoMatches(t *testing.T) {
 	g := NewWithT(t)
 
-	namespace := "test-namespace"
+	namespace := testNamespaceName
 	configMapLabels := map[string]string{
 		"provider-components": "azure",
 		"version":             "v1.9.3",

internal/controller/genericprovider_controller.go

@@ -292,37 +292,43 @@ func addConfigSecretToHash(ctx context.Context, k8sClient client.Client, hash ha
 
 func addConfigMapToHash(ctx context.Context, k8sClient client.Client, hash hash.Hash, provider genericprovider.GenericProvider) error {
 	spec := provider.GetSpec()
-	if spec.FetchConfig != nil && spec.FetchConfig.Selector != nil {
-		// List ConfigMaps that match the provider's selector
-		selector, err := metav1.LabelSelectorAsSelector(spec.FetchConfig.Selector)
-		if err != nil {
-			return err
-		}
+	if spec.FetchConfig == nil || spec.FetchConfig.Selector == nil {
+		return nil
+	}
 
-		configMapList := &corev1.ConfigMapList{}
-		listOpts := []client.ListOption{
-			client.MatchingLabelsSelector{Selector: selector},
-			client.InNamespace(provider.GetNamespace()),
-		}
+	return processProviderConfigMaps(ctx, k8sClient, hash, provider, spec.FetchConfig.Selector)
+}
 
-		if err := k8sClient.List(ctx, configMapList, listOpts...); err != nil {
-			return err
-		}
+func processProviderConfigMaps(ctx context.Context, k8sClient client.Client, hash hash.Hash, provider genericprovider.GenericProvider, selector *metav1.LabelSelector) error {
+	// List ConfigMaps that match the provider's selector
+	labelSelector, err := metav1.LabelSelectorAsSelector(selector)
+	if err != nil {
+		return err
+	}
 
-		// Ensure only one ConfigMap matches the selector
-		if len(configMapList.Items) > 1 {
-			return fmt.Errorf("multiple ConfigMaps match the provider selector, only one ConfigMap per provider is allowed")
-		}
+	configMapList := &corev1.ConfigMapList{}
+	listOpts := []client.ListOption{
+		client.MatchingLabelsSelector{Selector: labelSelector},
+		client.InNamespace(provider.GetNamespace()),
+	}
 
-		// Add the ConfigMap's data to the hash (if any ConfigMap exists)
-		if len(configMapList.Items) == 1 {
-			cm := configMapList.Items[0]
-			if err := addObjectToHash(hash, cm.Data); err != nil {
-				return err
-			}
-			if err := addObjectToHash(hash, cm.BinaryData); err != nil {
-				return err
-			}
+	if err := k8sClient.List(ctx, configMapList, listOpts...); err != nil {
+		return err
+	}
+
+	// Ensure only one ConfigMap matches the selector
+	if len(configMapList.Items) > 1 {
+		return fmt.Errorf("multiple ConfigMaps match the provider selector, only one ConfigMap per provider is allowed")
+	}
+
+	// Add the ConfigMap's data to the hash (if any ConfigMap exists)
+	if len(configMapList.Items) == 1 {
+		cm := configMapList.Items[0]
+		if err := addObjectToHash(hash, cm.Data); err != nil {
+			return err
+		}
+		if err := addObjectToHash(hash, cm.BinaryData); err != nil {
+			return err
 		}
 	}