Fix machine config parsing

trickest · Jul 25, 2024 · cc2d8d1 · cc2d8d1
1 parent 7a92add
commit cc2d8d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cmd/execute/config.go b/cmd/execute/config.go
@@ -586,7 +586,7 @@ func readConfigMachines(config *map[string]interface{}, isTool bool, maximumMach
 			} else if isLarge {
 				execMachines.Large = numberOfMachines
 			} else if isDefault {
-				execMachines.Default = maximumMachines.Default
+				execMachines.Default = numberOfMachines
 			}
 
 		}

diff --git a/cmd/execute/execute.go b/cmd/execute/execute.go
@@ -983,9 +983,7 @@ func prepareForExec(objectPath string) *types.WorkflowVersionDetailed {
 	if workflow != nil && newWorkflowName == "" {
 		// Executing an existing workflow
 		wfVersion = GetLatestWorkflowVersion(workflow.ID, fleet.ID)
-		if configFile == "" {
-			executionMachines = wfVersion.MaxMachines
-		} else {
+		if configFile != "" {
 			update, updatedWfVersion, newPrimitiveNodes := readConfig(configFile, wfVersion, nil)
 			if update {
 				uploadFilesIfNeeded(newPrimitiveNodes)
@@ -1042,9 +1040,7 @@ func prepareForExec(objectPath string) *types.WorkflowVersionDetailed {
 					}
 					update := false
 					var updatedWfVersion *types.WorkflowVersionDetailed
-					if configFile == "" {
-						executionMachines = copiedWfVersion.MaxMachines
-					} else {
+					if configFile != "" {
 						update, updatedWfVersion, primitiveNodes = readConfig(configFile, copiedWfVersion, nil)
 					}