fix: ensure nixChart supports both values as a list of maps and map

Author: marcusramberg

pkgs/nixchart/nixchart.go

@@ -63,6 +63,24 @@ func CleanupCharts(cleanup []string) {
 	}
 }
 
+func prepareChartValues(chart map[string]any) map[string]any {
+	var v map[string]any
+	vl, ok := chart["values"].([]map[string]any)
+	if ok {
+		mergedValues := map[string]any{}
+		for _, m := range vl {
+			mergedValues = utils.MergeMaps(mergedValues, m)
+		}
+		v = mergedValues
+	} else {
+		v, ok = chart["values"].(map[string]any)
+		if !ok || v == nil {
+			v = map[string]any{}
+		}
+	}
+	return v
+}
+
 var evalChart = func(chart map[string]any, hfbase string) (string, error) {
 	nixChart, ok := chart["nixChart"].(string)
 	if !ok {
@@ -95,10 +113,8 @@ var evalChart = func(chart map[string]any, hfbase string) (string, error) {
 			log.Println("Failed to remove temporary file for values:", val.Name())
 		}
 	}()
-	v := chart["values"].(map[string]any)
-	if v == nil {
-		v = map[string]any{}
-	}
+
+	v := prepareChartValues(chart)
 	if v["namespace"] != nil {
 		log.Println("Warning: Do not set 'namespace' in values, use 'namespace' in the chart instead.")
 	}
@@ -119,7 +135,7 @@ var evalChart = func(chart map[string]any, hfbase string) (string, error) {
 
 	err = val.Close()
 	if err != nil {
-		log.Fatalln("Failed to create temporary file for values:", err)
+		log.Fatalln("Failed to close temporary file for values:", err)
 	}
 	expr := fmt.Sprintf(`(import %s).render "%s" "%s" "%s"`, f.Name(), fileName, base, val.Name())
 	ne := nixeval.NewNixEval(expr)
@@ -136,7 +152,7 @@ var evalChart = func(chart map[string]any, hfbase string) (string, error) {
 	if err != nil {
 		log.Fatalln("Failed to create temporary directory for chart:", chart, " : ", err)
 	}
-	if err = os.WriteFile(chartDir+"/resources.yaml", yaml, 0644); err != nil {
+	if err = os.WriteFile(chartDir+"/resources.yaml", yaml, 0o644); err != nil {
 		log.Fatalln("Failed to write resources.yaml for chart:", chart, " : ", err)
 	}
 

pkgs/nixchart/nixchart_test.go

@@ -11,7 +11,7 @@ func TestRenderCharts_Success(t *testing.T) {
 	evalChart = func(chart map[string]any, base string) (string, error) {
 		tmpDir := t.TempDir()
 		resourcesPath := filepath.Join(tmpDir, "resources.yaml")
-		if err := os.WriteFile(resourcesPath, []byte("mocked: true\n"), 0644); err != nil {
+		if err := os.WriteFile(resourcesPath, []byte("mocked: true\n"), 0o644); err != nil {
 			return "", err
 		}
 
@@ -50,3 +50,36 @@ func TestRenderCharts_Success(t *testing.T) {
 
 	CleanupCharts(cleanup)
 }
+
+func TestPrepareChartValues(t *testing.T) {
+	// Test with a map[string]any
+	chartMap := map[string]any{
+		"values": map[string]any{
+			"a": 1,
+			"b": "two",
+		},
+	}
+	vals := prepareChartValues(chartMap)
+	if vals["a"] != 1 || vals["b"] != "two" {
+		t.Errorf("Expected map values, got: %#v", vals)
+	}
+
+	// Test with a []map[string]any (should merge)
+	chartList := map[string]any{
+		"values": []map[string]any{
+			{"a": 1, "b": "two"},
+			{"b": "overwritten", "c": 3},
+		},
+	}
+	vals = prepareChartValues(chartList)
+	if vals["a"] != 1 || vals["b"] != "overwritten" || vals["c"] != 3 {
+		t.Errorf("Expected merged values, got: %#v", vals)
+	}
+
+	// Test with missing or nil values
+	chartNil := map[string]any{}
+	vals = prepareChartValues(chartNil)
+	if len(vals) != 0 {
+		t.Errorf("Expected empty map, got: %#v", vals)
+	}
+}

testData/helm-nixchart/helmfile.nix

@@ -22,6 +22,21 @@
           version = var.values.nginx_version;
         };
       }
+      {
+        name = "test-multival-nix";
+        nixChart = "../nixChart/";
+        createNamespace = true;
+        namespace = "test-multi";
+        values = [
+          {
+            replicas = 3;
+            version = var.values.nginx_version;
+          }
+          {
+            replicas = 4;
+          }
+        ];
+      }
     ];
   }
 ]