implement pass in api url for all commands

Author: gregorgololicic

cmd/account/get/get.go

@@ -13,6 +13,7 @@ func NewCmdGet(gateway gateway.IGateway, version string) *cobra.Command {
 		blockHeight int
 		filter      string
 		json        bool
+		api         string
 	)
 
 	getCmd := &cobra.Command{
@@ -23,6 +24,10 @@ func NewCmdGet(gateway gateway.IGateway, version string) *cobra.Command {
 Gets an account by address (address, balance, keys, code)`,
 		Args: cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
+			if api != "" {
+				gateway.SetAPIURL(api)
+			}
+
 			account := gateway.GetAccount(args[0])
 
 			if !json {
@@ -34,6 +39,7 @@ Gets an account by address (address, balance, keys, code)`,
 	}
 
 	getCmd.PersistentFlags().BoolVarP(&json, "json", "j", false, "show output format as JSON")
+	getCmd.PersistentFlags().StringVarP(&api, "api", "a", "", "set discovery api host on the fly only for this request")
 	getCmd.Flags().IntVarP(&blockHeight, "block-height", "b", -1, "gets an account at the given block height")
 	getCmd.Flags().StringVarP(&filter, "filter", "f", "", "filter output to show only provided field (address, balance, code, keys)")
 

gateway/gateway.go

@@ -8,6 +8,7 @@ import (
 // needed by the cli to be implemented by each gateway
 type IGateway interface {
 	GetAccount(address string) *models.Account
+	SetAPIURL(url string)
 }
 
 // CreateGateway creates a gateway from a factory

gateway/grpc.go

@@ -16,9 +16,15 @@ type GRPC struct {
 	APIURL string
 }
 
+// SetAPIURL sets the url of the discovery api
+func (g *GRPC) SetAPIURL(url string) {
+	// todo do url validation
+
+	g.APIURL = url
+}
+
 // GetAccount gets account by the address via grpc call
 func (g *GRPC) GetAccount(address string) *models.Account {
-	// todo move this to singleton for grpc and should be executed by root cmd
 	flowClient, err := client.New(g.APIURL, grpc.WithInsecure())
 
 	if err != nil {

gateway/rest.go

@@ -5,6 +5,11 @@ import "github.com/sideninja/flow-cli/models"
 // Rest possible implementation
 type Rest struct{}
 
+// SetAPIURL sets the url
+func (r *Rest) SetAPIURL(url string) {
+	// not implemented
+}
+
 // GetAccount gets account over rest api
 func (r *Rest) GetAccount(address string) *models.Account {
 	// not implemented

main.go

@@ -6,10 +6,28 @@ import (
 
 	cmd "github.com/sideninja/flow-cli/cmd"
 	"github.com/sideninja/flow-cli/gateway"
+	"github.com/spf13/viper"
 )
 
+func init() {
+	viper.SetConfigName("config")
+	viper.AddConfigPath(".")
+	viper.SetDefault("APIURL", "localhost:3569")
+
+	if err := viper.ReadInConfig(); err != nil {
+		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
+
+		} else {
+			// Config file was found but another error was produced
+		}
+	}
+}
+
 func main() {
-	gateway := gateway.CreateGateway("", "localhost:3569")
+
+	APIURL := viper.GetString("APIURL")
+
+	gateway := gateway.CreateGateway("", APIURL)
 	version := "1.0"
 
 	rootCmd := cmd.NewCmdRoot(gateway, version)