consider new line at EOF on parsing kubernetes manifest

pipe-cd · Dec 8, 2022 · 092ba53 · 092ba53
1 parent 9e6f2f4
commit 092ba53
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pkg/app/piped/executor/kubernetes/testdata/patch_configmap_field.yaml b/pkg/app/piped/executor/kubernetes/testdata/patch_configmap_field.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: envoy-config
 data:
-  envoy-config: |-
+  envoy-config: |
     admin:
       address:
         socket_address:
@@ -42,7 +42,7 @@ kind: ConfigMap
 metadata:
   name: envoy-config
 data:
-  envoy-config: |-
+  envoy-config: |
     admin:
       address:
         socket_address:

diff --git a/pkg/app/piped/executor/kubernetes/testdata/patch_configmap_field_multi_ops.yaml b/pkg/app/piped/executor/kubernetes/testdata/patch_configmap_field_multi_ops.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: envoy-config
 data:
-  envoy-config: |-
+  envoy-config: |
     admin:
       address:
         socket_address:
@@ -151,7 +151,7 @@ kind: ConfigMap
 metadata:
   name: envoy-config
 data:
-  envoy-config: |-
+  envoy-config: |
     admin:
       address:
         socket_address:

diff --git a/pkg/app/piped/platformprovider/kubernetes/manifest.go b/pkg/app/piped/platformprovider/kubernetes/manifest.go
@@ -224,12 +224,17 @@ func ParseManifests(data string) ([]Manifest, error) {
 		manifests = make([]Manifest, 0, len(parts))
 	)
 
-	for _, part := range parts {
+	newLineAtEOF := strings.HasSuffix(data, "\n")
+	for i, part := range parts {
 		// Ignore all the cases where no content between separator.
 		part = strings.TrimSpace(part)
 		if len(part) == 0 {
 			continue
 		}
+		// Append new line which trim by document separator.
+		if i != len(parts)-1 || newLineAtEOF {
+			part += "\n"
+		}
 		var obj unstructured.Unstructured
 		if err := yaml.Unmarshal([]byte(part), &obj); err != nil {
 			return nil, err