envraw -> envbasis for clarification. (#1117)

trimble-oss · Jun 27, 2024 · 0455ffc · 0455ffc
1 parent 8733fe4
commit 0455ffc
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 96 deletions.
diff --git a/atrium/vestibulum/trcsh/deployutil/deployutil.go b/atrium/vestibulum/trcsh/deployutil/deployutil.go
@@ -20,24 +20,24 @@ func LoadPluginDeploymentScript(trcshDriverConfig *capauth.TrcshDriverConfig, tr
 			if deploymentAlias, deployAliasOk := trcshDriverConfig.DriverConfig.DeploymentConfig["trcpluginalias"]; deployAliasOk {
 				deployment = deploymentAlias
 			}
-			mergedEnvRaw := trcshDriverConfig.DriverConfig.EnvRaw
+			mergedEnvBasis := trcshDriverConfig.DriverConfig.EnvBasis
 			// Swapping in project root...
 			configRoleSlice := strings.Split(*trcshConfig.ConfigRole, ":")
-			tokenName := "config_token_" + trcshDriverConfig.DriverConfig.EnvRaw
+			tokenName := "config_token_" + trcshDriverConfig.DriverConfig.EnvBasis
 			readToken := ""
-			autoErr := eUtils.AutoAuth(&trcshDriverConfig.DriverConfig, &configRoleSlice[1], &configRoleSlice[0], &readToken, &tokenName, &trcshDriverConfig.DriverConfig.Env, &trcshDriverConfig.DriverConfig.VaultAddress, &mergedEnvRaw, "config.yml", false)
+			autoErr := eUtils.AutoAuth(&trcshDriverConfig.DriverConfig, &configRoleSlice[1], &configRoleSlice[0], &readToken, &tokenName, &trcshDriverConfig.DriverConfig.Env, &trcshDriverConfig.DriverConfig.VaultAddress, &mergedEnvBasis, "config.yml", false)
 			if autoErr != nil {
 				fmt.Println("Missing auth components.")
 				return nil, autoErr
 			}
 
-			mod, err := helperkv.NewModifier(trcshDriverConfig.DriverConfig.Insecure, readToken, *trcshConfig.VaultAddress, trcshDriverConfig.DriverConfig.EnvRaw, trcshDriverConfig.DriverConfig.Regions, true, trcshDriverConfig.DriverConfig.CoreConfig.Log)
+			mod, err := helperkv.NewModifier(trcshDriverConfig.DriverConfig.Insecure, readToken, *trcshConfig.VaultAddress, trcshDriverConfig.DriverConfig.EnvBasis, trcshDriverConfig.DriverConfig.Regions, true, trcshDriverConfig.DriverConfig.CoreConfig.Log)
 			if err != nil {
 				fmt.Println("Unable to obtain resources for deployment")
 				return nil, err
 			}
-			tempEnv := trcshDriverConfig.DriverConfig.EnvRaw
-			envParts := strings.Split(trcshDriverConfig.DriverConfig.EnvRaw, "-")
+			tempEnv := trcshDriverConfig.DriverConfig.EnvBasis
+			envParts := strings.Split(trcshDriverConfig.DriverConfig.EnvBasis, "-")
 			mod.Env = envParts[0]
 			fmt.Printf("Loading deployment details for %s and env %s", deployment, mod.Env)
 			deploymentConfig, err := mod.ReadData(fmt.Sprintf("super-secrets/Index/TrcVault/trcplugin/%s/Certify", deployment))
@@ -79,10 +79,10 @@ func GetDeployers(trcshDriverConfig *capauth.TrcshDriverConfig) ([]string, error
 
 	// Swapping in project root...
 	configRoleSlice := strings.Split(trcshDriverConfig.DriverConfig.AppRoleConfig, ":")
-	mergedEnvRaw := trcshDriverConfig.DriverConfig.EnvRaw
+	mergedEnvBasis := trcshDriverConfig.DriverConfig.EnvBasis
 	tokenName := "config_token_" + trcshDriverConfig.DriverConfig.Env
 	readToken := ""
-	autoErr := eUtils.AutoAuth(&trcshDriverConfig.DriverConfig, &configRoleSlice[1], &configRoleSlice[0], &readToken, &tokenName, &trcshDriverConfig.DriverConfig.Env, &trcshDriverConfig.DriverConfig.VaultAddress, &mergedEnvRaw, "config.yml", false)
+	autoErr := eUtils.AutoAuth(&trcshDriverConfig.DriverConfig, &configRoleSlice[1], &configRoleSlice[0], &readToken, &tokenName, &trcshDriverConfig.DriverConfig.Env, &trcshDriverConfig.DriverConfig.VaultAddress, &mergedEnvBasis, "config.yml", false)
 	if autoErr != nil {
 		fmt.Println("Missing auth components.")
 		return nil, autoErr
@@ -92,7 +92,7 @@ func GetDeployers(trcshDriverConfig *capauth.TrcshDriverConfig) ([]string, error
 		memprotectopts.MemProtect(nil, &readToken)
 	}
 
-	mod, err := helperkv.NewModifier(trcshDriverConfig.DriverConfig.Insecure, readToken, trcshDriverConfig.DriverConfig.VaultAddress, trcshDriverConfig.DriverConfig.EnvRaw, trcshDriverConfig.DriverConfig.Regions, true, trcshDriverConfig.DriverConfig.CoreConfig.Log)
+	mod, err := helperkv.NewModifier(trcshDriverConfig.DriverConfig.Insecure, readToken, trcshDriverConfig.DriverConfig.VaultAddress, trcshDriverConfig.DriverConfig.EnvBasis, trcshDriverConfig.DriverConfig.Regions, true, trcshDriverConfig.DriverConfig.CoreConfig.Log)
 	if mod != nil {
 		defer mod.Release()
 	}
@@ -101,7 +101,7 @@ func GetDeployers(trcshDriverConfig *capauth.TrcshDriverConfig) ([]string, error
 		trcshDriverConfig.DriverConfig.CoreConfig.Log.Println("Failure to init to vault")
 		return nil, err
 	}
-	envParts := strings.Split(trcshDriverConfig.DriverConfig.EnvRaw, "-")
+	envParts := strings.Split(trcshDriverConfig.DriverConfig.EnvBasis, "-")
 	mod.Env = envParts[0]
 
 	deploymentListData, deploymentListDataErr := mod.List("super-secrets/Index/TrcVault/trcplugin", trcshDriverConfig.DriverConfig.CoreConfig.Log)

diff --git a/atrium/vestibulum/trcsh/trcshauth/auth.go b/atrium/vestibulum/trcsh/trcshauth/auth.go
@@ -119,7 +119,7 @@ func TrcshAuth(featherCtx *cap.FeatherContext, agentConfigs *capauth.AgentConfig
 	trcshConfig := &capauth.TrcShConfig{}
 	var err error
 
-	if trcshDriverConfig.DriverConfig.EnvRaw == "staging" || trcshDriverConfig.DriverConfig.EnvRaw == "prod" || len(trcshDriverConfig.DriverConfig.TrcShellRaw) > 0 {
+	if trcshDriverConfig.DriverConfig.EnvBasis == "staging" || trcshDriverConfig.DriverConfig.EnvBasis == "prod" || len(trcshDriverConfig.DriverConfig.TrcShellRaw) > 0 {
 		dir, err := os.UserHomeDir()
 		if err != nil {
 			fmt.Println("No homedir for current user")
@@ -177,7 +177,7 @@ func TrcshAuth(featherCtx *cap.FeatherContext, agentConfigs *capauth.AgentConfig
 		trcshConfig.VaultAddress = &vAddr
 
 		trcshDriverConfig.DriverConfig.Env = env
-		trcshDriverConfig.DriverConfig.EnvRaw = env
+		trcshDriverConfig.DriverConfig.EnvBasis = env
 	}
 
 	trcshDriverConfig.DriverConfig.VaultAddress = *trcshConfig.VaultAddress

diff --git a/atrium/vestibulum/trcshbase/trcsh.go b/atrium/vestibulum/trcshbase/trcsh.go
@@ -102,7 +102,7 @@ func TrcshInitConfig(env string, region string, pathParam string, outputMemCache
 			},
 			Insecure:          true,
 			Env:               env,
-			EnvRaw:            env,
+			EnvBasis:          eUtils.GetEnvBasis(env),
 			IsShellSubProcess: false,
 			OutputMemCache:    outputMemCache,
 			MemFs: &trcshMemFs.TrcshMemFs{
@@ -493,7 +493,7 @@ func roleBasedRunner(env string,
 	*configCount -= 1
 	trcshDriverConfig.DriverConfig.AppRoleConfig = "config.yml"
 	trcshDriverConfig.DriverConfig.FileFilter = nil
-	trcshDriverConfig.DriverConfig.EnvRaw = env
+	trcshDriverConfig.DriverConfig.EnvBasis = env
 	trcshDriverConfig.DriverConfig.CoreConfig.WantCerts = false
 	trcshDriverConfig.DriverConfig.IsShellSubProcess = true
 	trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Role runner init: %s\n", control)
@@ -520,7 +520,7 @@ func roleBasedRunner(env string,
 		tokenConfig := token
 		err = trcplgtoolbase.CommonMain(&configEnv, &trcshDriverConfig.DriverConfig.VaultAddress, &tokenConfig, &gTrcshConfig.EnvContext, &configRoleSlice[1], &configRoleSlice[0], &tokenName, &region, nil, deployArgLines, trcshDriverConfig)
 	case "trcconfig":
-		if trcshDriverConfig.DriverConfig.EnvRaw == "itdev" || trcshDriverConfig.DriverConfig.EnvRaw == "staging" || trcshDriverConfig.DriverConfig.EnvRaw == "prod" ||
+		if trcshDriverConfig.DriverConfig.EnvBasis == "itdev" || trcshDriverConfig.DriverConfig.EnvBasis == "staging" || trcshDriverConfig.DriverConfig.EnvBasis == "prod" ||
 			trcshDriverConfig.DriverConfig.Env == "itdev" || trcshDriverConfig.DriverConfig.Env == "staging" || trcshDriverConfig.DriverConfig.Env == "prod" {
 			trcshDriverConfig.DriverConfig.OutputMemCache = false
 		}
@@ -557,7 +557,7 @@ func processPluginCmds(trcKubeDeploymentConfig **kube.TrcKubeConfig,
 	case "trcpub":
 		ResetModifier(&trcshDriverConfig.DriverConfig) //Resetting modifier cache to avoid token conflicts.
 		trcshDriverConfig.DriverConfig.AppRoleConfig = "configpub.yml"
-		trcshDriverConfig.DriverConfig.EnvRaw = env
+		trcshDriverConfig.DriverConfig.EnvBasis = env
 		trcshDriverConfig.DriverConfig.IsShellSubProcess = true
 
 		pubRoleSlice := strings.Split(*gTrcshConfig.PubRole, ":")
@@ -606,7 +606,7 @@ func processPluginCmds(trcKubeDeploymentConfig **kube.TrcKubeConfig,
 							}
 							continue
 						}
-						trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Auth re-loaded %s\n", trcshDriverConfig.DriverConfig.EnvRaw)
+						trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Auth re-loaded %s\n", trcshDriverConfig.DriverConfig.EnvBasis)
 					} else {
 						break
 					}
@@ -731,11 +731,11 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 	pwd, _ := os.Getwd()
 	var content []byte
 
-	if trcshDriverConfig.DriverConfig.EnvRaw == "itdev" {
+	if trcshDriverConfig.DriverConfig.EnvBasis == "itdev" {
 		trcshDriverConfig.DriverConfig.OutputMemCache = false
 	}
 	fmt.Println("Logging initialized.")
-	trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Logging initialized for env:%s\n", trcshDriverConfig.DriverConfig.EnvRaw)
+	trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Logging initialized for env:%s\n", trcshDriverConfig.DriverConfig.EnvBasis)
 
 	var err error
 	vaultAddress, err := trcshauth.TrcshVAddress(featherCtx, gAgentConfig, trcshDriverConfig)
@@ -767,7 +767,7 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 	//	Chewbacca: end scrub
 	trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Auth..")
 
-	trcshEnvRaw := trcshDriverConfig.DriverConfig.EnvRaw
+	trcshEnvBasis := trcshDriverConfig.DriverConfig.EnvBasis
 	tokenPtr := new(string)
 	authTokenEnv := "azuredeploy"
 	appRoleConfig := "deployauth"
@@ -776,7 +776,7 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 		appRoleConfig = "none"
 	}
 	authTokenName := "vault_token_azuredeploy"
-	autoErr := eUtils.AutoAuth(&trcshDriverConfig.DriverConfig, secretId, approleId, tokenPtr, &authTokenName, &authTokenEnv, &trcshDriverConfig.DriverConfig.VaultAddress, &trcshEnvRaw, appRoleConfig, false)
+	autoErr := eUtils.AutoAuth(&trcshDriverConfig.DriverConfig, secretId, approleId, tokenPtr, &authTokenName, &authTokenEnv, &trcshDriverConfig.DriverConfig.VaultAddress, &trcshEnvBasis, appRoleConfig, false)
 	if autoErr != nil || tokenPtr == nil || *tokenPtr == "" {
 		fmt.Println("Unable to auth.")
 		if autoErr != nil {
@@ -794,14 +794,14 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 				time.Sleep(time.Second)
 				continue
 			}
-			trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Auth re-loaded %s\n", trcshDriverConfig.DriverConfig.EnvRaw)
+			trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Auth re-loaded %s\n", trcshDriverConfig.DriverConfig.EnvBasis)
 		} else {
 			break
 		}
 	}
 	// Chewbacca: Begin dbg comment
 	mergedVaultAddress := trcshDriverConfig.DriverConfig.VaultAddress
-	mergedEnvRaw := trcshDriverConfig.DriverConfig.EnvRaw
+	mergedEnvBasis := trcshDriverConfig.DriverConfig.EnvBasis
 
 	// Chewbacca: Wipe this next section out 731-739.  Code analysis indicates it's not used.
 	if (approleId != nil && len(*approleId) == 0) || (secretId != nil && len(*secretId) == 0) {
@@ -820,10 +820,10 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 		}
 	}
 
-	if len(mergedEnvRaw) == 0 {
+	if len(mergedEnvBasis) == 0 {
 		// If in context of trcsh, utilize CToken to auth...
 		if gTrcshConfig != nil {
-			mergedEnvRaw = gTrcshConfig.EnvContext
+			mergedEnvBasis = gTrcshConfig.EnvContext
 		}
 	}
 
@@ -851,25 +851,25 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 			templatePathsPtr := projectServicePtr + strings.Split(trcPath, ".")[1]
 			trcshDriverConfig.DriverConfig.EndDir = "./trc_templates"
 
-			err := trcsubbase.CommonMain(&trcshDriverConfig.DriverConfig.Env, &mergedVaultAddress,
-				&trcshDriverConfig.DriverConfig.EnvRaw, &configRoleSlice[1], &configRoleSlice[0], nil, []string{"trcsh", "-templatePaths=" + templatePathsPtr}, &trcshDriverConfig.DriverConfig)
+			err := trcsubbase.CommonMain(&trcshDriverConfig.DriverConfig.EnvBasis, &mergedVaultAddress,
+				&mergedEnvBasis, &configRoleSlice[1], &configRoleSlice[0], nil, []string{"trcsh", "-templatePaths=" + templatePathsPtr}, &trcshDriverConfig.DriverConfig)
 			if err != nil {
 				fmt.Println("Trcsh - Failed to fetch template using projectServicePtr. " + err.Error())
 				return
 			}
 		}
 
-		tokenName := "config_token_" + trcshDriverConfig.DriverConfig.EnvRaw
+		tokenName := "config_token_" + trcshDriverConfig.DriverConfig.EnvBasis
 		trcshDriverConfig.DriverConfig.OutputMemCache = true
 		trcshDriverConfig.DriverConfig.StartDir = []string{"trc_templates"}
 		trcshDriverConfig.DriverConfig.EndDir = "."
-		trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Preloading path %s env %s\n", trcPath, trcshDriverConfig.DriverConfig.EnvRaw)
+		trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Preloading path %s env %s\n", trcPath, trcshDriverConfig.DriverConfig.EnvBasis)
 		region := ""
 		if len(trcshDriverConfig.DriverConfig.Regions) > 0 {
 			region = trcshDriverConfig.DriverConfig.Regions[0]
 		}
 
-		configErr := trcconfigbase.CommonMain(&trcshDriverConfig.DriverConfig.EnvRaw, &mergedVaultAddress, &token, &mergedEnvRaw, &configRoleSlice[1], &configRoleSlice[0], &tokenName, &region, nil, []string{"trcsh"}, &trcshDriverConfig.DriverConfig)
+		configErr := trcconfigbase.CommonMain(&trcshDriverConfig.DriverConfig.EnvBasis, &mergedVaultAddress, &token, &mergedEnvBasis, &configRoleSlice[1], &configRoleSlice[0], &tokenName, &region, nil, []string{"trcsh"}, &trcshDriverConfig.DriverConfig)
 		if configErr != nil {
 			fmt.Println("Preload failed.  Couldn't find required resource.")
 			trcshDriverConfig.DriverConfig.CoreConfig.Log.Printf("Preload Error %s\n", configErr.Error())
@@ -912,14 +912,14 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 			token = ""
 			trcshDriverConfig.DriverConfig.Token = token
 		}
-		if trcshDriverConfig.DriverConfig.EnvRaw == "itdev" || trcshDriverConfig.DriverConfig.EnvRaw == "staging" || trcshDriverConfig.DriverConfig.EnvRaw == "prod" {
+		if trcshDriverConfig.DriverConfig.EnvBasis == "itdev" || trcshDriverConfig.DriverConfig.EnvBasis == "staging" || trcshDriverConfig.DriverConfig.EnvBasis == "prod" {
 			trcshDriverConfig.DriverConfig.OutputMemCache = false
 		}
 		trcshDriverConfig.DriverConfig.CoreConfig.Log.Println("Processing trcshell")
 	} else {
 		if !strings.Contains(pwd, "TrcDeploy") || len(trcshDriverConfig.DriverConfig.DeploymentConfig) == 0 {
 			fmt.Println("Processing manual trcshell")
-			if trcshDriverConfig.DriverConfig.EnvRaw == "itdev" {
+			if trcshDriverConfig.DriverConfig.EnvBasis == "itdev" {
 				content, err = os.ReadFile(pwd + "/deploy/buildtest.trc")
 				if err != nil {
 					fmt.Println("Trcsh - Error could not find /deploy/buildtest.trc for deployment instructions")
@@ -1104,7 +1104,7 @@ collaboratorReRun:
 
 func ResetModifier(driverConfig *eUtils.DriverConfig) {
 	//Resetting modifier cache to be used again.
-	mod, err := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.EnvRaw, driverConfig.Regions, true, driverConfig.CoreConfig.Log)
+	mod, err := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.EnvBasis, driverConfig.Regions, true, driverConfig.CoreConfig.Log)
 	if err != nil {
 		eUtils.CheckError(&driverConfig.CoreConfig, err, true)
 	}

diff --git a/pkg/capauth/agentconfig.go b/pkg/capauth/agentconfig.go
@@ -297,7 +297,7 @@ func PenseQuery(trcshDriverConfig *TrcshDriverConfig, pense string) (*string, er
 	}
 	dialOptions := grpc.WithTransportCredentials(creds)
 
-	localHost, localHostErr := LocalAddr(trcshDriverConfig.DriverConfig.EnvRaw)
+	localHost, localHostErr := LocalAddr(trcshDriverConfig.DriverConfig.EnvBasis)
 	if localHostErr != nil {
 		return nil, localHostErr
 	}
@@ -312,7 +312,7 @@ func PenseQuery(trcshDriverConfig *TrcshDriverConfig, pense string) (*string, er
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
 	defer cancel()
 
-	localHostConfirm, localHostConfirmErr := LocalAddr(trcshDriverConfig.DriverConfig.EnvRaw)
+	localHostConfirm, localHostConfirmErr := LocalAddr(trcshDriverConfig.DriverConfig.EnvBasis)
 	if localHostConfirmErr != nil {
 		return nil, localHostConfirmErr
 	}

diff --git a/pkg/cli/trcconfigbase/trcconfig.go b/pkg/cli/trcconfigbase/trcconfig.go
@@ -430,7 +430,7 @@ func CommonMain(envPtr *string,
 				Token:             *tokenPtr,
 				VaultAddress:      *addrPtr,
 				Env:               *envPtr,
-				EnvRaw:            eUtils.GetRawEnv(*envPtr),
+				EnvBasis:          eUtils.GetEnvBasis(*envPtr),
 				Regions:           regions,
 				SecretMode:        *secretMode,
 				ServicesWanted:    services,
@@ -486,7 +486,7 @@ func CommonMain(envPtr *string,
 			Token:             *tokenPtr,
 			VaultAddress:      *addrPtr,
 			Env:               *envPtr,
-			EnvRaw:            eUtils.GetRawEnv(*envPtr),
+			EnvBasis:          eUtils.GetEnvBasis(*envPtr),
 			Regions:           regions,
 			SecretMode:        *secretMode,
 			ServicesWanted:    services,

diff --git a/pkg/cli/trcconfigbase/trcconfig_test.go b/pkg/cli/trcconfigbase/trcconfig_test.go
@@ -0,0 +1,29 @@
+package trcconfigbase
+
+import (
+	"flag"
+	"testing"
+
+	eUtils "github.com/trimble-oss/tierceron/pkg/utils"
+)
+
+func TestCommonMain(t *testing.T) {
+	envPtr := "test env"
+	addrPtr := "test addr"
+	tokenPtr := "test token"
+	envCtxPtr := "test envCtx"
+	secretIDPtr := "test secretID"
+	appRoleIDPtr := "test appRoleID"
+	tokenNamePtr := "test tokenName"
+	regionPtr := "test region"
+	flagset := &flag.FlagSet{}
+	argLines := []string{"arg1", "arg2"}
+	c := &eUtils.DriverConfig{} // replace with actual DriverConfig
+
+	err := CommonMain(&envPtr, &addrPtr, &tokenPtr, &envCtxPtr, &secretIDPtr, &appRoleIDPtr, &tokenNamePtr, &regionPtr, flagset, argLines, c)
+	if err != nil {
+		t.Fatalf("Expected no error, got %v", err)
+	}
+
+	// Add assertions here based on the expected behavior of CommonMain
+}
diff --git a/pkg/cli/trcconfigbase/utils/configinator.go b/pkg/cli/trcconfigbase/utils/configinator.go
@@ -26,7 +26,7 @@ func GenerateConfigsFromVault(ctx eUtils.ProcessContext, configCtx *eUtils.Confi
 		Reset = ""
 		Cyan = ""
 	}*/
-	modCheck, err := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.EnvRaw, driverConfig.Regions, true, driverConfig.CoreConfig.Log)
+	modCheck, err := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.EnvBasis, driverConfig.Regions, true, driverConfig.CoreConfig.Log)
 	modCheck.Env = driverConfig.Env
 	version := ""
 	if err != nil {
@@ -52,7 +52,7 @@ func GenerateConfigsFromVault(ctx eUtils.ProcessContext, configCtx *eUtils.Confi
 	}
 	versionData := make(map[string]interface{})
 	if driverConfig.Token != "novault" {
-		if valid, baseDesiredPolicy, errValidateEnvironment := modCheck.ValidateEnvironment(modCheck.RawEnv, false, "", driverConfig.CoreConfig.Log); errValidateEnvironment != nil || !valid {
+		if valid, baseDesiredPolicy, errValidateEnvironment := modCheck.ValidateEnvironment(modCheck.EnvBasis, false, "", driverConfig.CoreConfig.Log); errValidateEnvironment != nil || !valid {
 			if errValidateEnvironment != nil {
 				if urlErr, urlErrOk := errValidateEnvironment.(*url.Error); urlErrOk {
 					if _, sErrOk := urlErr.Err.(*tls.CertificateVerificationError); sErrOk {
@@ -61,7 +61,7 @@ func GenerateConfigsFromVault(ctx eUtils.ProcessContext, configCtx *eUtils.Confi
 				}
 			}
 
-			if unrestrictedValid, desiredPolicy, errValidateUnrestrictedEnvironment := modCheck.ValidateEnvironment(modCheck.RawEnv, false, "_unrestricted", driverConfig.CoreConfig.Log); errValidateUnrestrictedEnvironment != nil || !unrestrictedValid {
+			if unrestrictedValid, desiredPolicy, errValidateUnrestrictedEnvironment := modCheck.ValidateEnvironment(modCheck.EnvBasis, false, "_unrestricted", driverConfig.CoreConfig.Log); errValidateUnrestrictedEnvironment != nil || !unrestrictedValid {
 				return nil, eUtils.LogAndSafeExit(&driverConfig.CoreConfig, fmt.Sprintf("Mismatched token for requested environment: %s base policy: %s policy: %s", driverConfig.Env, baseDesiredPolicy, desiredPolicy), 1)
 			}
 		}
@@ -219,7 +219,7 @@ func GenerateConfigsFromVault(ctx eUtils.ProcessContext, configCtx *eUtils.Confi
 		go func(i int, templatePath string, version string, versionData map[string]interface{}) error {
 			defer wg.Done()
 
-			mod, _ := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.EnvRaw, driverConfig.Regions, true, driverConfig.CoreConfig.Log)
+			mod, _ := helperkv.NewModifier(driverConfig.Insecure, driverConfig.Token, driverConfig.VaultAddress, driverConfig.EnvBasis, driverConfig.Regions, true, driverConfig.CoreConfig.Log)
 			mod.Env = driverConfig.Env
 			mod.Version = version
 			//check for template_files directory here