mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdctl: Add support for formating output of key related commands

Browse Source 
All v2 key and dir related commands will now honor the global format option if
it was specified. Otherwise, the output will remain the same.
This commit is contained in:
jesse.millan
2016-07-27 14:17:19 -07:00
parent 640d511684
commit 205f10aeb6
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
etcdctl/ctlv2/command/mkdir_command.go
View File

@ -48,9 +48,12 @@ func mkdirCommandFunc(c *cli.Context, ki client.KeysAPI, prevExist client.PrevEx
ttl := c.Int("ttl") ttl := c.Int("ttl")
ctx, cancel := contextWithTotalTimeout(c) ctx, cancel := contextWithTotalTimeout(c)
_, err := ki.Set(ctx, key, "", &client.SetOptions{TTL: time.Duration(ttl) * time.Second, Dir: true, PrevExist: prevExist}) resp, err := ki.Set(ctx, key, "", &client.SetOptions{TTL: time.Duration(ttl) * time.Second, Dir: true, PrevExist: prevExist})
cancel() cancel()
if err != nil { if err != nil {
handleError(ExitServerError, err) handleError(ExitServerError, err)
} }
if c.GlobalString("output") != "simple" {
printResponseKey(resp, c.GlobalString("output"))
}
} }

3
etcdctl/ctlv2/command/rm_command.go
View File

@ -57,8 +57,7 @@ func rmCommandFunc(c *cli.Context, ki client.KeysAPI) {
if err != nil { if err != nil {
handleError(ExitServerError, err) handleError(ExitServerError, err)
} }
if !resp.Node.Dir || c.GlobalString("output") != "simple" {
if !resp.Node.Dir {
printResponseKey(resp, c.GlobalString("output")) printResponseKey(resp, c.GlobalString("output"))
} }
} }

2
etcdctl/ctlv2/command/rmdir_command.go
View File

@ -48,7 +48,7 @@ func rmdirCommandFunc(c *cli.Context, ki client.KeysAPI) {
handleError(ExitServerError, err) handleError(ExitServerError, err)
} }
if !resp.Node.Dir { if !resp.Node.Dir || c.GlobalString("output") != "simple" {
printResponseKey(resp, c.GlobalString("output")) printResponseKey(resp, c.GlobalString("output"))
} }
} }

5
etcdctl/ctlv2/command/update_dir_command.go
View File

@ -46,9 +46,12 @@ func updatedirCommandFunc(c *cli.Context, ki client.KeysAPI) {
key := c.Args()[0] key := c.Args()[0]
ttl := c.Int("ttl") ttl := c.Int("ttl")
ctx, cancel := contextWithTotalTimeout(c) ctx, cancel := contextWithTotalTimeout(c)
_, err := ki.Set(ctx, key, "", &client.SetOptions{TTL: time.Duration(ttl) * time.Second, Dir: true, PrevExist: client.PrevExist}) resp, err := ki.Set(ctx, key, "", &client.SetOptions{TTL: time.Duration(ttl) * time.Second, Dir: true, PrevExist: client.PrevExist})
cancel() cancel()
if err != nil { if err != nil {
handleError(ExitServerError, err) handleError(ExitServerError, err)
} }
if c.GlobalString("output") != "simple" {
printResponseKey(resp, c.GlobalString("output"))
}
} }