Fix skaffold filter to handle multiple yaml documents

cmd/skaffold/app/cmd/filter.go

@@ -18,8 +18,8 @@ package cmd
 
 import (
 	"context"
+	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -60,28 +60,27 @@ func NewCmdFilter() *cobra.Command {
 // Unlike `skaffold debug`, this filtering affects all images and not just the built artifacts.
 func runFilter(ctx context.Context, out io.Writer, debuggingFilters bool, buildArtifacts []build.Artifact) error {
 	return withRunner(ctx, func(r runner.Runner, cfg *latest.SkaffoldConfig) error {
-		bytes, err := ioutil.ReadAll(os.Stdin)
+		manifestList, err := manifest.Load(os.Stdin)
 		if err != nil {
-			return err
+			return fmt.Errorf("loading manifests: %w", err)
 		}
-		manifestList := manifest.ManifestList([][]byte{bytes})
 		if debuggingFilters {
 			// TODO(bdealwis): refactor this code
 			debugHelpersRegistry, err := config.GetDebugHelpersRegistry(opts.GlobalConfig)
 			if err != nil {
-				return err
+				return fmt.Errorf("resolving debug helpers: %w", err)
 			}
 			insecureRegistries, err := getInsecureRegistries(opts, cfg)
 			if err != nil {
-				return err
+				return fmt.Errorf("retrieving insecure registries: %w", err)
 			}
 
 			manifestList, err = debugging.ApplyDebuggingTransforms(manifestList, buildArtifacts, manifest.Registries{
 				DebugHelpersRegistry: debugHelpersRegistry,
 				InsecureRegistries:   insecureRegistries,
 			})
 			if err != nil {
-				return err
+				return fmt.Errorf("transforming manifests: %w", err)
 			}
 		}
 		out.Write([]byte(manifestList.String()))

pkg/skaffold/debug/debug_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package debug
 
 import (
+	"bytes"
 	"strings"
 	"testing"
 
@@ -502,14 +503,98 @@ spec:
   name: myfunction
   image: myfunction`,
 		},
+		{
+			"multiple objects", false,
+			`apiVersion: v1
+kind: Pod
+metadata:
+  name: pod
+spec:
+  containers:
+  - image: gcr.io/k8s-debug/debug-example:latest
+    name: example
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-app
+spec:
+  replicas: 10
+  selector:
+    matchLabels:
+      app: debug-app
+  template:
+    metadata:
+      labels:
+        app: debug-app
+      name: debug-pod
+    spec:
+      containers:
+      - image: gcr.io/k8s-debug/debug-example:latest
+        name: example
+`,
+			`apiVersion: v1
+kind: Pod
+metadata:
+  annotations:
+    debug.cloud.google.com/config: '{"example":{"runtime":"test"}}'
+  creationTimestamp: null
+  name: pod
+spec:
+  containers:
+  - env:
+    - name: KEY
+      value: value
+    image: gcr.io/k8s-debug/debug-example:latest
+    name: example
+    ports:
+    - containerPort: 9999
+      name: test
+    resources: {}
+status: {}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  name: my-app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: debug-app
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        debug.cloud.google.com/config: '{"example":{"runtime":"test"}}'
+      creationTimestamp: null
+      labels:
+        app: debug-app
+      name: debug-pod
+    spec:
+      containers:
+      - env:
+        - name: KEY
+          value: value
+        image: gcr.io/k8s-debug/debug-example:latest
+        name: example
+        ports:
+        - containerPort: 9999
+          name: test
+        resources: {}
+status: {}`,
+		},
 	}
 	for _, test := range tests {
 		testutil.Run(t, test.description, func(t *testutil.T) {
 			retriever := func(image string) (imageConfiguration, error) {
 				return imageConfiguration{}, nil
 			}
 
-			result, err := applyDebuggingTransforms(manifest.ManifestList{[]byte(test.in)}, retriever, "HELPERS")
+			l, err := manifest.Load(bytes.NewReader([]byte(test.in)))
+			t.CheckError(false, err)
+			result, err := applyDebuggingTransforms(l, retriever, "HELPERS")
 
 			t.CheckErrorAndDeepEqual(test.shouldErr, err, test.out, result.String())
 		})

pkg/skaffold/kubernetes/manifest/manifests.go

@@ -17,16 +17,36 @@ limitations under the License.
 package manifest
 
 import (
+	"bufio"
 	"bytes"
 	"io"
 	"regexp"
 	"strings"
+
+	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
 )
 
 // ManifestList is a list of yaml manifests.
 //nolint:golint
 type ManifestList [][]byte
 
+// Load uses the Kubernetes `apimachinery` to split YAML content into a set of YAML documents.
+func Load(in io.Reader) (ManifestList, error) {
+	r := k8syaml.NewYAMLReader(bufio.NewReader(in))
+	var docs [][]byte
+	for {
+		doc, err := r.Read()
+		switch {
+		case err == io.EOF:
+			return ManifestList(docs), nil
+		case err != nil:
+			return nil, err
+		default:
+			docs = append(docs, doc)
+		}
+	}
+}
+
 func (l *ManifestList) String() string {
 	var str string
 	for i, manifest := range *l {

pkg/skaffold/kubernetes/manifest/manifests_test.go

@@ -17,11 +17,35 @@ limitations under the License.
 package manifest
 
 import (
+	"bytes"
 	"testing"
 
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
+func TestLoad(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected []string
+	}{
+		{name: "empty", input: "", expected: []string{}},
+		{name: "single doc", input: "a: b", expected: []string{"a: b\n"}}, // note lf introduced
+		{name: "multiple docs", input: "a: b\n---\nc: d", expected: []string{"a: b\n", "c: d\n"}},
+	}
+	for _, test := range tests {
+		testutil.Run(t, test.name, func(t *testutil.T) {
+			result, err := Load(bytes.NewReader([]byte(test.input)))
+
+			t.CheckError(false, err)
+			t.CheckDeepEqual(len(test.expected), len(result))
+			for i := range test.expected {
+				t.CheckDeepEqual(test.expected[i], string(result[i]))
+			}
+		})
+	}
+}
+
 const pod1 = `apiVersion: v1
 kind: Pod
 metadata: