From 1fe16101624005b29856be025297363de2311a83 Mon Sep 17 00:00:00 2001 From: Rob Scott Date: Wed, 29 Sep 2021 08:44:05 -0700 Subject: [PATCH] Updating WriteYAML to not add delimiter to start files --- pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml | 2 -- pkg/crd/testdata/gen/bar.example.com_foos.yaml | 2 -- pkg/genall/genall.go | 7 +++++-- pkg/webhook/parser_integration_test.go | 2 +- .../invalid-admissionReviewVersionsRequired/manifests.yaml | 2 -- pkg/webhook/testdata/invalid-sideEffects/manifests.yaml | 2 -- .../testdata/invalid-v1beta1NotSupported/manifests.yaml | 2 -- pkg/webhook/testdata/manifests.yaml | 2 -- pkg/webhook/testdata/valid/manifests.yaml | 2 -- 9 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml b/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml index 11b2c7c2d..249c400fd 100644 --- a/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml +++ b/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/pkg/crd/testdata/gen/bar.example.com_foos.yaml b/pkg/crd/testdata/gen/bar.example.com_foos.yaml index 7fe830f29..dd70f4785 100644 --- a/pkg/crd/testdata/gen/bar.example.com_foos.yaml +++ b/pkg/crd/testdata/gen/bar.example.com_foos.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/pkg/genall/genall.go b/pkg/genall/genall.go index 2cf4ec7e7..221e089f5 100644 --- a/pkg/genall/genall.go +++ b/pkg/genall/genall.go @@ -130,12 +130,15 @@ func (g GenerationContext) WriteYAML(itemPath string, objs ...interface{}) error } defer out.Close() - for _, obj := range objs { + for i, obj := range objs { yamlContent, err := yaml.Marshal(obj) if err != nil { return err } - n, err := out.Write(append([]byte("\n---\n"), yamlContent...)) + if i > 0 { + yamlContent = append([]byte("\n---\n"), yamlContent...) + } + n, err := out.Write(yamlContent) if err != nil { return err } diff --git a/pkg/webhook/parser_integration_test.go b/pkg/webhook/parser_integration_test.go index e91302707..f2f6c438c 100644 --- a/pkg/webhook/parser_integration_test.go +++ b/pkg/webhook/parser_integration_test.go @@ -178,7 +178,7 @@ var _ = Describe("Webhook Generation From Parsing to CustomResourceDefinition", }) func unmarshalBothV1(in []byte) (mutating admissionregv1.MutatingWebhookConfiguration, validating admissionregv1.ValidatingWebhookConfiguration) { - documents := bytes.Split(in, []byte("\n---\n"))[1:] + documents := bytes.Split(in, []byte("\n---\n")) ExpectWithOffset(1, documents).To(HaveLen(2), "expected two documents in file, found %d", len(documents)) ExpectWithOffset(1, yaml.UnmarshalStrict(documents[0], &mutating)).To(Succeed(), "expected the first document in the file to be a mutating webhook configuration") diff --git a/pkg/webhook/testdata/invalid-admissionReviewVersionsRequired/manifests.yaml b/pkg/webhook/testdata/invalid-admissionReviewVersionsRequired/manifests.yaml index 8a579ae92..0961b0942 100644 --- a/pkg/webhook/testdata/invalid-admissionReviewVersionsRequired/manifests.yaml +++ b/pkg/webhook/testdata/invalid-admissionReviewVersionsRequired/manifests.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/pkg/webhook/testdata/invalid-sideEffects/manifests.yaml b/pkg/webhook/testdata/invalid-sideEffects/manifests.yaml index 8a579ae92..0961b0942 100644 --- a/pkg/webhook/testdata/invalid-sideEffects/manifests.yaml +++ b/pkg/webhook/testdata/invalid-sideEffects/manifests.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/pkg/webhook/testdata/invalid-v1beta1NotSupported/manifests.yaml b/pkg/webhook/testdata/invalid-v1beta1NotSupported/manifests.yaml index 8a579ae92..0961b0942 100644 --- a/pkg/webhook/testdata/invalid-v1beta1NotSupported/manifests.yaml +++ b/pkg/webhook/testdata/invalid-v1beta1NotSupported/manifests.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/pkg/webhook/testdata/manifests.yaml b/pkg/webhook/testdata/manifests.yaml index 8a579ae92..0961b0942 100644 --- a/pkg/webhook/testdata/manifests.yaml +++ b/pkg/webhook/testdata/manifests.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/pkg/webhook/testdata/valid/manifests.yaml b/pkg/webhook/testdata/valid/manifests.yaml index 8a579ae92..0961b0942 100644 --- a/pkg/webhook/testdata/valid/manifests.yaml +++ b/pkg/webhook/testdata/valid/manifests.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: