From 93908602887c31d4721e868bd97d33bcfbfb9f18 Mon Sep 17 00:00:00 2001
From: Jingfang Liu <jingfangliu@google.com>
Date: Tue, 7 May 2019 16:54:20 -0700
Subject: [PATCH] fix the bug for setting annotations when triggering
 transformers

---
 pkg/plugins/execplugin.go            |  6 ++----
 pkg/target/transformerplugin_test.go | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkg/plugins/execplugin.go b/pkg/plugins/execplugin.go
index fe32e5729..1fd2d1bff 100644
--- a/pkg/plugins/execplugin.go
+++ b/pkg/plugins/execplugin.go
@@ -208,12 +208,10 @@ func (p *ExecPlugin) getResMapWithIdAnnotation(rm resmap.ResMap) (resmap.ResMap,
 		}
 		annotations := r.GetAnnotations()
 		if annotations == nil {
-			annotations = map[string]string{
-				idAnnotation: string(idString),
-			}
-			r.SetAnnotations(annotations)
+			annotations = make(map[string]string)
 		}
 		annotations[idAnnotation] = string(idString)
+		r.SetAnnotations(annotations)
 	}
 	return inputRM, nil
 }
diff --git a/pkg/target/transformerplugin_test.go b/pkg/target/transformerplugin_test.go
index 920479c20..a734f6638 100644
--- a/pkg/target/transformerplugin_test.go
+++ b/pkg/target/transformerplugin_test.go
@@ -113,6 +113,9 @@ func TestSedTransformer(t *testing.T) {
 	th := kusttest_test.NewKustTestHarnessWithPluginConfig(
 		t, "/app", plugin.ActivePluginConfig())
 	th.WriteK("/app", `
+resources:
+- configmap.yaml
+
 transformers:
 - sed-transformer.yaml
 
@@ -134,12 +137,32 @@ s/$FOO/foo/g
 s/$BAR/bar/g
 `)
 
+	th.WriteF("/app/configmap.yaml", `
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: configmap-a
+  annotations:
+    kustomize.k8s.io/Generated: "false"
+data:
+  foo: $FOO
+`)
+
 	m, err := th.MakeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
+data:
+  foo: foo
+kind: ConfigMap
+metadata:
+  annotations:
+    kustomize.k8s.io/Generated: "false"
+  name: configmap-a
+---
+apiVersion: v1
 data:
   BAR: bar
   FOO: foo