Merge pull request #138 from trickest/fix/run-machines

Fix run machines data type and add parallelism

Author: PolovinaD

cmd/get/json_output.go

@@ -32,6 +32,7 @@ type JSONRun struct {
 	FleetName    string    `json:"fleet_name"`
 	UseStaticIPs bool      `json:"use_static_ips"`
 	Machines     int       `json:"machines"`
+	Parallelism  int       `json:"parallelism"`
 	IPAddresses  []string  `json:"ip_addresses"`
 
 	RunInsights *trickest.RunSubJobInsights `json:"run_insights,omitempty"`
@@ -78,6 +79,8 @@ func NewJSONRun(run *trickest.Run, subjobs []trickest.SubJob, taskGroupStatsMap
 		UseStaticIPs:        *run.UseStaticIPs,
 		IPAddresses:         run.IPAddresses,
 		RunInsights:         run.RunInsights,
+		Machines:            run.Machines,
+		Parallelism:         run.Parallelism,
 	}
 
 	if run.Status == "RUNNING" {
@@ -86,12 +89,6 @@ func NewJSONRun(run *trickest.Run, subjobs []trickest.SubJob, taskGroupStatsMap
 		jsonRun.Duration = trickest.Duration{Duration: run.CompletedDate.Sub(*run.StartedDate)}
 	}
 
-	if run.Machines.Default != nil {
-		jsonRun.Machines = *run.Machines.Default
-	} else if run.Machines.SelfHosted != nil {
-		jsonRun.Machines = *run.Machines.SelfHosted
-	}
-
 	jsonRun.SubJobs = make([]JSONSubJob, len(subjobs))
 	for i, subjob := range subjobs {
 		jsonRun.SubJobs[i] = *NewJSONSubJob(&subjob, taskGroupStatsMap)

cmd/help/help.go

@@ -7,7 +7,6 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/charmbracelet/glamour"
 	"github.com/trickest/trickest-cli/cmd/execute"
@@ -81,36 +80,14 @@ func generateHelpMarkdown(workflow *trickest.Workflow, labeledPrimitiveNodes []*
 		sb.WriteString(fmt.Sprintf("%s\n\n", workflow.Description))
 	}
 
-	runStats := []struct {
-		date     time.Time
-		machines int
-		duration time.Duration
-		url      string
-	}{}
-	for _, run := range runs {
-		machines := run.Machines.Default
-		if machines == nil {
-			machines = run.Machines.SelfHosted
-		}
-		date := *run.StartedDate
-		duration := run.CompletedDate.Sub(date)
-		runURL := fmt.Sprintf("%s?run=%s", workflowURL, run.ID)
-		runStats = append(runStats, struct {
-			date     time.Time
-			machines int
-			duration time.Duration
-			url      string
-		}{date, *machines, duration, runURL})
-	}
-
 	machineCount := defaultMachineCount
 	if maxMachines > 0 && maxMachines < defaultMachineCount {
 		machineCount = maxMachines
-	} else if len(runStats) > 0 {
+	} else if len(runs) > 0 {
 		highestMachineCount := 0
-		for _, runStat := range runStats {
-			if runStat.machines > highestMachineCount {
-				highestMachineCount = runStat.machines
+		for _, run := range runs {
+			if run.Parallelism > highestMachineCount {
+				highestMachineCount = run.Parallelism
 			}
 		}
 		machineCount = highestMachineCount
@@ -185,20 +162,20 @@ func generateHelpMarkdown(workflow *trickest.Workflow, labeledPrimitiveNodes []*
 	}
 
 	// Past runs section
-	if len(runStats) > 0 {
+	if len(runs) > 0 {
 		sb.WriteString("## Past Runs\n\n")
-		sb.WriteString("| Started at | Machines | Duration | URL |\n")
-		sb.WriteString("|------------|----------|----------|-----|\n")
-		for _, runStat := range runStats {
-			machines := runStat.machines
-			date := runStat.date.Format("2006-01-02 15:04")
-			duration := runStat.duration
+		sb.WriteString("| Started at | Parallelism | Duration | URL |\n")
+		sb.WriteString("|------------|-------------|----------|-----|\n")
+		for _, run := range runs {
+			machines := run.Parallelism
+			date := run.StartedDate.Format("2006-01-02 15:04")
+			duration := run.CompletedDate.Sub(*run.StartedDate)
 			durationStr := display.FormatDuration(duration)
-			runURL := runStat.url
+			runURL := fmt.Sprintf("%s?run=%s", workflowURL, run.ID)
 			sb.WriteString(fmt.Sprintf("| %s | %d | %s | [View](%s) |\n", date, machines, durationStr, runURL))
 		}
 		sb.WriteString("\n")
-		sb.WriteString("Use the `--machines` flag to set the number of machines to run the workflow on.\n\n")
+		sb.WriteString("Use the `--machines` flag to set the number of machines (maximum parallelism) to run the workflow on.\n\n")
 	}
 
 	// Long description (README content)

pkg/display/run/printer.go

@@ -58,7 +58,8 @@ func (p *RunPrinter) PrintAll(run *trickest.Run, subJobs []trickest.SubJob, vers
 	// Print basic run details
 	output.WriteString(p.formatKeyValue("Name", run.WorkflowName))
 	output.WriteString(p.formatKeyValue("Status", run.Status))
-	output.WriteString(p.formatKeyValue("Machines", formatMachines(run.Machines)))
+	output.WriteString(p.formatKeyValue("Machines", fmt.Sprintf("%d", run.Machines)))
+	output.WriteString(p.formatKeyValue("Parallelism", fmt.Sprintf("%d", run.Parallelism)))
 	output.WriteString(p.formatKeyValue("Fleet", run.FleetName))
 	output.WriteString("\n")
 
@@ -120,17 +121,6 @@ func (p *RunPrinter) PrintAll(run *trickest.Run, subJobs []trickest.SubJob, vers
 	fmt.Fprint(p.writer, output.String())
 }
 
-// formatMachines formats the machine allocation for the run
-func formatMachines(machines trickest.Machines) string {
-	if machines.Default != nil && *machines.Default > 0 {
-		return fmt.Sprintf("%d", *machines.Default)
-	}
-	if machines.SelfHosted != nil && *machines.SelfHosted > 0 {
-		return fmt.Sprintf("%d", *machines.SelfHosted)
-	}
-	return ""
-}
-
 // formatKeyValue formats a key-value pair with a fixed width
 func (p *RunPrinter) formatKeyValue(key, value string) string {
 	return fmt.Sprintf("%-18s %v\n", key+":", value)

pkg/trickest/run.go

@@ -16,7 +16,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"`
@@ -53,16 +54,6 @@ func (d *Duration) MarshalJSON() ([]byte, error) {
 	return json.Marshal(fmt.Sprintf("%dm %ds", seconds/60, seconds%60))
 }
 
-// Machines represents machine configuration
-type Machines struct {
-	Default    *int `json:"default,omitempty"`
-	SelfHosted *int `json:"self_hosted,omitempty"`
-}
-
-type Parallelism struct {
-	Parallelism int `json:"parallelism"`
-}
-
 type RunSubJobInsights struct {
 	Total     int `json:"total"`
 	Pending   int `json:"pending"`
@@ -189,16 +180,7 @@ func (c *Client) CreateRun(ctx context.Context, versionID uuid.UUID, machines in
 		Fleet:               &fleet.ID,
 		Vault:               &fleet.Vault,
 		UseStaticIPs:        &useStaticIPs,
-	}
-
-	if fleet.Type == FleetTypeSelfHosted {
-		run.Machines = Machines{
-			SelfHosted: &machines,
-		}
-	} else {
-		run.Machines = Machines{
-			Default: &machines,
-		}
+		Parallelism:         machines,
 	}
 
 	var createdRun Run

pkg/trickest/workflow.go

@@ -36,7 +36,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,omitempty"`
 }
 
 // WorkflowVersion represents a workflow version
@@ -299,7 +299,9 @@ func (c *Client) GetLatestWorkflowVersion(ctx context.Context, workflowID uuid.U
 
 // GetWorkflowVersionMaxMachines retrieves the maximum machines for a workflow version
 func (c *Client) GetWorkflowVersionMaxMachines(ctx context.Context, versionID uuid.UUID, fleetID uuid.UUID) (int, error) {
-	var parallelism Parallelism
+	var parallelism struct {
+		Parallelism int `json:"parallelism"`
+	}
 	path := fmt.Sprintf("/workflow-version/%s/max-machines/?fleet=%s", versionID, fleetID)
 
 	if err := c.Hive.doJSON(ctx, http.MethodGet, path, nil, &parallelism); err != nil {