Always use TRC_ENV for itdev, stage, prod as before. (#1140)

trimble-oss · Jul 5, 2024 · a415bd3 · a415bd3
1 parent f2f6cb1
commit a415bd3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/atrium/vestibulum/trcshbase/trcsh.go b/atrium/vestibulum/trcshbase/trcsh.go
@@ -528,6 +528,9 @@ func roleBasedRunner(
 		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
+			// itdev, staging, and prod always key off TRC_ENV stored in trcshDriverConfig.DriverConfig.Env.
+			envDefaultPtr = trcshDriverConfig.DriverConfig.Env
+			tokenName = "config_token_" + trcshDriverConfig.DriverConfig.Env
 		}
 		err = trcconfigbase.CommonMain(&envDefaultPtr, &trcshDriverConfig.DriverConfig.VaultAddress, &tokenConfig, &gTrcshConfig.EnvContext, &configRoleSlice[1], &configRoleSlice[0], &tokenName, &region, nil, deployArgLines, &trcshDriverConfig.DriverConfig)
 	case "trcsub":