Fix test validator spacing

Remove extra newlines between objects in test/validator manifest output.
kubernetes-sigs · Nov 21, 2023 · 7c36d62 · 7c36d62
1 parent f6a5c89
commit 7c36d62
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/examples/guestbook-operator/controllers/tests/patches-stable.out.yaml b/examples/guestbook-operator/controllers/tests/patches-stable.out.yaml
@@ -29,9 +29,7 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
-
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -62,9 +60,7 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
-
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -98,9 +94,7 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -117,9 +111,7 @@ spec:
     app: guestbook
     tier: frontend
   type: NodePort
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -138,9 +130,7 @@ spec:
     app: redis
     role: master
     tier: backend
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/examples/guestbook-operator/controllers/tests/simple-stable.out.yaml b/examples/guestbook-operator/controllers/tests/simple-stable.out.yaml
@@ -29,9 +29,7 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
-
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -62,9 +60,7 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
-
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -98,9 +94,7 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -117,9 +111,7 @@ spec:
     app: guestbook
     tier: frontend
   type: NodePort
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -138,9 +130,7 @@ spec:
     app: redis
     role: master
     tier: backend
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/pkg/test/golden/validator.go b/pkg/test/golden/validator.go
@@ -321,7 +321,7 @@ func (v *validator) Validate(r declarative.Reconciler) {
 
 			for i, o := range objects.Items {
 				if i != 0 {
-					b.WriteString("\n---\n\n")
+					b.WriteString("---\n")
 				}
 				u := o.UnstructuredObject()
 				if err := yamlizer.Encode(u, &b); err != nil {