diff --git a/etcdctl/ctlv3/ctl_cov.go b/etcdctl/ctlv3/ctl_cov.go index 0440d0126..6908113a7 100644 --- a/etcdctl/ctlv3/ctl_cov.go +++ b/etcdctl/ctlv3/ctl_cov.go @@ -23,16 +23,9 @@ import ( "github.com/coreos/etcd/etcdctl/ctlv3/command" ) -func Start(apiv string) { +func Start() { // ETCDCTL_ARGS=etcdctl_test arg1 arg2... // SetArgs() takes arg1 arg2... - if apiv == "" { - rootCmd.Short += "\n\n" + - "WARNING:\n" + - " Environment variable ETCDCTL_API is not set; defaults to etcdctl v3.\n" + - " Set environment variable ETCDCTL_API=2 to use v2 API or ETCDCTL_API=3 to use v3 API." - - } rootCmd.SetArgs(strings.Split(os.Getenv("ETCDCTL_ARGS"), "\xe7\xcd")[1:]) os.Unsetenv("ETCDCTL_ARGS") if err := rootCmd.Execute(); err != nil { diff --git a/etcdctl/ctlv3/ctl_nocov.go b/etcdctl/ctlv3/ctl_nocov.go index d563b7cd6..52751feec 100644 --- a/etcdctl/ctlv3/ctl_nocov.go +++ b/etcdctl/ctlv3/ctl_nocov.go @@ -18,14 +18,7 @@ package ctlv3 import "github.com/coreos/etcd/etcdctl/ctlv3/command" -func Start(apiv string) { - if apiv == "" { - rootCmd.Short += "\n\n" + - "WARNING:\n" + - " Environment variable ETCDCTL_API is not set; defaults to etcdctl v3.\n" + - " Set environment variable ETCDCTL_API=2 to use v2 API or ETCDCTL_API=3 to use v3 API." - - } +func Start() { rootCmd.SetUsageFunc(usageFunc) // Make help just show the usage rootCmd.SetHelpTemplate(`{{.UsageString}}`) diff --git a/etcdctl/main.go b/etcdctl/main.go index 36d7e7432..bba065fbe 100644 --- a/etcdctl/main.go +++ b/etcdctl/main.go @@ -32,7 +32,7 @@ func main() { // unset apiEnv to avoid side-effect for future env and flag parsing. os.Unsetenv(apiEnv) if len(apiv) == 0 || apiv == "3" { - ctlv3.Start(apiv) + ctlv3.Start() return }