Refactor Overwriting Combinations in Matrix

This commit refactors the overwriting combinations function within fanning out the Matrix to reduce the number of calls as requested by Priti in PR: #6341.

Author: EmmaMunley

pkg/apis/pipeline/v1/matrix_types.go

@@ -72,23 +72,26 @@ func (m *Matrix) FanOut() []Params {
 	for _, parameter := range m.Params {
 		combinations = combinations.fanOutMatrixParams(parameter)
 	}
-	combinations = combinations.overwriteCombinations(includeCombinations)
+	combinations.overwriteCombinations(includeCombinations)
 	combinations = combinations.addNewCombinations(includeCombinations)
 	return combinations.toParams()
 }
 
 // overwriteCombinations replaces any missing include params in the initial
 // matrix params combinations by overwriting the initial combinations with the
 // include combinations
-func (cs Combinations) overwriteCombinations(ics Combinations) Combinations {
+func (cs Combinations) overwriteCombinations(ics Combinations) {
 	for _, paramCombination := range cs {
 		for _, includeCombination := range ics {
 			if paramCombination.contains(includeCombination) {
-				includeCombination.overwrite(paramCombination)
+				// overwrite the parameter name and value in existing combination
+				// with the include combination
+				for name, val := range includeCombination {
+					paramCombination[name] = val
+				}
 			}
 		}
 	}
-	return cs
 }
 
 // addNewCombinations creates a new combination for any include parameter
@@ -115,14 +118,6 @@ func (c Combination) contains(includeCombination Combination) bool {
 	return true
 }
 
-// overwrite the parameter name and value exists in combination with the include combination
-func (c Combination) overwrite(oldCombination Combination) Combination {
-	for name, val := range c {
-		oldCombination[name] = val
-	}
-	return oldCombination
-}
-
 // shouldAddNewCombination returns true if the include parameter name exists but the value is
 // missing from combinations
 func (cs Combinations) shouldAddNewCombination(includeCombination map[string]string) bool {

pkg/apis/pipeline/v1beta1/matrix_types.go

@@ -72,23 +72,26 @@ func (m *Matrix) FanOut() []Params {
 	for _, parameter := range m.Params {
 		combinations = combinations.fanOutMatrixParams(parameter)
 	}
-	combinations = combinations.overwriteCombinations(includeCombinations)
+	combinations.overwriteCombinations(includeCombinations)
 	combinations = combinations.addNewCombinations(includeCombinations)
 	return combinations.toParams()
 }
 
 // overwriteCombinations replaces any missing include params in the initial
 // matrix params combinations by overwriting the initial combinations with the
 // include combinations
-func (cs Combinations) overwriteCombinations(ics Combinations) Combinations {
+func (cs Combinations) overwriteCombinations(ics Combinations) {
 	for _, paramCombination := range cs {
 		for _, includeCombination := range ics {
 			if paramCombination.contains(includeCombination) {
-				includeCombination.overwrite(paramCombination)
+				// overwrite the parameter name and value in existing combination
+				// with the include combination
+				for name, val := range includeCombination {
+					paramCombination[name] = val
+				}
 			}
 		}
 	}
-	return cs
 }
 
 // addNewCombinations creates a new combination for any include parameter
@@ -115,14 +118,6 @@ func (c Combination) contains(includeCombination Combination) bool {
 	return true
 }
 
-// overwrite the parameter name and value exists in combination with the include combination
-func (c Combination) overwrite(oldCombination Combination) Combination {
-	for name, val := range c {
-		oldCombination[name] = val
-	}
-	return oldCombination
-}
-
 // shouldAddNewCombination returns true if the include parameter name exists but the value is
 // missing from combinations
 func (cs Combinations) shouldAddNewCombination(includeCombination map[string]string) bool {