don't crash when encountering non-k8s yaml (#12)

just ignore
ryane · Jul 11, 2020 · adad8eb · adad8eb
1 parent 6d3db7b
commit adad8eb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/pkg/decoder/decoder.go b/pkg/decoder/decoder.go
@@ -2,6 +2,7 @@ package decoder
 
 import (
 	"io"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/ryane/kfilt/pkg/resource"
@@ -26,7 +27,7 @@ func (k *kubernetesDecoder) Decode(in io.Reader) ([]resource.Resource, error) {
 
 	decoder := k8syaml.NewYAMLOrJSONDecoder(in, 1024)
 
-	for err == nil {
+	for err == nil || isNotKubernetesYAML(err) {
 		var out resource.Resource
 		err = decoder.Decode(&out)
 		if err == nil && len(out.Object) > 0 {
@@ -48,3 +49,8 @@ func (k *kubernetesDecoder) Decode(in io.Reader) ([]resource.Resource, error) {
 
 	return result, nil
 }
+
+func isNotKubernetesYAML(err error) bool {
+	// no Kind
+	return strings.Contains(err.Error(), "Object 'Kind' is missing")
+}
diff --git a/pkg/decoder/list.yaml b/pkg/decoder/list.yaml
@@ -1,3 +1,9 @@
+---
+# test with empty and non-k8s yaml
+# warning below can come from helm charts
+---
+WARNING: This chart is deprecated
+---
 apiVersion: v1
 kind: List
 items:

diff --git a/pkg/decoder/test.yaml b/pkg/decoder/test.yaml
@@ -1,3 +1,10 @@
+---
+---
+# test with empty and non-k8s yaml
+# warning below can come from helm charts
+---
+WARNING: This chart is deprecated
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata: