From f3f887e5352a63fc8503fd45cc459e388857d019 Mon Sep 17 00:00:00 2001
From: Michael Quigley <michael@quigley.com>
Date: Wed, 21 Sep 2022 15:09:12 -0400
Subject: [PATCH] store api endpoint in zrokdir (#47)

---
 cmd/zrok/create.go       | 2 +-
 cmd/zrok/disable.go      | 2 +-
 cmd/zrok/enable.go       | 4 ++--
 cmd/zrok/http_backend.go | 2 +-
 cmd/zrok/main.go         | 4 ++--
 zrokdir/zrokdir.go       | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/zrok/create.go b/cmd/zrok/create.go
index 7c8e348b..e6cfd60d 100644
--- a/cmd/zrok/create.go
+++ b/cmd/zrok/create.go
@@ -46,7 +46,7 @@ func (cmd *createAccountCommand) run(_ *cobra.Command, _ []string) {
 		fmt.Println("entered emails do not match... aborting!")
 	}
 
-	zrok, err := newZrokClient()
+	zrok, err := newZrokClient(apiEndpoint)
 	if err != nil {
 		panic(err)
 	}
diff --git a/cmd/zrok/disable.go b/cmd/zrok/disable.go
index 39439e68..27722ccb 100644
--- a/cmd/zrok/disable.go
+++ b/cmd/zrok/disable.go
@@ -33,7 +33,7 @@ func (cmd *disableCommand) run(_ *cobra.Command, args []string) {
 	if err != nil {
 		panic(err)
 	}
-	zrok, err := newZrokClient()
+	zrok, err := newZrokClient(env.ApiEndpoint)
 	if err != nil {
 		panic(err)
 	}
diff --git a/cmd/zrok/enable.go b/cmd/zrok/enable.go
index 4dee64db..64e97de2 100644
--- a/cmd/zrok/enable.go
+++ b/cmd/zrok/enable.go
@@ -55,7 +55,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
 		cmd.description = fmt.Sprintf("%v@%v", user.Username, hostName)
 	}
 
-	zrok, err := newZrokClient()
+	zrok, err := newZrokClient(apiEndpoint)
 	if err != nil {
 		panic(err)
 	}
@@ -69,7 +69,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
 	if err != nil {
 		panic(err)
 	}
-	if err := zrokdir.SaveEnvironment(&zrokdir.Environment{ZrokToken: token, ZitiIdentityId: resp.Payload.Identity}); err != nil {
+	if err := zrokdir.SaveEnvironment(&zrokdir.Environment{ZrokToken: token, ZitiIdentityId: resp.Payload.Identity, ApiEndpoint: apiEndpoint}); err != nil {
 		panic(err)
 	}
 	if err := zrokdir.WriteZitiIdentity("environment", resp.Payload.Cfg); err != nil {
diff --git a/cmd/zrok/http_backend.go b/cmd/zrok/http_backend.go
index 949c70fb..e571002e 100644
--- a/cmd/zrok/http_backend.go
+++ b/cmd/zrok/http_backend.go
@@ -69,7 +69,7 @@ func (self *httpBackendCommand) run(_ *cobra.Command, args []string) {
 		EndpointAddress: args[0],
 	}
 
-	zrok, err := newZrokClient()
+	zrok, err := newZrokClient(env.ApiEndpoint)
 	if err != nil {
 		panic(err)
 	}
diff --git a/cmd/zrok/main.go b/cmd/zrok/main.go
index ad9f5343..9114e1b9 100644
--- a/cmd/zrok/main.go
+++ b/cmd/zrok/main.go
@@ -49,8 +49,8 @@ func main() {
 	}
 }
 
-func newZrokClient() (*rest_client_zrok.Zrok, error) {
-	apiUrl, err := url.Parse(apiEndpoint)
+func newZrokClient(endpoint string) (*rest_client_zrok.Zrok, error) {
+	apiUrl, err := url.Parse(endpoint)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", apiEndpoint)
 	}
diff --git a/zrokdir/zrokdir.go b/zrokdir/zrokdir.go
index e263a6e3..1331a199 100644
--- a/zrokdir/zrokdir.go
+++ b/zrokdir/zrokdir.go
@@ -11,6 +11,7 @@ import (
 type Environment struct {
 	ZrokToken      string `json:"zrok_token"`
 	ZitiIdentityId string `json:"ziti_identity"`
+	ApiEndpoint    string `json:"api_endpoint"`
 }
 
 func Delete() error {