vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdctl: improve lease command documentation and exit codes

release-3.0
Anthony Romano 2016-04-13 12:36:53 -07:00
parent 15e865e024
commit 855a5116a2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etcdctl/ctlv3/command/lease_command.go
View File

@ -16,7 +16,6 @@ package command
import ( import (
"fmt" "fmt"
"os"
"strconv" "strconv"
v3 "github.com/coreos/etcd/clientv3" v3 "github.com/coreos/etcd/clientv3"
@ -41,7 +40,7 @@ func NewLeaseCommand() *cobra.Command {
// NewLeaseGrantCommand returns the cobra command for "lease grant". // NewLeaseGrantCommand returns the cobra command for "lease grant".
func NewLeaseGrantCommand() *cobra.Command { func NewLeaseGrantCommand() *cobra.Command {
lc := &cobra.Command{ lc := &cobra.Command{
Use: "grant", Use: "grant <ttl>",
Short: "grant is used to create leases.", Short: "grant is used to create leases.",
Run: leaseGrantCommandFunc, Run: leaseGrantCommandFunc,
@ -65,8 +64,7 @@ func leaseGrantCommandFunc(cmd *cobra.Command, args []string) {
resp, err := mustClientFromCmd(cmd).Grant(ctx, ttl) resp, err := mustClientFromCmd(cmd).Grant(ctx, ttl)
cancel() cancel()
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "failed to grant lease (%v)\n", err) ExitWithError(ExitError, fmt.Errorf("failed to grant lease (%v)\n", err))
return
} }
fmt.Printf("lease %016x granted with TTL(%ds)\n", resp.ID, resp.TTL) fmt.Printf("lease %016x granted with TTL(%ds)\n", resp.ID, resp.TTL)
} }
@ -74,7 +72,7 @@ func leaseGrantCommandFunc(cmd *cobra.Command, args []string) {
// NewLeaseRevokeCommand returns the cobra command for "lease revoke". // NewLeaseRevokeCommand returns the cobra command for "lease revoke".
func NewLeaseRevokeCommand() *cobra.Command { func NewLeaseRevokeCommand() *cobra.Command {
lc := &cobra.Command{ lc := &cobra.Command{
Use: "revoke", Use: "revoke <leaseID>",
Short: "revoke is used to revoke leases.", Short: "revoke is used to revoke leases.",
Run: leaseRevokeCommandFunc, Run: leaseRevokeCommandFunc,
@ -98,8 +96,7 @@ func leaseRevokeCommandFunc(cmd *cobra.Command, args []string) {
_, err = mustClientFromCmd(cmd).Revoke(ctx, v3.LeaseID(id)) _, err = mustClientFromCmd(cmd).Revoke(ctx, v3.LeaseID(id))
cancel() cancel()
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "failed to revoke lease (%v)\n", err) ExitWithError(ExitError, fmt.Errorf("failed to revoke lease (%v)\n", err))
return
} }
fmt.Printf("lease %016x revoked\n", id) fmt.Printf("lease %016x revoked\n", id)
} }
@ -107,7 +104,7 @@ func leaseRevokeCommandFunc(cmd *cobra.Command, args []string) {
// NewLeaseKeepAliveCommand returns the cobra command for "lease keep-alive". // NewLeaseKeepAliveCommand returns the cobra command for "lease keep-alive".
func NewLeaseKeepAliveCommand() *cobra.Command { func NewLeaseKeepAliveCommand() *cobra.Command {
lc := &cobra.Command{ lc := &cobra.Command{
Use: "keep-alive", Use: "keep-alive <leaseID>",
Short: "keep-alive is used to keep leases alive.", Short: "keep-alive is used to keep leases alive.",
Run: leaseKeepAliveCommandFunc, Run: leaseKeepAliveCommandFunc,