From 8a6602db94934e9ec10990339c2ff7fc142d6215 Mon Sep 17 00:00:00 2001
From: Christopher Fry <christopherfry@google.com>
Date: Thu, 8 Dec 2022 20:10:05 +0000
Subject: [PATCH] Allow name suffix transformer configuration to be overridden

---
 .../builtinconfig/transformerconfig.go        |  1 +
 api/internal/target/kusttarget_test.go        | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/api/internal/plugins/builtinconfig/transformerconfig.go b/api/internal/plugins/builtinconfig/transformerconfig.go
index 50f162f993..69b8bd4fb2 100644
--- a/api/internal/plugins/builtinconfig/transformerconfig.go
+++ b/api/internal/plugins/builtinconfig/transformerconfig.go
@@ -60,6 +60,7 @@ func MakeTransformerConfig(
 // sortFields provides determinism in logging, tests, etc.
 func (t *TransformerConfig) sortFields() {
 	sort.Sort(t.NamePrefix)
+	sort.Sort(t.NameSuffix)
 	sort.Sort(t.NameSpace)
 	sort.Sort(t.CommonLabels)
 	sort.Sort(t.TemplateLabels)
diff --git a/api/internal/target/kusttarget_test.go b/api/internal/target/kusttarget_test.go
index 6d655742c7..2c4ca87d02 100644
--- a/api/internal/target/kusttarget_test.go
+++ b/api/internal/target/kusttarget_test.go
@@ -265,12 +265,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namePrefix: foo-
 nameSuffix: -bar
+namespace: ns1
 resources:
   - deployment.yaml
   - config.yaml
   - secret.yaml
 configurations:
   - name-prefix-rules.yaml
+  - name-suffix-rules.yaml
 `)
 	th.WriteF("/merge-config/name-prefix-rules.yaml", `
 namePrefix:
@@ -280,6 +282,15 @@ namePrefix:
 - path: metadata/name
   apiVersion: v1
   kind: Secret
+`)
+	th.WriteF("/merge-config/name-suffix-rules.yaml", `
+nameSuffix:
+- path: metadata/name
+  apiVersion: v1
+  kind: ConfigMap
+- path: metadata/name
+  apiVersion: v1
+  kind: Deployment
 `)
 	th.WriteF("/merge-config/deployment.yaml", `
 apiVersion: apps/v1
@@ -308,19 +319,22 @@ metadata:
 			"apiVersion": "apps/v1",
 			"kind":       "Deployment",
 			"metadata": map[string]interface{}{
-				"name": "foo-deployment1-bar",
+				"name":      "foo-deployment1-bar",
+				"namespace": "ns1",
 			},
 		}), resFactory.FromMapWithName("config", map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
 			"metadata": map[string]interface{}{
-				"name": "config-bar",
+				"name":      "config-bar",
+				"namespace": "ns1",
 			},
 		}), resFactory.FromMapWithName("secret", map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "Secret",
 			"metadata": map[string]interface{}{
-				"name": "foo-secret-bar",
+				"name":      "foo-secret",
+				"namespace": "ns1",
 			},
 		}),
 	}