Whoops, kill and test didn't use the same bridge setup logic.

abourget · May 5, 2017 · 0200795 · 0200795
1 parent 54f6ad1
commit 0200795
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 33 deletions.
diff --git a/cmd/kill.go b/cmd/kill.go
@@ -2,11 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 
-	"github.com/abourget/secrets-bridge/pkg/bridge"
-	"github.com/abourget/secrets-bridge/pkg/client"
 	"github.com/spf13/cobra"
 )
 
@@ -16,20 +13,9 @@ var killCmd = &cobra.Command{
 	Short: "Kills the remote bridge server",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		confFile := bridgeConfFilenameWithDefault()
-		bridgeConf, err := ioutil.ReadFile(confFile)
+		c, err := newClient(bridgeConf)
 		if err != nil {
-			log.Fatalln("reading %q: %s", confFile, err)
-		}
-
-		bridge, err := bridge.NewFromString(string(bridgeConf))
-		if err != nil {
-			log.Fatalln("--bridge-conf has an invalid value:", err)
-		}
-
-		c := client.NewClient(bridge)
-		if err := c.ChooseEndpoint(); err != nil {
-			log.Fatalln("error pinging server:", err)
+			log.Fatalln(err)
 		}
 
 		err = c.Quit()
@@ -43,4 +29,5 @@ var killCmd = &cobra.Command{
 
 func init() {
 	RootCmd.AddCommand(killCmd)
+	killCmd.Flags().StringVarP(&bridgeConf, "bridge-conf", "c", "", "Base64-encoded Bridge `configuration`.")
 }
diff --git a/cmd/testit.go b/cmd/testit.go
@@ -18,8 +18,6 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/abourget/secrets-bridge/pkg/bridge"
-	"github.com/abourget/secrets-bridge/pkg/client"
 	"github.com/spf13/cobra"
 )
 
@@ -29,21 +27,8 @@ var testitCmd = &cobra.Command{
 	Short: "Test connectivity to secrets bridge.",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		bridgeConf, err := cmd.Flags().GetString("bridge-conf")
-		if err != nil {
-			log.Fatalln("--bridge-conf invalid:", err)
-		}
-
-		bridge, err := bridge.NewFromString(bridgeConf)
-		if err != nil {
-			log.Fatalln("--bridge-conf has an invalid value:", err)
-		}
-
-		c := client.NewClient(bridge)
-
-		err = c.ChooseEndpoint()
-		if err != nil {
-			log.Fatalln("error pinging server:", err)
+		if _, err := newClient(bridgeConf); err != nil {
+			log.Fatalln(err)
 		}
 
 		fmt.Println("bridge server responding")
@@ -52,4 +37,5 @@ var testitCmd = &cobra.Command{
 
 func init() {
 	RootCmd.AddCommand(testitCmd)
+	testitCmd.Flags().StringVarP(&bridgeConf, "bridge-conf", "c", "", "Base64-encoded Bridge `configuration`.")
 }