Update applicationset/generators/merge.go

Co-authored-by: Alexandre Gaudreault <[email protected]> Signed-off-by: Sonam <[email protected]>
sonamkshenoy · Mar 12, 2024 · 1548125 · 1548125
1 parent b5908f1
commit 1548125
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/applicationset/generators/merge.go b/applicationset/generators/merge.go
@@ -82,13 +82,8 @@ func (m *MergeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.Appl
 		return nil, fmt.Errorf("error getting param sets from generators: %w", err)
 	}
 
-	baseParamSetsByMergeKey := make(map[string][]map[string]interface{})
-	if strings.HasSuffix(string(joinType), UniqJoinSuffix) {
-		baseParamSetsByMergeKey, err = getParamSetsByMergeKey(appSetGenerator.Merge.MergeKeys, paramSetsFromGenerators[0], false)
-	} else {
-		baseParamSetsByMergeKey, err = getParamSetsByMergeKey(appSetGenerator.Merge.MergeKeys, paramSetsFromGenerators[0], true)
-	}
-
+	isUniqueJoin := strings.HasSuffix(string(joinType), UniqJoinSuffix)
+	baseParamSetsByMergeKey, err := getParamSetsByMergeKey(appSetGenerator.Merge.MergeKeys, paramSetsFromGenerators[0], !isUniqueJoin)
 	if err != nil {
 		return nil, fmt.Errorf("error getting param sets by merge key: %w", err)
 	}