Fix max machines API call (#136)

Author: mhmdiaa

cmd/execute/execute.go

@@ -199,7 +199,7 @@ func run(cfg *Config) error {
 		return fmt.Errorf("failed to get workflow version: %w", err)
 	}
 
-	workflowMaxMachines, err := client.GetWorkflowVersionMaxMachineCount(ctx, workflowVersion.ID, fleet.ID)
+	workflowMaxMachines, err := client.GetWorkflowVersionMaxMachines(ctx, workflowVersion.ID, fleet.ID)
 	if err != nil {
 		return fmt.Errorf("failed to get workflow version max machine count: %w", err)
 	}

cmd/help/help.go

@@ -242,12 +242,7 @@ func run(cfg *Config) error {
 	if err == nil {
 		maxMachines, err := client.GetWorkflowVersionMaxMachines(ctx, workflowVersion.ID, fleet.ID)
 		if err == nil {
-			if maxMachines.Default != nil {
-				versionMaxMachines = *maxMachines.Default
-			}
-			if maxMachines.SelfHosted != nil {
-				versionMaxMachines = *maxMachines.SelfHosted
-			}
+			versionMaxMachines = maxMachines
 		}
 	}
 

pkg/trickest/run.go

@@ -59,6 +59,10 @@ type Machines struct {
 	SelfHosted *int `json:"self_hosted,omitempty"`
 }
 
+type Parallelism struct {
+	Parallelism int `json:"parallelism"`
+}
+
 type RunSubJobInsights struct {
 	Total     int `json:"total"`
 	Pending   int `json:"pending"`

pkg/trickest/workflow.go

@@ -301,33 +301,17 @@ 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) (*Machines, error) {
-	var machines Machines
+func (c *Client) GetWorkflowVersionMaxMachines(ctx context.Context, versionID uuid.UUID, fleetID uuid.UUID) (int, error) {
+	var parallelism Parallelism
 	path := fmt.Sprintf("/workflow-version/%s/max-machines/?fleet=%s", versionID, fleetID)
 
-	if err := c.Hive.doJSON(ctx, http.MethodGet, path, nil, &machines); err != nil {
-		return nil, fmt.Errorf("failed to get workflow version max machines: %w", err)
-	}
-
-	return &machines, nil
-}
-
-// GetWorkflowVersionMaxMachineCount is a convenience function that retrieves the maximum machines for a workflow version as an int
-func (c *Client) GetWorkflowVersionMaxMachineCount(ctx context.Context, versionID uuid.UUID, fleetID uuid.UUID) (int, error) {
-	machines, err := c.GetWorkflowVersionMaxMachines(ctx, versionID, fleetID)
-	if err != nil {
+	if err := c.Hive.doJSON(ctx, http.MethodGet, path, nil, &parallelism); err != nil {
 		return 0, fmt.Errorf("failed to get workflow version max machines: %w", err)
 	}
-
-	if machines.Default != nil {
-		return *machines.Default, nil
-	}
-
-	if machines.SelfHosted != nil {
-		return *machines.SelfHosted, nil
+	if parallelism.Parallelism <= 0 {
+		return 0, fmt.Errorf("invalid max machines value: %d", parallelism.Parallelism)
 	}
-
-	return 0, fmt.Errorf("no max machines found for workflow version")
+	return parallelism.Parallelism, nil
 }
 
 func (c *Client) CreateWorkflowVersion(ctx context.Context, version *WorkflowVersion) (*WorkflowVersion, error) {