From 209b115b7c16df9a8f2f9bfa68a25f0f488868b8 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Sun, 27 Jan 2019 22:23:48 -0800 Subject: [PATCH 1/2] ignore yaml files that do not include any entries --- k8sdeps/kunstruct/factory.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go index 44222408f..09bb2bbba 100644 --- a/k8sdeps/kunstruct/factory.go +++ b/k8sdeps/kunstruct/factory.go @@ -52,6 +52,9 @@ func (kf *KunstructuredFactoryImpl) SliceFromBytes( var out unstructured.Unstructured err = decoder.Decode(&out) if err == nil { + if len(out.Object) == 0 { + continue + } err = kf.validate(out) if err != nil { return nil, err From 1997606372bcceb7274384ed4bfc6dc834a6511e Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 29 Jan 2019 13:16:00 -0800 Subject: [PATCH 2/2] add empty objects test for kunstruct SliceFromBytes --- k8sdeps/kunstruct/factory_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/k8sdeps/kunstruct/factory_test.go b/k8sdeps/kunstruct/factory_test.go index 2ef4acaa9..51e2be793 100644 --- a/k8sdeps/kunstruct/factory_test.go +++ b/k8sdeps/kunstruct/factory_test.go @@ -109,6 +109,18 @@ WOOOOOOOOOOOOOOOOOOOOOOOOT: woot expectedOut: []ifc.Kunstructured{}, expectedErr: true, }, + { + name: "emptyObjects", + input: []byte(` +--- +#a comment + +--- + +`), + expectedOut: []ifc.Kunstructured{}, + expectedErr: false, + }, { name: "Missing .metadata.name in object", input: []byte(`