chore(sonar): Fix sonar warnings in applicationset/generators/duck_type.go (argoproj#23211)

Signed-off-by: Oliver Gondža <[email protected]>
Co-authored-by: Nitish Kumar <[email protected]>
Signed-off-by: Jonathan Ogilvie <[email protected]>

Author: 2 people

applicationset/generators/duck_type.go

@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
@@ -130,18 +131,51 @@ func (g *DuckTypeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.A
 
 	// Override the duck type in the status of the resource
 	statusListKey := "clusters"
-
-	matchKey := cm.Data["matchKey"]
-
 	if cm.Data["statusListKey"] != "" {
 		statusListKey = cm.Data["statusListKey"]
 	}
+
+	matchKey := cm.Data["matchKey"]
 	if matchKey == "" {
 		log.WithField("matchKey", matchKey).Warning("matchKey not found in " + cm.Name)
 		return nil, nil
 	}
 
+	clusterDecisions := buildClusterDecisions(duckResources, statusListKey)
+	if len(clusterDecisions) == 0 {
+		log.Warningf("clusterDecisionResource status.%s missing", statusListKey)
+		return nil, nil
+	}
+
 	res := []map[string]any{}
+	for _, clusterDecision := range clusterDecisions {
+		cluster := findCluster(clustersFromArgoCD, clusterDecision, matchKey, statusListKey)
+		// if no cluster is found, move to the next cluster
+		if cluster == nil {
+			continue
+		}
+
+		// generated instance of cluster params
+		params := map[string]any{
+			"name":   cluster.Name,
+			"server": cluster.Server,
+		}
+
+		for key, value := range clusterDecision.(map[string]any) {
+			params[key] = value.(string)
+		}
+
+		for key, value := range appSetGenerator.ClusterDecisionResource.Values {
+			collectParams(appSet, params, key, value)
+		}
+
+		res = append(res, params)
+	}
+
+	return res, nil
+}
+
+func buildClusterDecisions(duckResources *unstructured.UnstructuredList, statusListKey string) []any {
 	clusterDecisions := []any{}
 
 	// Build the decision slice
@@ -158,61 +192,38 @@ func (g *DuckTypeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.A
 		clusterDecisions = append(clusterDecisions, duckResource.Object["status"].(map[string]any)[statusListKey].([]any)...)
 	}
 	log.Infof("Number of decisions found: %v", len(clusterDecisions))
+	return clusterDecisions
+}
 
-	if len(clusterDecisions) == 0 {
-		log.Warningf("clusterDecisionResource status.%s missing", statusListKey)
-		return nil, nil
+func findCluster(clustersFromArgoCD []utils.ClusterSpecifier, cluster any, matchKey string, statusListKey string) *utils.ClusterSpecifier {
+	log.Infof("cluster: %v", cluster)
+	matchValue := cluster.(map[string]any)[matchKey]
+	if matchValue == nil || matchValue.(string) == "" {
+		log.Warningf("matchKey=%v not found in \"%v\" list: %v\n", matchKey, statusListKey, cluster.(map[string]any))
+		return nil // no match
 	}
-	for _, cluster := range clusterDecisions {
-		// generated instance of cluster params
-		params := map[string]any{}
 
-		log.Infof("cluster: %v", cluster)
-		matchValue := cluster.(map[string]any)[matchKey]
-		if matchValue == nil || matchValue.(string) == "" {
-			log.Warningf("matchKey=%v not found in \"%v\" list: %v\n", matchKey, statusListKey, cluster.(map[string]any))
-			continue
-		}
-
-		strMatchValue := matchValue.(string)
-		log.WithField(matchKey, strMatchValue).Debug("validate against ArgoCD")
+	strMatchValue := matchValue.(string)
+	log.WithField(matchKey, strMatchValue).Debug("validate against ArgoCD")
 
-		found := false
-
-		for _, argoCluster := range clustersFromArgoCD {
-			if argoCluster.Name != strMatchValue {
-				continue
-			}
+	for _, argoCluster := range clustersFromArgoCD {
+		if argoCluster.Name == strMatchValue {
 			log.WithField(matchKey, argoCluster.Name).Info("matched cluster in ArgoCD")
-			params["name"] = argoCluster.Name
-			params["server"] = argoCluster.Server
-
-			found = true
-			break // Stop looking
-		}
-
-		if !found {
-			log.WithField(matchKey, strMatchValue).Warning("unmatched cluster in ArgoCD")
-			continue
+			return &argoCluster
 		}
+	}
 
-		for key, value := range cluster.(map[string]any) {
-			params[key] = value.(string)
-		}
+	log.WithField(matchKey, strMatchValue).Warning("unmatched cluster in ArgoCD")
+	return nil
+}
 
-		for key, value := range appSetGenerator.ClusterDecisionResource.Values {
-			if appSet.Spec.GoTemplate {
-				if params["values"] == nil {
-					params["values"] = map[string]string{}
-				}
-				params["values"].(map[string]string)[key] = value
-			} else {
-				params["values."+key] = value
-			}
+func collectParams(appSet *argoprojiov1alpha1.ApplicationSet, params map[string]any, key string, value string) {
+	if appSet.Spec.GoTemplate {
+		if params["values"] == nil {
+			params["values"] = map[string]string{}
 		}
-
-		res = append(res, params)
+		params["values"].(map[string]string)[key] = value
+	} else {
+		params["values."+key] = value
 	}
-
-	return res, nil
 }