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

etcdctl: rmdir use etcd/client

Browse Source
This commit is contained in:
Xiang Li 2015-06-05 13:00:23 -07:00 committed by Yicheng Qin
parent 9d7a8dd2b0
commit 58b19a7c1e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etcdctl/command/rmdir_command.go
View File

@ -18,7 +18,8 @@ import (
"errors" "errors"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/coreos/etcd/client"
) )
// NewRemoveCommand returns the CLI command for "rmdir". // NewRemoveCommand returns the CLI command for "rmdir".
@ -27,17 +28,25 @@ func NewRemoveDirCommand() cli.Command {
Name: "rmdir", Name: "rmdir",
Usage: "removes the key if it is an empty directory or a key-value pair", Usage: "removes the key if it is an empty directory or a key-value pair",
Action: func(c *cli.Context) { Action: func(c *cli.Context) {
handleDir(c, removeDirCommandFunc) rmdirCommandFunc(c, mustNewKeyAPI(c))
}, },
} }
} }
// removeDirCommandFunc executes the "rmdir" command. // rmdirCommandFunc executes the "rmdir" command.
func removeDirCommandFunc(c *cli.Context, client *etcd.Client) (*etcd.Response, error) { func rmdirCommandFunc(c *cli.Context, ki client.KeysAPI) {
if len(c.Args()) == 0 { if len(c.Args()) == 0 {
return nil, errors.New("key required") handleError(ExitBadArgs, errors.New("key required"))
} }
key := c.Args()[0] key := c.Args()[0]
return client.DeleteDir(key) // TODO: handle transport timeout
resp, err := ki.Delete(context.TODO(), key, &client.DeleteOptions{Dir: true})
if err != nil {
handleError(ExitServerError, err)
}
if !resp.Node.Dir {
printResponseKey(resp, c.GlobalString("output"))
}
} }