Fix bug in values merging when ci directory exists (#466)

komish · web-flow · commit d5416eda1d14 · 2024-08-14T14:50:57.000-05:00
Signed-off-by: Jose R. Gonzalez &lt;komish@flutes.dev&gt;
diff --git a/internal/chartverifier/checks/charttesting.go b/internal/chartverifier/checks/charttesting.go
@@ -371,12 +371,13 @@ func newTempValuesFileWithOverrides(filename string, valuesOverrides map[string]
 
 	if filename != "" {
 		// in the case a filename is provided, read its contents and merge any available values override.
-		obj, err := readObjectFromYamlFile(filename)
+		var err error
+		obj, err = readObjectFromYamlFile(filename)
 		if err != nil {
 			return "", nil, fmt.Errorf("reading values file: %w", err)
 		}
 
-		err = mergo.MergeWithOverwrite(&obj, valuesOverrides)
+		err = mergo.Merge(&obj, valuesOverrides, mergo.WithOverride)
 		if err != nil {
 			return "", nil, fmt.Errorf("merging extra values: %w", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -371,12 +371,13 @@ func newTempValuesFileWithOverrides(filename string, valuesOverrides map[string]`
`371`	`371`
`372`	`372`	`if filename != "" {`
`373`	`373`	`// in the case a filename is provided, read its contents and merge any available values override.`
`374`		`- obj, err := readObjectFromYamlFile(filename)`
	`374`	`+ var err error`
	`375`	`+ obj, err = readObjectFromYamlFile(filename)`
`375`	`376`	`if err != nil {`
`376`	`377`	`return "", nil, fmt.Errorf("reading values file: %w", err)`
`377`	`378`	`}`
`378`	`379`
`379`		`- err = mergo.MergeWithOverwrite(&obj, valuesOverrides)`
	`380`	`+ err = mergo.Merge(&obj, valuesOverrides, mergo.WithOverride)`
`380`	`381`	`if err != nil {`
`381`	`382`	`return "", nil, fmt.Errorf("merging extra values: %w", err)`
`382`	`383`	`}`