etcdctl/ctlv3: exit with error on shadowed environment variable flags

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
etcd-io · Aug 9, 2017 · 34319bc · 34319bc
1 parent 4a9a3fd
commit 34319bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go
@@ -78,7 +78,9 @@ func newEpHashKVCommand() *cobra.Command {
 
 // epHealthCommandFunc executes the "endpoint-health" command.
 func epHealthCommandFunc(cmd *cobra.Command, args []string) {
-	flags.SetPflagsFromEnv("ETCDCTL", cmd.InheritedFlags())
+	if err := flags.SetPflagsFromEnv("ETCDCTL", cmd.InheritedFlags(), flags.WithNoConflict()); err != nil {
+		ExitWithError(ExitBadArgs, err)
+	}
 
 	sec := secureCfgFromCmd(cmd)
 	dt := dialTimeoutFromCmd(cmd)

diff --git a/etcdctl/ctlv3/command/global.go b/etcdctl/ctlv3/command/global.go
@@ -81,7 +81,9 @@ func initDisplayFromCmd(cmd *cobra.Command) {
 }
 
 func mustClientFromCmd(cmd *cobra.Command) *clientv3.Client {
-	flags.SetPflagsFromEnv("ETCDCTL", cmd.InheritedFlags())
+	if err := flags.SetPflagsFromEnv("ETCDCTL", cmd.InheritedFlags(), flags.WithNoConflict()); err != nil {
+		ExitWithError(ExitBadArgs, err)
+	}
 
 	debug, derr := cmd.Flags().GetBool("debug")
 	if derr != nil {