[patch release v1.9.3] Update fleet struct

Author: mhmdiaa

cmd/execute/execute.go

@@ -101,22 +101,11 @@ var ExecuteCmd = &cobra.Command{
 					fmt.Printf("Error: %s\n", err)
 					os.Exit(1)
 				}
-
-				if len(fleet.Machines) == 3 {
-					// 3 types of machines: small, medium, and large
-					executionMachines = machines
-
-					if machines.Default != nil {
-						fmt.Printf("Error: you need to use the small-medium-large format to specify the numbers of machines (e.g. 1-2-3)")
-						os.Exit(1)
-					}
-				} else {
-					// 1 type of machine
-					executionMachines, err = handleSingleMachineType(*fleet, machines)
-					if err != nil {
-						fmt.Printf("Error: %s\n", err)
-						os.Exit(1)
-					}
+				// 1 type of machine
+				executionMachines, err = handleSingleMachineType(*fleet, machines)
+				if err != nil {
+					fmt.Printf("Error: %s\n", err)
+					os.Exit(1)
 				}
 			} else {
 				executionMachines = setMachinesToMinimum(version.MaxMachines)
@@ -852,7 +841,8 @@ func readWorkflowYAMLandCreateVersion(fileName string, workflowName string, obje
 }
 
 func createToolWorkflow(wfName string, space *types.SpaceDetailed, project *types.Project, deleteProjectOnError bool,
-	tool *types.Tool, primitiveNodes map[string]*types.PrimitiveNode, machine types.Machines) *types.WorkflowVersionDetailed {
+	tool *types.Tool, primitiveNodes map[string]*types.PrimitiveNode, machine types.Machines,
+) *types.WorkflowVersionDetailed {
 	if tool == nil {
 		fmt.Println("No tool specified, couldn't create a workflow!")
 		os.Exit(0)

cmd/execute/helpers.go

@@ -98,7 +98,6 @@ func getScripts(pageSize int, search string, name string) []types.Script {
 }
 
 func createRun(versionID, fleetID uuid.UUID, watch bool, outputNodes []string, outputsDir string, useStaticIPs bool) {
-
 	run := types.CreateRun{
 		VersionID:    versionID,
 		Machines:     executionMachines,
@@ -397,28 +396,12 @@ func processInvalidInputType(newPNode, existingPNode types.PrimitiveNode) {
 
 func GetAvailableMachines(fleetName string) types.Machines {
 	hiveInfo := util.GetFleetInfo(fleetName)
+	available := hiveInfo.Machines.Inactive
 	availableMachines := types.Machines{}
-	for _, machine := range hiveInfo.Machines {
-		if machine.Name == "small" {
-			available := machine.Total - machine.Running
-			availableMachines.Small = &available
-		}
-		if machine.Name == "medium" {
-			available := machine.Total - machine.Running
-			availableMachines.Medium = &available
-		}
-		if machine.Name == "large" {
-			available := machine.Total - machine.Running
-			availableMachines.Large = &available
-		}
-		if machine.Name == "default" {
-			available := machine.Total - machine.Running
-			availableMachines.Default = &available
-		}
-		if machine.Name == "self_hosted" {
-			available := machine.Total - machine.Running
-			availableMachines.SelfHosted = &available
-		}
+	if hiveInfo.Type == "HOSTED" {
+		availableMachines.SelfHosted = &available
+	} else {
+		availableMachines.Default = &available
 	}
 	return availableMachines
 }

types/user.go

@@ -59,15 +59,11 @@ type Fleet struct {
 	Vault    uuid.UUID `json:"vault"`
 	Cluster  string    `json:"cluster"`
 	State    string    `json:"state"`
-	Machines []struct {
-		Name        string `json:"name"`
-		Description string `json:"description"`
-		Mem         string `json:"mem"`
-		CPU         string `json:"cpu"`
-		Total       int    `json:"total"`
-		Running     int    `json:"running"`
-		Up          int    `json:"up"`
-		Down        int    `json:"down"`
+	Machines struct {
+		Active   int `json:"active"`
+		Deleting int `json:"deleting"`
+		Inactive int `json:"inactive"`
+		Max      int `json:"max"`
 	} `json:"machines"`
 	CreatedDate  time.Time `json:"created_date"`
 	ModifiedDate time.Time `json:"modified_date"`