Make api endpoint configurable (#13)

* Make api endpoint configurable

* Update internal/cmd/init.go

Co-authored-by: Karan Kajla <kkajla12@users.noreply.github.com>

---------

Co-authored-by: Karan Kajla <kkajla12@users.noreply.github.com>

Author: akajla09

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.11.0
-	github.com/warrant-dev/warrant-go/v3 v3.0.1
+	github.com/warrant-dev/warrant-go/v3 v3.1.0
 )
 
 require (

go.sum

@@ -171,8 +171,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/warrant-dev/warrant-go/v3 v3.0.1 h1:80+7AlGGGkN/kSrVzg2fAAjkSwj+ga92yMjtswK3H8I=
-github.com/warrant-dev/warrant-go/v3 v3.0.1/go.mod h1:3AJyw63YkuJqy+dXwTXVOcy/HcVfTiXL2D6fEo7g07c=
+github.com/warrant-dev/warrant-go/v3 v3.1.0 h1:5WvmeOJMBwOhoi+Y6ztC20+RETeogUX7KC7Pwg4iSnE=
+github.com/warrant-dev/warrant-go/v3 v3.1.0/go.mod h1:3AJyw63YkuJqy+dXwTXVOcy/HcVfTiXL2D6fEo7g07c=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

internal/cmd/init.go

@@ -16,28 +16,42 @@ func init() {
 }
 
 type ConfigFile struct {
-	Key string `json:"key"`
+	Key         string `json:"key"`
+	ApiEndpoint string `json:"apiEndpoint"`
 }
 
 var initCmd = &cobra.Command{
 	Use:   "init",
 	Short: "Initialize the CLI for use",
-	Long:  "Initialize the CLI for use, including configuring the Warrant API key.",
+	Long:  "Initialize the CLI for use, including configuring server endpoint and API key.",
 	Example: `
 warrant init`,
 	Args: cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		fmt.Println("Please navigate to https://app.warrant.dev/account in your browser, login and retrieve your API key (prod or test) and enter it here:")
+		fmt.Println("Warrant endpoint override (leave blank to use https://api.warrant.dev default):")
 		fmt.Print("> ")
 		buf := bufio.NewReader(os.Stdin)
 		input, err := buf.ReadBytes('\n')
 		if err != nil {
 			return err
 		}
-		fmt.Println("Creating ~/.warrant.json")
+		endpoint := strings.TrimSpace(string(input))
+		if endpoint == "" {
+			endpoint = "https://api.warrant.dev"
+		}
+		fmt.Println("API Key:")
+		fmt.Print("> ")
+		buf = bufio.NewReader(os.Stdin)
+		input, err = buf.ReadBytes('\n')
+		if err != nil {
+			return err
+		}
 		key := strings.TrimSpace(string(input))
+
+		fmt.Println("Creating ~/.warrant.json")
 		config := ConfigFile{
-			Key: key,
+			ApiEndpoint: endpoint,
+			Key:         key,
 		}
 		fileContents, err := json.MarshalIndent(config, "", "    ")
 		if err != nil {

internal/config/config.go

@@ -1,17 +1,14 @@
 package config
 
 import (
-	"fmt"
-
 	"github.com/spf13/viper"
 	"github.com/warrant-dev/warrant-go/v3"
 )
 
 func InitClient() error {
-	apiKey := viper.GetString("key")
-	if apiKey == "" {
-		return fmt.Errorf("missing API key. Please run `warrant init`")
-	}
-	warrant.ApiKey = apiKey
+	warrant.ApiKey = viper.GetString("key")
+	endpoint := viper.GetString("apiEndpoint")
+	warrant.ApiEndpoint = endpoint
+	warrant.AuthorizeEndpoint = endpoint
 	return nil
 }