add a new line to the EOF in case of there is no at EOF

pipe-cd · Dec 5, 2022 · cd484f0 · cd484f0
1 parent 4c7b830
commit cd484f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/pkg/yamlprocessor/yamlprocessor.go b/pkg/yamlprocessor/yamlprocessor.go
@@ -25,7 +25,6 @@ import (
 
 type Processor struct {
 	file *ast.File
-	newLineAtEOF bool
 }
 
 func NewProcessor(data []byte) (*Processor, error) {
@@ -34,14 +33,8 @@ func NewProcessor(data []byte) (*Processor, error) {
 		return nil, err
 	}
 
-	nl := false
-	if len(data) > 0 && data[len(data)-1] == '\n' {
-		nl = true
-	}
-
 	return &Processor{
 		file: f,
-		newLineAtEOF: nl,
 	}, nil
 }
 
@@ -112,7 +105,8 @@ func (p *Processor) ReplaceString(path, value string) error {
 
 func (p *Processor) Bytes() []byte {
 	str := p.file.String()
-	if p.newLineAtEOF {
+
+	if len(str) > 0 && str[len(str)-1] != '\n' {
 		str += "\n"
 	}
 

diff --git a/pkg/yamlprocessor/yamlprocessor_test.go b/pkg/yamlprocessor/yamlprocessor_test.go
@@ -190,15 +190,15 @@ func TestReplaceString(t *testing.T) {
 			yml:     "foo: bar",
 			path:    "$.foo",
 			value:   "",
-			want:    []byte("foo: "),
+			want:    []byte("foo: \n"),
 			wantErr: false,
 		},
 		{
 			name:    "valid value given",
 			yml:     "foo: bar",
 			path:    "$.foo",
 			value:   "new-text",
-			want:    []byte("foo: new-text"),
+			want:    []byte("foo: new-text\n"),
 			wantErr: false,
 		},
 		{
@@ -208,7 +208,8 @@ foo: bar`,
 			path:  "$.foo",
 			value: "new-text",
 			want: []byte(`# comments
-foo: new-text`),
+foo: new-text
+`),
 			wantErr: false,
 		},
 		{
@@ -217,7 +218,7 @@ foo: new-text`),
 			`,
 			path:    "$.foo",
 			value:   "new-text",
-			want:    []byte("foo: new-text # comments"),
+			want:    []byte("foo: new-text # comments\n"),
 			wantErr: false,
 		},
 		{
@@ -229,15 +230,16 @@ foo: new-text`),
 			value: "new-text",
 			want: []byte(`foo:
   - new-text
-  - baz`),
+  - baz
+`),
 			wantErr: false,
 		},
 		{
 			name:    "array in flow style",
 			yml:     `foo: [bar, baz]`,
 			path:    "$.foo[0]",
 			value:   "new-text",
-			want:    []byte(`foo: [new-text, baz]`),
+			want:    []byte("foo: [new-text, baz]\n"),
 			wantErr: false,
 		},
 		{
@@ -250,16 +252,7 @@ foo:
 			value: "new-text",
 			want: []byte(`foo:
   - new-text
-  - baz`),
-			wantErr: false,
-		},
-		{
-			name:    "new line at end of yml given",
-			yml:     `foo: bar
-`,
-			path:    "$.foo",
-			value:   "new-text",
-			want:    []byte(`foo: new-text
+  - baz
 `),
 			wantErr: false,
 		},