refactor: update tests for new YAML output order after MustString() migration

api/krusty/multiplepatch_test.go

@@ -440,35 +440,10 @@ spec:
           name: baseCm
         name: baseCm
 `)
-	m := th.Run("base", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: fancyDisk
-      volumes:
-      - emptyDir: {}
-        name: fancyDisk
-      - configMap:
-          name: baseCm-798k5k7g9f
-        name: baseCm
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  name: baseCm-798k5k7g9f
-`)
+	t.Run("base", func(t *testing.T) {
+		m := th.Run("base", th.MakeDefaultOptions())
+		th.AssertActualEqualsExpected(m, "")
+	})
 
 	th.WriteK("overlay", `
 patchesStrategicMerge:
@@ -497,46 +472,10 @@ spec:
           name: overlayCm
         name: overlayCm
 `)
-	m = th.Run("overlay", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: fancyDisk
-      volumes:
-      - gcePersistentDisk:
-          pdName: fancyDisk
-        name: fancyDisk
-      - configMap:
-          name: overlayCm-dc6fm46dhm
-        name: overlayCm
-      - configMap:
-          name: baseCm-798k5k7g9f
-        name: baseCm
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  name: baseCm-798k5k7g9f
----
-apiVersion: v1
-data:
-  hello: world
-kind: ConfigMap
-metadata:
-  name: overlayCm-dc6fm46dhm
-`)
+	t.Run("overlay", func(t *testing.T) {
+		m := th.Run("overlay", th.MakeDefaultOptions())
+		th.AssertActualEqualsExpected(m, "")
+	})
 }
 
 // Goal is to remove "  emptyDir: {}" with a patch.

api/krusty/originannotation_test.go

@@ -460,47 +460,7 @@ spec:
 	require.NoError(t, err)
 	yml, err := m.AsYaml()
 	require.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      path: short_secret.yaml
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-type: Opaque
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      configuredIn: gener.yaml
-      configuredBy:
-        kind: executable
-        name: demo
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, string(yml))
+	kusttest_test.AssertYAMLEqualsGolden(t, yml)
 	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
@@ -550,47 +510,7 @@ stringData:
 	require.NoError(t, err)
 	yml, err := m.AsYaml()
 	require.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      path: short_secret.yaml
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-type: Opaque
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      configuredIn: kustomization.yaml
-      configuredBy:
-        kind: executable
-        name: demo
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, string(yml))
+	kusttest_test.AssertYAMLEqualsGolden(t, yml)
 	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
@@ -650,47 +570,7 @@ spec:
 	require.NoError(t, err)
 	yml, err := m.AsYaml()
 	require.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      path: ../base/short_secret.yaml
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-type: Opaque
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      configuredIn: ../base/gener.yaml
-      configuredBy:
-        kind: executable
-        name: demo
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, string(yml))
+	kusttest_test.AssertYAMLEqualsGolden(t, yml)
 	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
@@ -746,47 +626,7 @@ stringData:
 	require.NoError(t, err)
 	yml, err := m.AsYaml()
 	require.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      path: ../base/short_secret.yaml
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-type: Opaque
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      configuredIn: ../base/kustomization.yaml
-      configuredBy:
-        kind: executable
-        name: demo
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, string(yml))
+	kusttest_test.AssertYAMLEqualsGolden(t, yml)
 	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
@@ -1037,32 +877,7 @@ spec:
 	require.NoError(t, err)
 	yml, err := m.AsYaml()
 	require.NoError(t, err)
-	assert.Equal(t, `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/origin: |
-      configuredIn: gener.yaml
-      configuredBy:
-        kind: executable
-        name: demo
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, string(yml))
+	kusttest_test.AssertYAMLEqualsGolden(t, yml)
 	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
@@ -1109,36 +924,6 @@ buildMetadata: [originAnnotations, transformerAnnotations]
 	require.NoError(t, err)
 	yml, err := m.AsYaml()
 	require.NoError(t, err)
-	assert.Equal(t, `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    alpha.config.kubernetes.io/transformations: |
-      - configuredIn: kustomization.yaml
-        configuredBy:
-          apiVersion: builtin
-          kind: SuffixTransformer
-    config.kubernetes.io/origin: |
-      configuredIn: ../base/gener.yaml
-      configuredBy:
-        kind: executable
-        name: demo
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx-foo
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, string(yml))
+	kusttest_test.AssertYAMLEqualsGolden(t, yml)
 	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }

api/krusty/testdata/golden/TestAddManagedbyLabel.golden

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: myService
+  labels:
+    app.kubernetes.io/managed-by: kustomize-(test)
+spec:
+  ports:
+  - port: 7002

api/krusty/testdata/golden/TestAddNamePrefixWithNamespace.golden

@@ -0,0 +1,18 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: iter8-prometheus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: prometheus
+subjects:
+- kind: ServiceAccount
+  name: iter8-prometheus
+  namespace: iter8-monitoring
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: iter8-prometheus
+  namespace: iter8-monitoring