From a415bd31acd026de3c2899cc8bc880f57d3d2382 Mon Sep 17 00:00:00 2001 From: joel-rieke <53945260+joel-rieke@users.noreply.github.com> Date: Fri, 5 Jul 2024 12:58:50 -0700 Subject: [PATCH] Always use TRC_ENV for itdev, stage, prod as before. (#1140) --- atrium/vestibulum/trcshbase/trcsh.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/atrium/vestibulum/trcshbase/trcsh.go b/atrium/vestibulum/trcshbase/trcsh.go index b10617a30..557169c0d 100644 --- 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, ®ion, nil, deployArgLines, &trcshDriverConfig.DriverConfig) case "trcsub":