From f6e8b677cf4c2a57687b384fec42d95dc6c95f15 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Fri, 31 Oct 2014 11:01:34 -0700 Subject: [PATCH] client: pass httpActionDo into NewMembersAPI --- client/members.go | 11 ++--------- etcdctl/command/member_commands.go | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/client/members.go b/client/members.go index 0e7d37386..ff3ede08b 100644 --- a/client/members.go +++ b/client/members.go @@ -34,18 +34,11 @@ var ( DefaultV2MembersPrefix = "/v2/members" ) -func NewMembersAPI(tr *http.Transport, eps []string, to time.Duration) (MembersAPI, error) { - c, err := NewHTTPClient(tr, eps) - if err != nil { - return nil, err - } - - mAPI := httpMembersAPI{ +func NewMembersAPI(c httpActionDo, to time.Duration) MembersAPI { + return &httpMembersAPI{ client: c, timeout: to, } - - return &mAPI, nil } type MembersAPI interface { diff --git a/etcdctl/command/member_commands.go b/etcdctl/command/member_commands.go index 85a5ccb50..53fa08ec1 100644 --- a/etcdctl/command/member_commands.go +++ b/etcdctl/command/member_commands.go @@ -42,13 +42,13 @@ func mustNewMembersAPI(c *cli.Context) client.MembersAPI { } } - mAPI, err := client.NewMembersAPI(&http.Transport{}, peers, client.DefaultRequestTimeout) + hc, err := client.NewHTTPClient(&http.Transport{}, peers) if err != nil { fmt.Fprintln(os.Stderr, err.Error()) os.Exit(1) } - return mAPI + return client.NewMembersAPI(hc, client.DefaultRequestTimeout) } func actionMemberList(c *cli.Context) {