Merge pull request #3988 from kubernetes/revert-3837-toYaml-pr

Revert "toYaml - Fix #3470 and #3410's trailing \n issues"
pull/3991/merge
Matthew Fisher 7 years ago committed by GitHub
commit b353681283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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{}.

@ -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"`
}{

@ -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.

@ -370,7 +370,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)
}

Loading…
Cancel
Save