From d11ba7a224d8a4c257f8887e0d9949cb1933a4ce Mon Sep 17 00:00:00 2001
From: Paul Lorenz <paul.lorenz@netfoundry.io>
Date: Fri, 25 Feb 2022 21:45:46 -0500
Subject: [PATCH] Don't set envs for all commands, only set for create config
 commands

---
 ziti/cmd/ziti/cmd/create_config.go             | 11 +++--------
 ziti/cmd/ziti/cmd/create_config_controller.go  |  8 +++++++-
 ziti/cmd/ziti/cmd/create_config_environment.go |  9 ++++++++-
 ziti/cmd/ziti/cmd/create_config_router.go      |  8 +++++++-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ziti/cmd/ziti/cmd/create_config.go b/ziti/cmd/ziti/cmd/create_config.go
index ec3a9eb1e..6521abe73 100644
--- a/ziti/cmd/ziti/cmd/create_config.go
+++ b/ziti/cmd/ziti/cmd/create_config.go
@@ -165,14 +165,9 @@ func NewCmdCreateConfig() *cobra.Command {
 		},
 	}
 
-	// Get env variable data global to all config files
-	templateData := &ConfigTemplateValues{}
-	templateData.populateEnvVars()
-	templateData.populateDefaults()
-
-	cmd.AddCommand(NewCmdCreateConfigController(templateData))
-	cmd.AddCommand(NewCmdCreateConfigRouter(templateData))
-	cmd.AddCommand(NewCmdCreateConfigEnvironment(templateData))
+	cmd.AddCommand(NewCmdCreateConfigController())
+	cmd.AddCommand(NewCmdCreateConfigRouter())
+	cmd.AddCommand(NewCmdCreateConfigEnvironment())
 
 	return cmd
 }
diff --git a/ziti/cmd/ziti/cmd/create_config_controller.go b/ziti/cmd/ziti/cmd/create_config_controller.go
index ab02b25f7..7c26aa4f1 100644
--- a/ziti/cmd/ziti/cmd/create_config_controller.go
+++ b/ziti/cmd/ziti/cmd/create_config_controller.go
@@ -67,9 +67,12 @@ type CreateConfigControllerOptions struct {
 }
 
 // NewCmdCreateConfigController creates a command object for the "create" command
-func NewCmdCreateConfigController(data *ConfigTemplateValues) *cobra.Command {
+func NewCmdCreateConfigController() *cobra.Command {
 	controllerOptions := &CreateConfigControllerOptions{}
 
+	// Get env variable data global to all config files
+	data := &ConfigTemplateValues{}
+
 	cmd := &cobra.Command{
 		Use:     "controller",
 		Short:   "Create a controller config",
@@ -90,6 +93,9 @@ func NewCmdCreateConfigController(data *ConfigTemplateValues) *cobra.Command {
 				logrus.SetOutput(logOut)
 			}
 
+			data.populateEnvVars()
+			data.populateDefaults()
+
 			// Update controller specific values with configOptions passed in if the argument was provided or the value is currently blank
 			if data.Controller.Port == "" || controllerOptions.CtrlPort != constants.DefaultZitiControllerPort {
 				data.Controller.Port = controllerOptions.CtrlPort
diff --git a/ziti/cmd/ziti/cmd/create_config_environment.go b/ziti/cmd/ziti/cmd/create_config_environment.go
index d6ddfd5d9..ac5c6144a 100644
--- a/ziti/cmd/ziti/cmd/create_config_environment.go
+++ b/ziti/cmd/ziti/cmd/create_config_environment.go
@@ -110,7 +110,11 @@ type CreateConfigEnvironmentOptions struct {
 }
 
 // NewCmdCreateConfigEnvironment creates a command object for the "environment" command
-func NewCmdCreateConfigEnvironment(data *ConfigTemplateValues) *cobra.Command {
+func NewCmdCreateConfigEnvironment() *cobra.Command {
+
+	// Get env variable data global to all config files
+	data := &ConfigTemplateValues{}
+
 	environmentOptions := &CreateConfigEnvironmentOptions{
 		ConfigTemplateValues: *data,
 		EnvVariableMetaData: EnvVariableMetaData{
@@ -171,6 +175,9 @@ func NewCmdCreateConfigEnvironment(data *ConfigTemplateValues) *cobra.Command {
 		Long:    createConfigEnvironmentLong,
 		Example: createConfigEnvironmentExample,
 		PreRun: func(cmd *cobra.Command, args []string) {
+			data.populateEnvVars()
+			data.populateDefaults()
+
 			// Setup logging
 			var logOut *os.File
 			environmentOptions.OS = runtime.GOOS
diff --git a/ziti/cmd/ziti/cmd/create_config_router.go b/ziti/cmd/ziti/cmd/create_config_router.go
index 29a1fa6b7..8bb90fff2 100644
--- a/ziti/cmd/ziti/cmd/create_config_router.go
+++ b/ziti/cmd/ziti/cmd/create_config_router.go
@@ -37,9 +37,12 @@ type CreateConfigRouterOptions struct {
 }
 
 // NewCmdCreateConfigRouter creates a command object for the "router" command
-func NewCmdCreateConfigRouter(data *ConfigTemplateValues) *cobra.Command {
+func NewCmdCreateConfigRouter() *cobra.Command {
 	options := &CreateConfigRouterOptions{}
 
+	// Get env variable data global to all config files
+	data := &ConfigTemplateValues{}
+
 	cmd := &cobra.Command{
 		Use:     "router",
 		Short:   "Creates a config file for specified Router name",
@@ -58,6 +61,9 @@ func NewCmdCreateConfigRouter(data *ConfigTemplateValues) *cobra.Command {
 				logrus.SetOutput(logOut)
 			}
 
+			data.populateEnvVars()
+			data.populateDefaults()
+
 			// Update router data with options passed in
 			data.Router.Name = options.RouterName
 			SetZitiRouterIdentity(&data.Router, data.Router.Name)