Use parallelism and machines integers instead of machines struct in run and schedule info structs

Author: PolovinaD

cmd/execute/helpers.go

@@ -98,9 +98,16 @@ func getScripts(pageSize int, search string, name string) []types.Script {
 }
 
 func createRun(versionID, fleetID uuid.UUID, watch bool, outputNodes []string, outputsDir string, useStaticIPs bool) {
+	parallelism := 0
+	if executionMachines.Default != nil {
+		parallelism = *executionMachines.Default
+	} else if executionMachines.SelfHosted != nil {
+		parallelism = *executionMachines.SelfHosted
+	}
+
 	run := types.CreateRun{
 		VersionID:    versionID,
-		Machines:     executionMachines,
+		Parallelism:  parallelism,
 		Fleet:        &fleetID,
 		UseStaticIPs: useStaticIPs,
 	}
@@ -135,12 +142,12 @@ func createRun(versionID, fleetID uuid.UUID, watch bool, outputNodes []string, o
 		watch = true
 	}
 	if watch {
-		WatchRun(createRunResp.ID, outputsDir, nodesToDownload, nil, false, &executionMachines, showParams)
+		WatchRun(createRunResp.ID, outputsDir, nodesToDownload, nil, false, showParams)
 	} else {
 		availableMachines := GetAvailableMachines(fleetName)
 		fmt.Println("Run successfully created! ID: " + createRunResp.ID.String())
-		fmt.Print("Machines:\n" + FormatMachines(executionMachines, false))
-		fmt.Print("\nAvailable:\n" + FormatMachines(availableMachines, false))
+		fmt.Print("Machines:\n" + FormatMachines(executionMachines, true))
+		fmt.Println("\nAvailable:\n" + FormatMachines(availableMachines, true))
 	}
 }
 
@@ -154,7 +161,6 @@ func createNewVersion(version *types.WorkflowVersionDetailed) *types.WorkflowVer
 		Description:  version.Description,
 		WorkflowInfo: version.WorkflowInfo,
 		Snapshot:     false,
-		MaxMachines:  version.MaxMachines,
 	}
 
 	data, err := json.Marshal(strippedVersion)

cmd/execute/watch.go

@@ -22,7 +22,7 @@ import (
 	"github.com/xlab/treeprint"
 )
 
-func WatchRun(runID uuid.UUID, downloadPath string, nodesToDownload []string, filesToDownload []string, timestampOnly bool, machines *types.Machines, showParameters bool) {
+func WatchRun(runID uuid.UUID, downloadPath string, nodesToDownload []string, filesToDownload []string, timestampOnly bool, showParameters bool) {
 	const fmtStr = "%-12s %v\n"
 	writer := uilive.New()
 	writer.Start()
@@ -73,7 +73,8 @@ func WatchRun(runID uuid.UUID, downloadPath string, nodesToDownload []string, fi
 		out := ""
 		out += fmt.Sprintf(fmtStr, "Name:", run.WorkflowName)
 		out += fmt.Sprintf(fmtStr, "Status:", strings.ToLower(run.Status))
-		out += fmt.Sprintf(fmtStr, "Machines:", FormatMachines(*machines, true))
+		out += fmt.Sprintf(fmtStr, "Machines:", run.Machines)
+		out += fmt.Sprintf(fmtStr, "Parallelism:", run.Parallelism)
 		out += fmt.Sprintf(fmtStr, "Created:", run.CreatedDate.In(time.Local).Format(time.RFC1123)+
 			" ("+util.FormatDuration(time.Since(run.CreatedDate))+" ago)")
 		if run.Status != "PENDING" {

cmd/get/get.go

@@ -78,7 +78,7 @@ var GetCmd = &cobra.Command{
 				output := string(data)
 				fmt.Println(output)
 			} else {
-				execute.WatchRun(*run.ID, "", []string{}, []string{}, !watch, &runs[0].Machines, showNodeParams)
+				execute.WatchRun(*run.ID, "", nil, nil, !watch, showNodeParams)
 			}
 			return
 		} else {

types/download.go

@@ -60,7 +60,6 @@ type WorkflowVersionStripped struct {
 	WorkflowInfo uuid.UUID           `json:"workflow_info"`
 	Name         *string             `json:"name,omitempty"`
 	Description  string              `json:"description"`
-	MaxMachines  Machines            `json:"max_machines"`
 	Snapshot     bool                `json:"snapshot"`
 	Data         WorkflowVersionData `json:"data"`
 }

types/execute.go

@@ -42,19 +42,19 @@ type TreeNode struct {
 }
 
 type CreateRun struct {
-	Machines     Machines   `json:"machines"`
+	Parallelism  int        `json:"parallelism"`
 	VersionID    uuid.UUID  `json:"workflow_version_info"`
 	Vault        uuid.UUID  `json:"vault"`
 	Fleet        *uuid.UUID `json:"fleet,omitempty"`
 	UseStaticIPs bool       `json:"use_static_ips"`
 }
 
 type CreateRunResponse struct {
-	ID        uuid.UUID `json:"id"`
-	Name      string    `json:"name"`
-	Machines  Machines  `json:"machines"`
-	VersionID uuid.UUID `json:"workflow_version_info"`
-	HiveInfo  uuid.UUID `json:"hive_info"`
+	ID          uuid.UUID `json:"id"`
+	Name        string    `json:"name"`
+	Parallelism int       `json:"parallelism"`
+	VersionID   uuid.UUID `json:"workflow_version_info"`
+	HiveInfo    uuid.UUID `json:"hive_info"`
 }
 
 type WorkflowYAML struct {

types/list.go

@@ -126,7 +126,7 @@ type ScheduleInfo struct {
 	Date         *time.Time `json:"date,omitempty"`
 	Workflow     string     `json:"workflow,omitempty"`
 	RepeatPeriod int        `json:"repeat_period,omitempty"`
-	Machines     *Machines  `json:"machines,omitempty"`
+	Parallelism  int        `json:"parallelism"`
 }
 
 type Parameter struct {
@@ -152,7 +152,8 @@ type Run struct {
 	ID                  *uuid.UUID `json:"id,omitempty"`
 	Name                string     `json:"name,omitempty"`
 	Status              string     `json:"status,omitempty"`
-	Machines            Machines   `json:"machines,omitempty"`
+	Machines            int        `json:"machines,omitempty"`
+	Parallelism         int        `json:"parallelism,omitempty"`
 	WorkflowVersionInfo *uuid.UUID `json:"workflow_version_info,omitempty"`
 	WorkflowInfo        *uuid.UUID `json:"workflow_info,omitempty"`
 	WorkflowName        string     `json:"workflow_name,omitempty"`