From dee912f2fdb6333822a2194f428dfc7d7b5de7ab Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 30 Oct 2014 15:33:22 -0700 Subject: [PATCH] etcdctl: break out mustNewMembersAPI --- etcdctl/command/member_commands.go | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/etcdctl/command/member_commands.go b/etcdctl/command/member_commands.go index 0c8f6573e..c713fe9f8 100644 --- a/etcdctl/command/member_commands.go +++ b/etcdctl/command/member_commands.go @@ -33,18 +33,22 @@ func NewMemberCommand() cli.Command { } } -func actionMemberList(c *cli.Context) { - if len(c.Args()) != 0 { - fmt.Fprintln(os.Stderr, "No arguments accepted") - os.Exit(1) - } - +func mustNewMembersAPI(c *cli.Context) client.MembersAPI { mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout) if err != nil { fmt.Fprintln(os.Stderr, err.Error()) os.Exit(1) } + return mAPI +} + +func actionMemberList(c *cli.Context) { + if len(c.Args()) != 0 { + fmt.Fprintln(os.Stderr, "No arguments accepted") + os.Exit(1) + } + mAPI := mustNewMembersAPI(c) members, err := mAPI.List() if err != nil { fmt.Fprintln(os.Stderr, err.Error()) @@ -63,12 +67,7 @@ func actionMemberAdd(c *cli.Context) { os.Exit(1) } - mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout) - if err != nil { - fmt.Fprintln(os.Stderr, err.Error()) - os.Exit(1) - } - + mAPI := mustNewMembersAPI(c) url := args[0] m, err := mAPI.Add(url) if err != nil { @@ -86,12 +85,7 @@ func actionMemberRemove(c *cli.Context) { os.Exit(1) } - mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout) - if err != nil { - fmt.Fprintln(os.Stderr, err.Error()) - os.Exit(1) - } - + mAPI := mustNewMembersAPI(c) mID := args[0] if err := mAPI.Remove(mID); err != nil { fmt.Fprintln(os.Stderr, err.Error())