etcdctl: Add support for formating output of ls command in json
The ls command will check for and honor json or extended output formats. Fixes #5993release-3.1
parent
e001848270
commit
f18d5433cc
|
@ -63,11 +63,16 @@ func lsCommandFunc(c *cli.Context, ki client.KeysAPI) {
|
|||
// printLs writes a response out in a manner similar to the `ls` command in unix.
|
||||
// Non-empty directories list their contents and files list their name.
|
||||
func printLs(c *cli.Context, resp *client.Response) {
|
||||
if !resp.Node.Dir {
|
||||
fmt.Println(resp.Node.Key)
|
||||
}
|
||||
for _, node := range resp.Node.Nodes {
|
||||
rPrint(c, node)
|
||||
if c.GlobalString("output") == "simple" {
|
||||
if !resp.Node.Dir {
|
||||
fmt.Println(resp.Node.Key)
|
||||
}
|
||||
for _, node := range resp.Node.Nodes {
|
||||
rPrint(c, node)
|
||||
}
|
||||
} else {
|
||||
// user wants JSON or extended output
|
||||
printResponseKey(resp, c.GlobalString("output"))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue