From 822420e4ab86863603f7e9ad2bf31ba3703a29eb Mon Sep 17 00:00:00 2001
From: Seth Pollack <seth@sethpollack.net>
Date: Thu, 21 Mar 2019 14:58:06 -0400
Subject: [PATCH] fix mergeFlags

---
 pkg/commands/edit/add/configmap.go | 30 ++++++++++++++++++------------
 pkg/commands/edit/add/secret.go    | 30 ++++++++++++++++++------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pkg/commands/edit/add/configmap.go b/pkg/commands/edit/add/configmap.go
index 27e352561..5e8361bdc 100644
--- a/pkg/commands/edit/add/configmap.go
+++ b/pkg/commands/edit/add/configmap.go
@@ -127,16 +127,22 @@ func makeConfigMapArgs(m *types.Kustomization, name string) *types.ConfigMapArgs
 }
 
 func mergeFlagsIntoCmArgs(src *[]types.KVSource, flags flagsAndArgs) {
-	*src = append(*src, types.KVSource{
-		Name: "literals",
-		Args: flags.LiteralSources,
-	})
-	*src = append(*src, types.KVSource{
-		Name: "files",
-		Args: flags.FileSources,
-	})
-	*src = append(*src, types.KVSource{
-		Name: "envfiles",
-		Args: []string{flags.EnvFileSource},
-	})
+	if len(flags.LiteralSources) > 0 {
+		*src = append(*src, types.KVSource{
+			Name: "literals",
+			Args: flags.LiteralSources,
+		})
+	}
+	if len(flags.FileSources) > 0 {
+		*src = append(*src, types.KVSource{
+			Name: "files",
+			Args: flags.FileSources,
+		})
+	}
+	if flags.EnvFileSource != "" {
+		*src = append(*src, types.KVSource{
+			Name: "envfiles",
+			Args: []string{flags.EnvFileSource},
+		})
+	}
 }
diff --git a/pkg/commands/edit/add/secret.go b/pkg/commands/edit/add/secret.go
index 213475ca6..aaaf2267b 100644
--- a/pkg/commands/edit/add/secret.go
+++ b/pkg/commands/edit/add/secret.go
@@ -132,16 +132,22 @@ func makeSecretArgs(m *types.Kustomization, name, secretType string) *types.Secr
 }
 
 func mergeFlagsIntoSecretArgs(src *[]types.KVSource, flags flagsAndArgs) {
-	*src = append(*src, types.KVSource{
-		Name: "literals",
-		Args: flags.LiteralSources,
-	})
-	*src = append(*src, types.KVSource{
-		Name: "files",
-		Args: flags.FileSources,
-	})
-	*src = append(*src, types.KVSource{
-		Name: "envfiles",
-		Args: []string{flags.EnvFileSource},
-	})
+	if len(flags.LiteralSources) > 0 {
+		*src = append(*src, types.KVSource{
+			Name: "literals",
+			Args: flags.LiteralSources,
+		})
+	}
+	if len(flags.FileSources) > 0 {
+		*src = append(*src, types.KVSource{
+			Name: "files",
+			Args: flags.FileSources,
+		})
+	}
+	if flags.EnvFileSource != "" {
+		*src = append(*src, types.KVSource{
+			Name: "envfiles",
+			Args: []string{flags.EnvFileSource},
+		})
+	}
 }