Move above config settings (#1115)

trimble-oss · Jun 26, 2024 · 84031d3 · 84031d3
1 parent 3c96eda
commit 84031d3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/atrium/vestibulum/trcshbase/trcsh.go b/atrium/vestibulum/trcshbase/trcsh.go
@@ -846,16 +846,6 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 			os.Exit(124)
 		}
 
-		tokenName := "config_token_" + trcshDriverConfig.DriverConfig.EnvRaw
-		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)
-		region := ""
-		if len(trcshDriverConfig.DriverConfig.Regions) > 0 {
-			region = trcshDriverConfig.DriverConfig.Regions[0]
-		}
-
 		if projectServicePtr != "" {
 			fmt.Println("Trcsh - Attempting to fetch templates from provided projectServicePtr: " + projectServicePtr)
 			templatePathsPtr := projectServicePtr + strings.Split(trcPath, ".")[1]
@@ -869,6 +859,16 @@ func ProcessDeploy(featherCtx *cap.FeatherContext, trcshDriverConfig *capauth.Tr
 			}
 		}
 
+		tokenName := "config_token_" + trcshDriverConfig.DriverConfig.EnvRaw
+		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)
+		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)
 		if configErr != nil {
 			fmt.Println("Preload failed.  Couldn't find required resource.")