From e9bd11caaaed1773d0e3098a6474f1d90951ce00 Mon Sep 17 00:00:00 2001 From: Jijie Wei Date: Mon, 22 Jun 2020 22:23:28 -0700 Subject: [PATCH 1/4] add test for fmt on yaml file of a list --- kyaml/kio/filters/fmtr_test.go | 8 ++ kyaml/kio/filters/testyaml/testyaml.go | 122 +++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/kyaml/kio/filters/fmtr_test.go b/kyaml/kio/filters/fmtr_test.go index ca1f2a276..fc462dcfb 100644 --- a/kyaml/kio/filters/fmtr_test.go +++ b/kyaml/kio/filters/fmtr_test.go @@ -578,6 +578,10 @@ func TestFormatInput_resources(t *testing.T) { assert.NoError(t, err) _, err = io.Copy(input, bytes.NewReader(testyaml.UnformattedYaml2)) assert.NoError(t, err) + _, err = io.Copy(input, strings.NewReader("---\n")) + assert.NoError(t, err) + _, err = io.Copy(input, bytes.NewReader(testyaml.UnformattedYaml3)) + assert.NoError(t, err) expectedOutput := &bytes.Buffer{} _, err = io.Copy(expectedOutput, bytes.NewReader(testyaml.FormattedYaml1)) @@ -586,6 +590,10 @@ func TestFormatInput_resources(t *testing.T) { assert.NoError(t, err) _, err = io.Copy(expectedOutput, bytes.NewReader(testyaml.FormattedYaml2)) assert.NoError(t, err) + _, err = io.Copy(expectedOutput, strings.NewReader("---\n")) + assert.NoError(t, err) + _, err = io.Copy(expectedOutput, bytes.NewReader(testyaml.FormattedYaml3)) + assert.NoError(t, err) s, err := FormatInput(input) assert.NoError(t, err) diff --git a/kyaml/kio/filters/testyaml/testyaml.go b/kyaml/kio/filters/testyaml/testyaml.go index 4052e5ffb..9f9d893d8 100644 --- a/kyaml/kio/filters/testyaml/testyaml.go +++ b/kyaml/kio/filters/testyaml/testyaml.go @@ -27,6 +27,67 @@ apiVersion: example.com/v1beta1 kind: MyType2 `) +var UnformattedYaml3 = []byte(` +apiVersion: v1 +items: +- apiVersion: v1 + kind: Namespace + metadata: + creationTimestamp: "2020-06-04T07:17:23Z" + name: kit-server-dev + resourceVersion: "7881" + selfLink: /api/v1/namespaces/kit-server-dev + uid: 6f8e0a69-a633-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +- apiVersion: v1 + kind: Namespace + metadata: + creationTimestamp: "2020-06-04T06:50:06Z" + name: kube-node-lease + resourceVersion: "40" + selfLink: /api/v1/namespaces/kube-node-lease + uid: 9fa5de74-a62f-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +- apiVersion: v1 + kind: Namespace + metadata: + creationTimestamp: "2020-06-04T06:50:05Z" + name: kube-public + resourceVersion: "26" + selfLink: /api/v1/namespaces/kube-public + uid: 9f6f664f-a62f-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +- apiVersion: v1 + kind: Namespace + metadata: + creationTimestamp: "2020-06-04T06:50:05Z" + name: kube-system + resourceVersion: "143" + selfLink: /api/v1/namespaces/kube-system + uid: 9f4b398b-a62f-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +kind: List +metadata: + resourceVersion: "" + selfLink: "" +`) + var UnformattedJSON1 = []byte(` { "spec": "a", @@ -69,3 +130,64 @@ var FormattedJSON1 = []byte(`{ } } `) + +var FormattedYaml3 = []byte(`apiVersion: v1 +kind: List +metadata: + resourceVersion: "" + selfLink: "" +items: +- apiVersion: v1 + kind: Namespace + metadata: + name: kit-server-dev + creationTimestamp: "2020-06-04T07:17:23Z" + resourceVersion: "7881" + selfLink: /api/v1/namespaces/kit-server-dev + uid: 6f8e0a69-a633-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +- apiVersion: v1 + kind: Namespace + metadata: + name: kube-node-lease + creationTimestamp: "2020-06-04T06:50:06Z" + resourceVersion: "40" + selfLink: /api/v1/namespaces/kube-node-lease + uid: 9fa5de74-a62f-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +- apiVersion: v1 + kind: Namespace + metadata: + name: kube-public + creationTimestamp: "2020-06-04T06:50:05Z" + resourceVersion: "26" + selfLink: /api/v1/namespaces/kube-public + uid: 9f6f664f-a62f-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +- apiVersion: v1 + kind: Namespace + metadata: + name: kube-system + creationTimestamp: "2020-06-04T06:50:05Z" + resourceVersion: "143" + selfLink: /api/v1/namespaces/kube-system + uid: 9f4b398b-a62f-11ea-b632-42010a8000a7 + spec: + finalizers: + - kubernetes + status: + phase: Active +`) + From f17b893dd204ae1783d5738a79989d7d007ac95c Mon Sep 17 00:00:00 2001 From: Jijie Wei Date: Wed, 10 Jun 2020 09:39:41 -0700 Subject: [PATCH 2/4] fmt --- kyaml/kio/filters/testyaml/testyaml.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kyaml/kio/filters/testyaml/testyaml.go b/kyaml/kio/filters/testyaml/testyaml.go index 9f9d893d8..138d20d51 100644 --- a/kyaml/kio/filters/testyaml/testyaml.go +++ b/kyaml/kio/filters/testyaml/testyaml.go @@ -189,5 +189,4 @@ items: - kubernetes status: phase: Active -`) - +`) \ No newline at end of file From 0af9ca1266dbdd41dea38dc4d17c896bf5deb5ee Mon Sep 17 00:00:00 2001 From: Jijie Wei Date: Thu, 25 Jun 2020 09:59:17 -0700 Subject: [PATCH 3/4] simplify the test case --- kyaml/kio/filters/testyaml/testyaml.go | 48 +++----------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/kyaml/kio/filters/testyaml/testyaml.go b/kyaml/kio/filters/testyaml/testyaml.go index 138d20d51..2587ff741 100644 --- a/kyaml/kio/filters/testyaml/testyaml.go +++ b/kyaml/kio/filters/testyaml/testyaml.go @@ -33,53 +33,33 @@ items: - apiVersion: v1 kind: Namespace metadata: - creationTimestamp: "2020-06-04T07:17:23Z" - name: kit-server-dev + name: server-dev resourceVersion: "7881" - selfLink: /api/v1/namespaces/kit-server-dev - uid: 6f8e0a69-a633-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes + selfLink: /api/v1/namespaces/server-dev status: phase: Active - apiVersion: v1 kind: Namespace metadata: - creationTimestamp: "2020-06-04T06:50:06Z" name: kube-node-lease resourceVersion: "40" selfLink: /api/v1/namespaces/kube-node-lease - uid: 9fa5de74-a62f-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes status: phase: Active - apiVersion: v1 kind: Namespace metadata: - creationTimestamp: "2020-06-04T06:50:05Z" name: kube-public resourceVersion: "26" selfLink: /api/v1/namespaces/kube-public - uid: 9f6f664f-a62f-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes status: phase: Active - apiVersion: v1 kind: Namespace metadata: - creationTimestamp: "2020-06-04T06:50:05Z" name: kube-system resourceVersion: "143" selfLink: /api/v1/namespaces/kube-system - uid: 9f4b398b-a62f-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes status: phase: Active kind: List @@ -140,53 +120,33 @@ items: - apiVersion: v1 kind: Namespace metadata: - name: kit-server-dev - creationTimestamp: "2020-06-04T07:17:23Z" + name: server-dev resourceVersion: "7881" - selfLink: /api/v1/namespaces/kit-server-dev - uid: 6f8e0a69-a633-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes + selfLink: /api/v1/namespaces/server-dev status: phase: Active - apiVersion: v1 kind: Namespace metadata: name: kube-node-lease - creationTimestamp: "2020-06-04T06:50:06Z" resourceVersion: "40" selfLink: /api/v1/namespaces/kube-node-lease - uid: 9fa5de74-a62f-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes status: phase: Active - apiVersion: v1 kind: Namespace metadata: name: kube-public - creationTimestamp: "2020-06-04T06:50:05Z" resourceVersion: "26" selfLink: /api/v1/namespaces/kube-public - uid: 9f6f664f-a62f-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes status: phase: Active - apiVersion: v1 kind: Namespace metadata: name: kube-system - creationTimestamp: "2020-06-04T06:50:05Z" resourceVersion: "143" selfLink: /api/v1/namespaces/kube-system - uid: 9f4b398b-a62f-11ea-b632-42010a8000a7 - spec: - finalizers: - - kubernetes status: phase: Active `) \ No newline at end of file From 3183fcc92624f1381a8f30a36f0acd77778da606 Mon Sep 17 00:00:00 2001 From: Jijie Wei Date: Thu, 25 Jun 2020 10:01:15 -0700 Subject: [PATCH 4/4] simplify the test case --- kyaml/kio/filters/testyaml/testyaml.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyaml/kio/filters/testyaml/testyaml.go b/kyaml/kio/filters/testyaml/testyaml.go index 2587ff741..eae6692f4 100644 --- a/kyaml/kio/filters/testyaml/testyaml.go +++ b/kyaml/kio/filters/testyaml/testyaml.go @@ -149,4 +149,4 @@ items: selfLink: /api/v1/namespaces/kube-system status: phase: Active -`) \ No newline at end of file +`)