Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1508 from bcwaldon/etcdctl-96

Browse Source 
etcdctl: add -p to ls command
This commit is contained in:
Brian Waldon 2014-10-30 13:33:30 -07:00
commit 6e8de1f426
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etcdctl/README.md
View File

@ -127,6 +127,13 @@ $ etcdctl ls --recursive
/adir/key2 /adir/key2
``` ```
Directories can also have a trailing `/` added to output using `-p`.
```
$ etcdctl ls -p
/akey
/adir/
```
### Deleting a key ### Deleting a key

14
etcdctl/command/handle.go
View File

@ -14,6 +14,7 @@ import (
type handlerFunc func(*cli.Context, *etcd.Client) (*etcd.Response, error) type handlerFunc func(*cli.Context, *etcd.Client) (*etcd.Response, error)
type printFunc func(*etcd.Response, string) type printFunc func(*etcd.Response, string)
type contextualPrintFunc func(*cli.Context, *etcd.Response, string)
// dumpCURL blindly dumps all curl output to os.Stderr // dumpCURL blindly dumps all curl output to os.Stderr
func dumpCURL(client *etcd.Client) { func dumpCURL(client *etcd.Client) {
@ -106,6 +107,19 @@ func handlePrint(c *cli.Context, fn handlerFunc, pFn printFunc) {
} }
} }
// Just like handlePrint but also passed the context of the command
func handleContextualPrint(c *cli.Context, fn handlerFunc, pFn contextualPrintFunc) {
resp, err := rawhandle(c, fn)
if err != nil {
handleError(ErrorFromEtcd, err)
}
if resp != nil && pFn != nil {
pFn(c, resp, c.GlobalString("output"))
}
}
// handleDir handles a request that wants to do operations on a single dir. // handleDir handles a request that wants to do operations on a single dir.
// Dir cannot be printed out, so we set NIL print function here. // Dir cannot be printed out, so we set NIL print function here.
func handleDir(c *cli.Context, fn handlerFunc) { func handleDir(c *cli.Context, fn handlerFunc) {

17
etcdctl/command/ls_command.go
View File

@ -13,6 +13,7 @@ func NewLsCommand() cli.Command {
Usage: "retrieve a directory", Usage: "retrieve a directory",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.BoolFlag{Name: "recursive", Usage: "returns all values for key and child keys"}, cli.BoolFlag{Name: "recursive", Usage: "returns all values for key and child keys"},
cli.BoolFlag{Name: "p", Usage: "append slash (/) to directories"},
}, },
Action: func(c *cli.Context) { Action: func(c *cli.Context) {
handleLs(c, lsCommandFunc) handleLs(c, lsCommandFunc)
@ -22,17 +23,17 @@ func NewLsCommand() cli.Command {
// handleLs handles a request that intends to do ls-like operations. // handleLs handles a request that intends to do ls-like operations.
func handleLs(c *cli.Context, fn handlerFunc) { func handleLs(c *cli.Context, fn handlerFunc) {
handlePrint(c, fn, printLs) handleContextualPrint(c, fn, printLs)
} }
// printLs writes a response out in a manner similar to the `ls` command in unix. // 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. // Non-empty directories list their contents and files list their name.
func printLs(resp *etcd.Response, format string) { func printLs(c *cli.Context, resp *etcd.Response, format string) {
if !resp.Node.Dir { if !resp.Node.Dir {
fmt.Println(resp.Node.Key) fmt.Println(resp.Node.Key)
} }
for _, node := range resp.Node.Nodes { for _, node := range resp.Node.Nodes {
rPrint(node) rPrint(c, node)
} }
} }
@ -49,9 +50,15 @@ func lsCommandFunc(c *cli.Context, client *etcd.Client) (*etcd.Response, error)
} }
// rPrint recursively prints out the nodes in the node structure. // rPrint recursively prints out the nodes in the node structure.
func rPrint(n *etcd.Node) { func rPrint(c *cli.Context, n *etcd.Node) {
if n.Dir && c.Bool("p") {
fmt.Println(fmt.Sprintf("%v/", n.Key))
} else {
fmt.Println(n.Key) fmt.Println(n.Key)
}
for _, node := range n.Nodes { for _, node := range n.Nodes {
rPrint(node) rPrint(c, node)
} }
} }