From e9a3f9f5f62492e3def6a0f02259f6bfd55ca3a7 Mon Sep 17 00:00:00 2001
From: Jingfang Liu <jingfangliu@google.com>
Date: Mon, 8 Apr 2019 11:10:05 -0700
Subject: [PATCH] address comments

---
 k8sdeps/transformer/prune/prune.go      |  6 +++---
 k8sdeps/transformer/prune/prune_test.go |  4 ++--
 pkg/commands/build/build.go             | 12 ++++++------
 pkg/target/pruneconfigmap_test.go       |  4 ++--
 pkg/types/kustomization.go              |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/k8sdeps/transformer/prune/prune.go b/k8sdeps/transformer/prune/prune.go
index def29ad51..7eb7a0931 100644
--- a/k8sdeps/transformer/prune/prune.go
+++ b/k8sdeps/transformer/prune/prune.go
@@ -42,13 +42,13 @@ var _ transformers.Transformer = &pruneTransformer{}
 
 // NewPruneTransformer makes a pruneTransformer.
 func NewPruneTransformer(p *types.Prune, namespace string, append bool) transformers.Transformer {
-	if p == nil || p.Type != "alphaConfigMap" || p.AlphaConfigMap.Namespace != namespace {
+	if p == nil || p.Type != "ConfigMap" || p.ConfigMap.Namespace != namespace {
 		return transformers.NewNoOpTransformer()
 	}
 	return &pruneTransformer{
 		append:      append,
-		cmName:      p.AlphaConfigMap.Name,
-		cmNamespace: p.AlphaConfigMap.Namespace,
+		cmName:      p.ConfigMap.Name,
+		cmNamespace: p.ConfigMap.Namespace,
 	}
 }
 
diff --git a/k8sdeps/transformer/prune/prune_test.go b/k8sdeps/transformer/prune/prune_test.go
index f73d0d7c1..3f859a7cc 100644
--- a/k8sdeps/transformer/prune/prune_test.go
+++ b/k8sdeps/transformer/prune/prune_test.go
@@ -140,8 +140,8 @@ func TestPruneTransformer(t *testing.T) {
 	}
 
 	p := &types.Prune{
-		Type: "alphaConfigMap",
-		AlphaConfigMap: types.NameArgs{
+		Type: "ConfigMap",
+		ConfigMap: types.NameArgs{
 			Name:      "pruneCM",
 			Namespace: "default",
 		},
diff --git a/pkg/commands/build/build.go b/pkg/commands/build/build.go
index 7da9ee1e3..a747da0f3 100644
--- a/pkg/commands/build/build.go
+++ b/pkg/commands/build/build.go
@@ -85,7 +85,7 @@ func NewCmdBuild(
 		"output", "o", "",
 		"If specified, write the build output to this path.")
 
-	cmd.AddCommand(NewCmdBuildPrune(out, fs, rf, ptf, b))
+	cmd.AddCommand(NewCmdBuildPrune(out, fs, rf, ptf, pc))
 	return cmd
 }
 
@@ -136,13 +136,13 @@ func (o *Options) RunBuild(
 func (o *Options) RunBuildPrune(
 	out io.Writer, fSys fs.FileSystem,
 	rf *resmap.Factory, ptf transformer.Factory,
-	b bool) error {
+	pc *types.PluginConfig) error {
 	ldr, err := loader.NewLoader(o.kustomizationPath, fSys)
 	if err != nil {
 		return err
 	}
 	defer ldr.Cleanup()
-	kt, err := target.NewKustTarget(ldr, rf, ptf, b)
+	kt, err := target.NewKustTarget(ldr, rf, ptf, pc)
 	if err != nil {
 		return err
 	}
@@ -166,11 +166,11 @@ func NewCmdBuildPrune(
 	out io.Writer, fs fs.FileSystem,
 	rf *resmap.Factory,
 	ptf transformer.Factory,
-	b bool) *cobra.Command {
+	pc *types.PluginConfig) *cobra.Command {
 	var o Options
 
 	cmd := &cobra.Command{
-		Use:          "prune [path]",
+		Use:          "alpha-prune [path]",
 		Short:        "Print configmap to prune previous applied objects",
 		Example:      examples,
 		SilenceUsage: true,
@@ -179,7 +179,7 @@ func NewCmdBuildPrune(
 			if err != nil {
 				return err
 			}
-			return o.RunBuildPrune(out, fs, rf, ptf, b)
+			return o.RunBuildPrune(out, fs, rf, ptf, pc)
 		},
 	}
 	return cmd
diff --git a/pkg/target/pruneconfigmap_test.go b/pkg/target/pruneconfigmap_test.go
index 339cd0089..b49f6757e 100644
--- a/pkg/target/pruneconfigmap_test.go
+++ b/pkg/target/pruneconfigmap_test.go
@@ -29,8 +29,8 @@ resources:
 - secret.yaml
 
 prune:
-  type: alphaConfigMap
-  alphaConfigMap:
+  type: ConfigMap
+  configMap:
     name: haha
     namespace: default
 
diff --git a/pkg/types/kustomization.go b/pkg/types/kustomization.go
index 465c96b80..bbd81179e 100644
--- a/pkg/types/kustomization.go
+++ b/pkg/types/kustomization.go
@@ -294,8 +294,8 @@ type KVSource struct {
 }
 
 type Prune struct {
-	Type           string   `json:"type,omitempty" yaml:"type,omitempty"`
-	AlphaConfigMap NameArgs `json:"alphaConfigMap,omitempty" yaml:"alphaConfigMap,omitempty"`
+	Type      string   `json:"type,omitempty" yaml:"type,omitempty"`
+	ConfigMap NameArgs `json:"configMap,omitempty" yaml:"configMap,omitempty"`
 }
 
 type NameArgs struct {