From 572bfd99ff13f1b18194f907db4653df59a7b94a Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 30 Aug 2016 10:29:37 -0700 Subject: [PATCH] v2http: update function returns --- etcdserver/api/v2http/client.go | 6 +++--- etcdserver/api/v2http/client_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index 060d56f1d..c1c1d47ed 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -576,7 +576,7 @@ func parseKeyRequest(r *http.Request, clock clockwork.Clock) (etcdserverpb.Reque if _, ok := r.Form["refresh"]; ok { bv, err := getBool(r.Form, "refresh") if err != nil { - return emptyReq, etcdErr.NewRequestError( + return emptyReq, false, etcdErr.NewRequestError( etcdErr.EcodeInvalidField, "invalid value for refresh", ) @@ -585,13 +585,13 @@ func parseKeyRequest(r *http.Request, clock clockwork.Clock) (etcdserverpb.Reque if refresh != nil && *refresh { val := r.FormValue("value") if _, ok := r.Form["value"]; ok && val != "" { - return emptyReq, etcdErr.NewRequestError( + return emptyReq, false, etcdErr.NewRequestError( etcdErr.EcodeRefreshValue, `A value was provided on a refresh`, ) } if ttl == nil { - return emptyReq, etcdErr.NewRequestError( + return emptyReq, false, etcdErr.NewRequestError( etcdErr.EcodeRefreshTTLRequired, `No TTL value set`, ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index 58b9ac23d..d58153843 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -196,7 +196,7 @@ func TestBadRefreshRequest(t *testing.T) { }, } for i, tt := range tests { - got, err := parseKeyRequest(tt.in, clockwork.NewFakeClock()) + got, _, err := parseKeyRequest(tt.in, clockwork.NewFakeClock()) if err == nil { t.Errorf("#%d: unexpected nil error!", i) continue