From a00bcc297914fe2f9e7eadab45ea34d1d99f8e87 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Fri, 27 Apr 2018 12:30:46 -0700
Subject: [PATCH] Revert "toYaml - Fix #3470 and #3410's trailing \n issues"

(cherry picked from commit f7f686f7d065218ef6df3fbb75ce6348e699a0f3)
---
 pkg/chartutil/files.go      | 2 +-
 pkg/chartutil/files_test.go | 8 ++++----
 pkg/strvals/parser.go       | 2 +-
 pkg/strvals/parser_test.go  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/chartutil/files.go b/pkg/chartutil/files.go
index ced8ce15a..a711a3366 100644
--- a/pkg/chartutil/files.go
+++ b/pkg/chartutil/files.go
@@ -175,7 +175,7 @@ func ToYaml(v interface{}) string {
 		// Swallow errors inside of a template.
 		return ""
 	}
-	return strings.TrimSuffix(string(data), "\n")
+	return string(data)
 }
 
 // FromYaml converts a YAML document into a map[string]interface{}.
diff --git a/pkg/chartutil/files_test.go b/pkg/chartutil/files_test.go
index 5cec35883..731c82e6f 100644
--- a/pkg/chartutil/files_test.go
+++ b/pkg/chartutil/files_test.go
@@ -72,10 +72,10 @@ func TestToConfig(t *testing.T) {
 
 	f := NewFiles(getTestFiles())
 	out := f.Glob("**/captain.txt").AsConfig()
-	as.Equal("captain.txt: The Captain", out)
+	as.Equal("captain.txt: The Captain\n", out)
 
 	out = f.Glob("ship/**").AsConfig()
-	as.Equal("captain.txt: The Captain\nstowaway.txt: Legatt", out)
+	as.Equal("captain.txt: The Captain\nstowaway.txt: Legatt\n", out)
 }
 
 func TestToSecret(t *testing.T) {
@@ -84,7 +84,7 @@ func TestToSecret(t *testing.T) {
 	f := NewFiles(getTestFiles())
 
 	out := f.Glob("ship/**").AsSecrets()
-	as.Equal("captain.txt: VGhlIENhcHRhaW4=\nstowaway.txt: TGVnYXR0", out)
+	as.Equal("captain.txt: VGhlIENhcHRhaW4=\nstowaway.txt: TGVnYXR0\n", out)
 }
 
 func TestLines(t *testing.T) {
@@ -99,7 +99,7 @@ func TestLines(t *testing.T) {
 }
 
 func TestToYaml(t *testing.T) {
-	expect := "foo: bar"
+	expect := "foo: bar\n"
 	v := struct {
 		Foo string `json:"foo"`
 	}{
diff --git a/pkg/strvals/parser.go b/pkg/strvals/parser.go
index aa3d15904..8a16adf7e 100644
--- a/pkg/strvals/parser.go
+++ b/pkg/strvals/parser.go
@@ -36,7 +36,7 @@ func ToYAML(s string) (string, error) {
 		return "", err
 	}
 	d, err := yaml.Marshal(m)
-	return strings.TrimSuffix(string(d), "\n"), err
+	return string(d), err
 }
 
 // Parse parses a set line.
diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index fd287bf8a..3f9828498 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -365,7 +365,7 @@ func TestToYAML(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expect := "name: value"
+	expect := "name: value\n"
 	if o != expect {
 		t.Errorf("Expected %q, got %q", expect, o)
 	}