Scrub if exactly one serviceWanted provided (#1119)

* Scrub if exactly one serviceWanted provided * Assign trcPrjectService if nil * Require servicesWanted as well
trimble-oss · Jun 27, 2024 · 7175013 · 7175013
1 parent 10c4a36
commit 7175013
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/atrium/vestibulum/trcshbase/trcsh.go b/atrium/vestibulum/trcshbase/trcsh.go
@@ -308,7 +308,7 @@ func CommonMain(envPtr *string, addrPtr *string, envCtxPtr *string,
 		deploymentsShard := os.Getenv(deploymentsKey)
 
 		if len(deploymentsShard) == 0 {
-			fmt.Println("trcsh on windows requires a DEPLOYMENTS.")
+			fmt.Printf("trcsh on windows requires a %s.\n", deploymentsShard)
 			os.Exit(-1)
 		}
 

diff --git a/pkg/cli/trcconfigbase/utils/configinator.go b/pkg/cli/trcconfigbase/utils/configinator.go
@@ -75,7 +75,11 @@ func GenerateConfigsFromVault(ctx eUtils.ProcessContext, configCtx *eUtils.Confi
 	for _, startDir := range driverConfig.StartDir {
 		//get files from directory
 		tp, ep := getDirFiles(startDir, driverConfig.EndDir)
-		if trcProjectService, ok := driverConfig.DeploymentConfig["trcprojectservice"]; ok && strings.Contains(trcProjectService.(string), "/") {
+		if trcProjectService, ok := driverConfig.DeploymentConfig["trcprojectservice"]; ok && len(driverConfig.ServicesWanted) == 0 && strings.Contains(trcProjectService.(string), "/") || len(driverConfig.ServicesWanted) == 1 {
+			if trcProjectService == nil {
+				// Chewbacca: Fix duplicate /'s
+				trcProjectService = driverConfig.ServicesWanted[0]
+			}
 			epScrubbed := []string{}
 			// Do some scrubbing...
 			for _, e := range ep {