mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
etcdctl: show warning if ETCDCTL_API is not set in v2 --help
FIXES #7385
This commit is contained in:
parent
d3aebbf0ce
commit
f76ca01aed
@ -25,7 +25,7 @@ import (
|
|||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Start() {
|
func Start(apiv string) {
|
||||||
app := cli.NewApp()
|
app := cli.NewApp()
|
||||||
app.Name = "etcdctl"
|
app.Name = "etcdctl"
|
||||||
app.Version = version.Version
|
app.Version = version.Version
|
||||||
@ -34,6 +34,14 @@ func Start() {
|
|||||||
fmt.Fprintln(c.App.Writer, "API version: 2")
|
fmt.Fprintln(c.App.Writer, "API version: 2")
|
||||||
}
|
}
|
||||||
app.Usage = "A simple command line client for etcd."
|
app.Usage = "A simple command line client for etcd."
|
||||||
|
|
||||||
|
if apiv == "" {
|
||||||
|
app.Usage += "\n\n" +
|
||||||
|
"WARNING:\n" +
|
||||||
|
" Environment variable ETCDCTL_API is not set; defaults to etcdctl v2.\n" +
|
||||||
|
" Set environment variable ETCDCTL_API=3 to use v3 API or ETCDCTL_API=2 to use v2 API."
|
||||||
|
}
|
||||||
|
|
||||||
app.Flags = []cli.Flag{
|
app.Flags = []cli.Flag{
|
||||||
cli.BoolFlag{Name: "debug", Usage: "output cURL commands which can be used to reproduce the request"},
|
cli.BoolFlag{Name: "debug", Usage: "output cURL commands which can be used to reproduce the request"},
|
||||||
cli.BoolFlag{Name: "no-sync", Usage: "don't synchronize cluster information before sending request"},
|
cli.BoolFlag{Name: "no-sync", Usage: "don't synchronize cluster information before sending request"},
|
||||||
|
@ -32,7 +32,7 @@ func main() {
|
|||||||
// unset apiEnv to avoid side-effect for future env and flag parsing.
|
// unset apiEnv to avoid side-effect for future env and flag parsing.
|
||||||
os.Unsetenv(apiEnv)
|
os.Unsetenv(apiEnv)
|
||||||
if len(apiv) == 0 || apiv == "2" {
|
if len(apiv) == 0 || apiv == "2" {
|
||||||
ctlv2.Start()
|
ctlv2.Start(apiv)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user