diff --git a/etcdctl/ctlv2/command/cluster_health.go b/etcdctl/ctlv2/command/cluster_health.go index 0a3e4d6e9..954bb0f08 100644 --- a/etcdctl/ctlv2/command/cluster_health.go +++ b/etcdctl/ctlv2/command/cluster_health.go @@ -34,7 +34,7 @@ func NewClusterHealthCommand() cli.Command { Usage: "check the health of the etcd cluster", ArgsUsage: " ", Flags: []cli.Flag{ - cli.BoolFlag{Name: "forever", Usage: "forever check the health every 10 second until CTRL+C"}, + cli.BoolFlag{Name: "forever, f", Usage: "forever check the health every 10 second until CTRL+C"}, }, Action: handleClusterHealth, } diff --git a/etcdctl/ctlv2/command/exec_watch_command.go b/etcdctl/ctlv2/command/exec_watch_command.go index ed6fec774..5c89cca59 100644 --- a/etcdctl/ctlv2/command/exec_watch_command.go +++ b/etcdctl/ctlv2/command/exec_watch_command.go @@ -34,7 +34,7 @@ func NewExecWatchCommand() cli.Command { ArgsUsage: " [args...]", Flags: []cli.Flag{ cli.IntFlag{Name: "after-index", Value: 0, Usage: "watch after the given index"}, - cli.BoolFlag{Name: "recursive", Usage: "watch all values for key and child keys"}, + cli.BoolFlag{Name: "recursive, r", Usage: "watch all values for key and child keys"}, }, Action: func(c *cli.Context) { execWatchCommandFunc(c, mustNewKeyAPI(c)) diff --git a/etcdctl/ctlv2/command/get_command.go b/etcdctl/ctlv2/command/get_command.go index 6835e8658..57d7002ba 100644 --- a/etcdctl/ctlv2/command/get_command.go +++ b/etcdctl/ctlv2/command/get_command.go @@ -31,7 +31,7 @@ func NewGetCommand() cli.Command { ArgsUsage: "", Flags: []cli.Flag{ cli.BoolFlag{Name: "sort", Usage: "returns result in sorted order"}, - cli.BoolFlag{Name: "quorum", Usage: "require quorum for get request"}, + cli.BoolFlag{Name: "quorum, q", Usage: "require quorum for get request"}, }, Action: func(c *cli.Context) { getCommandFunc(c, mustNewKeyAPI(c)) diff --git a/etcdctl/ctlv2/command/ls_command.go b/etcdctl/ctlv2/command/ls_command.go index b90db4a11..8eccefef8 100644 --- a/etcdctl/ctlv2/command/ls_command.go +++ b/etcdctl/ctlv2/command/ls_command.go @@ -28,9 +28,9 @@ func NewLsCommand() cli.Command { ArgsUsage: "[key]", Flags: []cli.Flag{ cli.BoolFlag{Name: "sort", Usage: "returns result in sorted order"}, - cli.BoolFlag{Name: "recursive", Usage: "returns all key names recursively for the given path"}, + cli.BoolFlag{Name: "recursive, r", Usage: "returns all key names recursively for the given path"}, cli.BoolFlag{Name: "p", Usage: "append slash (/) to directories"}, - cli.BoolFlag{Name: "quorum", Usage: "require quorum for get request"}, + cli.BoolFlag{Name: "quorum, q", Usage: "require quorum for get request"}, }, Action: func(c *cli.Context) { lsCommandFunc(c, mustNewKeyAPI(c)) diff --git a/etcdctl/ctlv2/command/rm_command.go b/etcdctl/ctlv2/command/rm_command.go index 2f39cbe86..9e1effa95 100644 --- a/etcdctl/ctlv2/command/rm_command.go +++ b/etcdctl/ctlv2/command/rm_command.go @@ -29,7 +29,7 @@ func NewRemoveCommand() cli.Command { ArgsUsage: "", Flags: []cli.Flag{ cli.BoolFlag{Name: "dir", Usage: "removes the key if it is an empty directory or a key-value pair"}, - cli.BoolFlag{Name: "recursive", Usage: "removes the key and all child keys(if it is a directory)"}, + cli.BoolFlag{Name: "recursive, r", Usage: "removes the key and all child keys(if it is a directory)"}, cli.StringFlag{Name: "with-value", Value: "", Usage: "previous value"}, cli.IntFlag{Name: "with-index", Value: 0, Usage: "previous index"}, }, diff --git a/etcdctl/ctlv2/command/role_commands.go b/etcdctl/ctlv2/command/role_commands.go index 633f1fb1f..f83cac4f8 100644 --- a/etcdctl/ctlv2/command/role_commands.go +++ b/etcdctl/ctlv2/command/role_commands.go @@ -62,7 +62,7 @@ func NewRoleCommands() cli.Command { cli.StringFlag{Name: "path", Value: "", Usage: "Path granted for the role to access"}, cli.BoolFlag{Name: "read", Usage: "Grant read-only access"}, cli.BoolFlag{Name: "write", Usage: "Grant write-only access"}, - cli.BoolFlag{Name: "readwrite", Usage: "Grant read-write access"}, + cli.BoolFlag{Name: "readwrite, rw", Usage: "Grant read-write access"}, }, Action: actionRoleGrant, }, @@ -74,7 +74,7 @@ func NewRoleCommands() cli.Command { cli.StringFlag{Name: "path", Value: "", Usage: "Path revoked for the role to access"}, cli.BoolFlag{Name: "read", Usage: "Revoke read access"}, cli.BoolFlag{Name: "write", Usage: "Revoke write access"}, - cli.BoolFlag{Name: "readwrite", Usage: "Revoke read-write access"}, + cli.BoolFlag{Name: "readwrite, rw", Usage: "Revoke read-write access"}, }, Action: actionRoleRevoke, }, diff --git a/etcdctl/ctlv2/command/watch_command.go b/etcdctl/ctlv2/command/watch_command.go index 2f17f2548..33af51868 100644 --- a/etcdctl/ctlv2/command/watch_command.go +++ b/etcdctl/ctlv2/command/watch_command.go @@ -32,9 +32,9 @@ func NewWatchCommand() cli.Command { Usage: "watch a key for changes", ArgsUsage: "", Flags: []cli.Flag{ - cli.BoolFlag{Name: "forever", Usage: "forever watch a key until CTRL+C"}, + cli.BoolFlag{Name: "forever, f", Usage: "forever watch a key until CTRL+C"}, cli.IntFlag{Name: "after-index", Value: 0, Usage: "watch after the given index"}, - cli.BoolFlag{Name: "recursive", Usage: "returns all values for key and child keys"}, + cli.BoolFlag{Name: "recursive, r", Usage: "returns all values for key and child keys"}, }, Action: func(c *cli.Context) { watchCommandFunc(c, mustNewKeyAPI(c))