etcdctl: mk use etcd/client
parent
61befc7ce6
commit
9d7a8dd2b0
|
@ -17,9 +17,11 @@ package command
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
"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"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewMakeCommand returns the CLI command for "mk".
|
// NewMakeCommand returns the CLI command for "mk".
|
||||||
|
@ -31,23 +33,29 @@ func NewMakeCommand() cli.Command {
|
||||||
cli.IntFlag{Name: "ttl", Value: 0, Usage: "key time-to-live"},
|
cli.IntFlag{Name: "ttl", Value: 0, Usage: "key time-to-live"},
|
||||||
},
|
},
|
||||||
Action: func(c *cli.Context) {
|
Action: func(c *cli.Context) {
|
||||||
handleKey(c, makeCommandFunc)
|
mkCommandFunc(c, mustNewKeyAPI(c))
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// makeCommandFunc executes the "make" command.
|
// mkCommandFunc executes the "mk" command.
|
||||||
func makeCommandFunc(c *cli.Context, client *etcd.Client) (*etcd.Response, error) {
|
func mkCommandFunc(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]
|
||||||
value, err := argOrStdin(c.Args(), os.Stdin, 1)
|
value, err := argOrStdin(c.Args(), os.Stdin, 1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.New("value required")
|
handleError(ExitBadArgs, errors.New("value required"))
|
||||||
}
|
}
|
||||||
|
|
||||||
ttl := c.Int("ttl")
|
ttl := c.Int("ttl")
|
||||||
|
|
||||||
return client.Create(key, value, uint64(ttl))
|
// TODO: handle transport timeout
|
||||||
|
resp, err := ki.Set(context.TODO(), key, value, &client.SetOptions{TTL: time.Duration(ttl) * time.Second, PrevExist: client.PrevIgnore})
|
||||||
|
if err != nil {
|
||||||
|
handleError(ExitServerError, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
printResponseKey(resp, c.GlobalString("output"))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue