fix HelmChart.Values hydration

main.go

 package main
 
 import (
+	"orus.io/cloudcrane/beaver/cmd"
 	"os"
@@ -4,5 +5,3 @@
 	"os"
-	"orus.io/cloudcrane/beaver/cmd"
-
 )
 
@@ -7,6 +6,6 @@
 )
 
-func main () {
+func main() {
 	if code := cmd.Run(); code != 0 {
 		os.Exit(code)
 	}

runner/cmd.go

@@ -136,11 +136,7 @@
 	for name, chart := range c.Spec.Charts.Helm {
 		var newVals []string
 		for _, value := range chart.Values {
-			rawChartValue, err := yaml.Marshal(value)
-			if err != nil {
-				return fmt.Errorf("failed to get chart values as string: %w", err)
-			}
-			valueTmpl, err := template.New("chart").Parse(string(rawChartValue))
+			valueTmpl, err := template.New("chart").Parse(value)
 			if err != nil {
 				return fmt.Errorf("failed to parse chart values as template: %q, %w", chart.Values, err)
 			}

runner/cmd_test.go

@@ -29,7 +29,12 @@
 
 	// TODO: make sure this is the expected values including the leading | ...
 	assert.Equal(t, []string{
-		"|\n  config:\n    datasource:\n      password: <path:cnpp.k8s.cloudcrane.io/data/ns1/postgres#password>\n    role: 'admin'\n  fullnameoverride: pg-exporter-ns1\n"},
+		`config:
+  datasource:
+    password: <path:cnpp.k8s.cloudcrane.io/data/ns1/postgres#password>
+  role: 'admin'
+fullnameoverride: pg-exporter-ns1
+`},
 		c.Spec.Charts.Helm["postgres"].Values,
 	)
 }

runner/config.go

@@ -17,9 +17,9 @@
 }
 
 type HelmChart struct {
-	Type   string      `mapstructure:"type"`
-	Name   string      `mapstructure:"name"`
-	Values interface{} `mapstructure:"values"`
+	Type   string                 `mapstructure:"type"`
+	Name   string                 `mapstructure:"name"`
+	Values map[string]interface{} `mapstructure:"values"`
 }
 
 type YttChart struct {