Merge 170a6015ed into f729d24d81

pkg/chartutil/files.go

@@ -202,7 +202,8 @@ func ToToml(v interface{}) string {
 	e := toml.NewEncoder(b)
 	err := e.Encode(v)
 	if err != nil {
-		return err.Error()
+		// Swallow errors inside of a template
+		return ""
 	}
 	return b.String()
 }

pkg/chartutil/files_test.go

@@ -112,13 +112,12 @@ func TestToYaml(t *testing.T) {
 }
 
 func TestToToml(t *testing.T) {
-	expect := "foo = \"bar\"\n"
 	v := struct {
 		Foo string `toml:"foo"`
 	}{
 		Foo: "bar",
 	}
-
+	expect := "foo = \"bar\"\n"
 	if got := ToToml(v); got != expect {
 		t.Errorf("Expected %q, got %q", expect, got)
 	}
@@ -129,11 +128,17 @@ func TestToToml(t *testing.T) {
 			"sail": "white",
 		},
 	}
-	got := ToToml(dict)
 	expect = "[mast]\n  sail = \"white\"\n"
-	if got != expect {
+	if got := ToToml(dict); got != expect {
 		t.Errorf("Expected:\n%s\nGot\n%s\n", expect, got)
 	}
+
+	// (error) map no string key
+	invalid := map[int]string{1: ""}
+	expect = ""
+	if got := ToToml(invalid); got != expect {
+		t.Errorf("Expected empty string, got %s", got)
+	}
 }
 
 func TestFromYaml(t *testing.T) {