feat(appset): Support more than two child generators for matrix generator

applicationset/controllers/requeue_after_test.go

@@ -72,7 +72,7 @@ func TestRequeueAfter(t *testing.T) {
 		"SCMProvider":             terminalGenerators["SCMProvider"],
 		"ClusterDecisionResource": terminalGenerators["ClusterDecisionResource"],
 		"PullRequest":             terminalGenerators["PullRequest"],
-		"Matrix":                  generators.NewMatrixGenerator(terminalGenerators),
+		"Matrix":                  generators.NewMatrixGenerator(terminalGenerators, 0),
 		"Merge":                   generators.NewMergeGenerator(terminalGenerators),
 	}
 
@@ -83,7 +83,7 @@ func TestRequeueAfter(t *testing.T) {
 		"SCMProvider":             terminalGenerators["SCMProvider"],
 		"ClusterDecisionResource": terminalGenerators["ClusterDecisionResource"],
 		"PullRequest":             terminalGenerators["PullRequest"],
-		"Matrix":                  generators.NewMatrixGenerator(nestedGenerators),
+		"Matrix":                  generators.NewMatrixGenerator(nestedGenerators, 0),
 		"Merge":                   generators.NewMergeGenerator(nestedGenerators),
 	}
 

applicationset/generators/generator_spec_processor_test.go

@@ -354,7 +354,7 @@ func TestGetRelevantGenerators(t *testing.T) {
 		"Git":      getMockGitGenerator(),
 	}
 
-	testGenerators["Matrix"] = NewMatrixGenerator(testGenerators)
+	testGenerators["Matrix"] = NewMatrixGenerator(testGenerators, 0)
 	testGenerators["Merge"] = NewMergeGenerator(testGenerators)
 	testGenerators["List"] = NewListGenerator()
 

applicationset/generators/matrix.go

@@ -15,19 +15,21 @@ import (
 var _ Generator = (*MatrixGenerator)(nil)
 
 var (
-	ErrMoreThanTwoGenerators      = fmt.Errorf("found more than two generators, Matrix support only two")
 	ErrLessThanTwoGenerators      = fmt.Errorf("found less than two generators, Matrix support only two")
 	ErrMoreThenOneInnerGenerators = fmt.Errorf("found more than one generator in matrix.Generators")
+	ErrMoreThanMaxGenerators      = fmt.Errorf("found more than the max allowed of child generators")
 )
 
 type MatrixGenerator struct {
 	// The inner generators supported by the matrix generator (cluster, git, list...)
 	supportedGenerators map[string]Generator
+	maxChildren         int
 }
 
-func NewMatrixGenerator(supportedGenerators map[string]Generator) Generator {
+func NewMatrixGenerator(supportedGenerators map[string]Generator, maxChildren int) Generator {
 	m := &MatrixGenerator{
 		supportedGenerators: supportedGenerators,
+		maxChildren:         maxChildren,
 	}
 	return m
 }
@@ -38,44 +40,49 @@ func (m *MatrixGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.App
 		return nil, EmptyAppSetGeneratorError
 	}
 
-	if len(appSetGenerator.Matrix.Generators) < 2 {
+	numGens := len(appSetGenerator.Matrix.Generators)
+	if numGens < 2 {
 		return nil, ErrLessThanTwoGenerators
 	}
 
-	if len(appSetGenerator.Matrix.Generators) > 2 {
-		return nil, ErrMoreThanTwoGenerators
+	if m.maxChildren > 1 && numGens > m.maxChildren {
+		return nil, ErrMoreThanMaxGenerators
 	}
 
-	res := []map[string]interface{}{}
-
-	g0, err := m.getParams(appSetGenerator.Matrix.Generators[0], appSet, nil)
+	res, err := m.getParams(appSetGenerator.Matrix.Generators[0], appSet, nil)
 	if err != nil {
 		return nil, fmt.Errorf("error failed to get params for first generator in matrix generator: %w", err)
 	}
-	for _, a := range g0 {
-		g1, err := m.getParams(appSetGenerator.Matrix.Generators[1], appSet, a)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get params for second generator in the matrix generator: %w", err)
-		}
-		for _, b := range g1 {
 
-			if appSet.Spec.GoTemplate {
-				tmp := map[string]interface{}{}
-				if err := mergo.Merge(&tmp, b, mergo.WithOverride); err != nil {
-					return nil, fmt.Errorf("failed to merge params from the second generator in the matrix generator with temp map: %w", err)
-				}
-				if err := mergo.Merge(&tmp, a, mergo.WithOverride); err != nil {
-					return nil, fmt.Errorf("failed to merge params from the second generator in the matrix generator with the first: %w", err)
-				}
-				res = append(res, tmp)
-			} else {
-				val, err := utils.CombineStringMaps(a, b)
-				if err != nil {
-					return nil, fmt.Errorf("failed to combine string maps with merging params for the matrix generator: %w", err)
+	for i := 1; i < numGens; i++ {
+		list := []map[string]interface{}{}
+		gen := appSetGenerator.Matrix.Generators[i]
+		for _, prevParam := range res {
+			params, err := m.getParams(gen, appSet, prevParam)
+			if err != nil {
+				return nil, fmt.Errorf("failed to get params for generator %d in the matrix generator: %w", i, err)
+			}
+			for _, currParam := range params {
+				if appSet.Spec.GoTemplate {
+					tmp := map[string]interface{}{}
+					if err := mergo.Merge(&tmp, currParam, mergo.WithOverride); err != nil {
+						return nil, fmt.Errorf("failed to merge params map from generator %d with temp map in the matrix generator: %w", i, err)
+					}
+					if err := mergo.Merge(&tmp, prevParam, mergo.WithOverride); err != nil {
+						return nil, fmt.Errorf("failed to merge params from generator %d with a previous params map in the matrix generator: %w", i, err)
+					}
+					list = append(list, tmp)
+				} else {
+					val, err := utils.CombineStringMaps(prevParam, currParam)
+					if err != nil {
+						return nil, fmt.Errorf("failed to combine string maps with merging params for the matrix generator: %w", err)
+					}
+					list = append(list, utils.ConvertToMapStringInterface(val))
 				}
-				res = append(res, utils.ConvertToMapStringInterface(val))
 			}
 		}
+
+		res = list
 	}
 
 	return res, nil