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: allow to add a user within one command line

Browse Source 
This makes the "user add usr:pwd" feature available for ctlv3
without asking for the password in a new prompt.
This commit is contained in:
Jonathan Bazan 2016-10-25 12:55:30 -03:00
parent 98897b7603
commit 73b4a58ac0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etcdctl/ctlv3/command/user_command.go
View File

@ -124,19 +124,30 @@ func userAddCommandFunc(cmd *cobra.Command, args []string) {
} }
var password string var password string
var user string
if !passwordInteractive { splitted := strings.SplitN(args[0], ":", 2)
fmt.Scanf("%s", &password) if len(splitted) < 2 {
user = args[0]
if !passwordInteractive {
fmt.Scanf("%s", &password)
} else {
password = readPasswordInteractive(args[0])
}
} else { } else {
password = readPasswordInteractive(args[0]) user = splitted[0]
password = splitted[1]
if len(user) == 0 {
ExitWithError(ExitBadArgs, fmt.Errorf("empty user name is not allowed."))
}
} }
_, err := mustClientFromCmd(cmd).Auth.UserAdd(context.TODO(), args[0], password) _, err := mustClientFromCmd(cmd).Auth.UserAdd(context.TODO(), user, password)
if err != nil { if err != nil {
ExitWithError(ExitError, err) ExitWithError(ExitError, err)
} }
fmt.Printf("User %s created\n", args[0]) fmt.Printf("User %s created\n", user)
} }
// userDeleteCommandFunc executes the "user delete" command. // userDeleteCommandFunc executes the "user delete" command.