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 #8259 from heyitsanthony/etcdctl-err-space

Browse Source 
etcdctl: remove extra space in error message
This commit is contained in:
Anthony Romano 2017-07-14 09:55:06 -07:00 committed by GitHub
commit 858938e32d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
e2e/ctl_v3_auth_test.go
View File

@ -403,7 +403,7 @@ func authTestTxn(cx ctlCtx) {
compare: []string{`version("c1") = "1"`}, compare: []string{`version("c1") = "1"`},
ifSucess: []string{"get s2"}, ifSucess: []string{"get s2"},
ifFail: []string{"get f2"}, ifFail: []string{"get f2"},
results: []string{"Error: etcdserver: permission denied"}, results: []string{"Error: etcdserver: permission denied"},
} }
if err := ctlV3Txn(cx, rqs); err != nil { if err := ctlV3Txn(cx, rqs); err != nil {
cx.t.Fatal(err) cx.t.Fatal(err)
@ -414,7 +414,7 @@ func authTestTxn(cx ctlCtx) {
compare: []string{`version("c2") = "1"`}, compare: []string{`version("c2") = "1"`},
ifSucess: []string{"get s1"}, ifSucess: []string{"get s1"},
ifFail: []string{"get f2"}, ifFail: []string{"get f2"},
results: []string{"Error: etcdserver: permission denied"}, results: []string{"Error: etcdserver: permission denied"},
} }
if err := ctlV3Txn(cx, rqs); err != nil { if err := ctlV3Txn(cx, rqs); err != nil {
cx.t.Fatal(err) cx.t.Fatal(err)
@ -425,7 +425,7 @@ func authTestTxn(cx ctlCtx) {
compare: []string{`version("c2") = "1"`}, compare: []string{`version("c2") = "1"`},
ifSucess: []string{"get s2"}, ifSucess: []string{"get s2"},
ifFail: []string{"get f1"}, ifFail: []string{"get f1"},
results: []string{"Error: etcdserver: permission denied"}, results: []string{"Error: etcdserver: permission denied"},
} }
if err := ctlV3Txn(cx, rqs); err != nil { if err := ctlV3Txn(cx, rqs); err != nil {
cx.t.Fatal(err) cx.t.Fatal(err)
@ -607,11 +607,11 @@ func authTestInvalidMgmt(cx ctlCtx) {
cx.t.Fatal(err) cx.t.Fatal(err)
} }
if err := ctlV3Role(cx, []string{"delete", "root"}, "Error: etcdserver: invalid auth management"); err == nil { if err := ctlV3Role(cx, []string{"delete", "root"}, "Error: etcdserver: invalid auth management"); err == nil {
cx.t.Fatal("deleting the role root must not be allowed") cx.t.Fatal("deleting the role root must not be allowed")
} }
if err := ctlV3User(cx, []string{"revoke-role", "root", "root"}, "Error: etcdserver: invalid auth management", []string{}); err == nil { if err := ctlV3User(cx, []string{"revoke-role", "root", "root"}, "Error: etcdserver: invalid auth management", []string{}); err == nil {
cx.t.Fatal("revoking the role root from the user root must not be allowed") cx.t.Fatal("revoking the role root from the user root must not be allowed")
} }
} }
@ -768,7 +768,7 @@ func authTestRoleGet(cx ctlCtx) {
// test-user cannot get the information of root because it doesn't belong to the role // test-user cannot get the information of root because it doesn't belong to the role
expected = []string{ expected = []string{
"Error: etcdserver: permission denied", "Error: etcdserver: permission denied",
} }
if err := spawnWithExpects(append(cx.PrefixArgs(), "role", "get", "root"), expected...); err != nil { if err := spawnWithExpects(append(cx.PrefixArgs(), "role", "get", "root"), expected...); err != nil {
cx.t.Fatal(err) cx.t.Fatal(err)
@ -799,7 +799,7 @@ func authTestUserGet(cx ctlCtx) {
// test-user cannot get the information of root // test-user cannot get the information of root
expected = []string{ expected = []string{
"Error: etcdserver: permission denied", "Error: etcdserver: permission denied",
} }
if err := spawnWithExpects(append(cx.PrefixArgs(), "user", "get", "root"), expected...); err != nil { if err := spawnWithExpects(append(cx.PrefixArgs(), "user", "get", "root"), expected...); err != nil {
cx.t.Fatal(err) cx.t.Fatal(err)

2
etcdctl/ctlv3/command/error.go
View File

@ -34,7 +34,7 @@ const (
) )
func ExitWithError(code int, err error) { func ExitWithError(code int, err error) {
fmt.Fprintln(os.Stderr, "Error: ", err) fmt.Fprintln(os.Stderr, "Error:", err)
if cerr, ok := err.(*client.ClusterError); ok { if cerr, ok := err.(*client.ClusterError); ok {
fmt.Fprintln(os.Stderr, cerr.Detail()) fmt.Fprintln(os.Stderr, cerr.Detail())
} }