Update fleet machines data format (#137)

* Update machine keys in fleet struct

* Clean up WorkflowVersion fields

Author: mhmdiaa

pkg/trickest/run.go

@@ -180,7 +180,7 @@ func (c *Client) CreateRun(ctx context.Context, versionID uuid.UUID, machines in
 		return nil, fmt.Errorf("invalid fleet")
 	}
 
-	if len(fleet.Machines) == 0 {
+	if fleet.Machines.Max == 0 {
 		return nil, fmt.Errorf("fleet has no machines")
 	}
 
@@ -191,7 +191,7 @@ func (c *Client) CreateRun(ctx context.Context, versionID uuid.UUID, machines in
 		UseStaticIPs:        &useStaticIPs,
 	}
 
-	if fleet.Machines[0].Name == "self_hosted" {
+	if fleet.Type == FleetTypeSelfHosted {
 		run.Machines = Machines{
 			SelfHosted: &machines,
 		}

pkg/trickest/user.go

@@ -44,25 +44,28 @@ type IPAddress struct {
 	IPAddress string `json:"ip_address"`
 }
 
+type FleetType string
+
+const (
+	FleetTypeManaged    = "MANAGED"
+	FleetTypeSelfHosted = "HOSTED"
+)
+
 type Fleet struct {
 	ID       uuid.UUID `json:"id"`
 	Name     string    `json:"name"`
 	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"`
-	Type         string    `json:"type"`
+	Type         FleetType `json:"type"`
 	Default      bool      `json:"default"`
 }
 

pkg/trickest/workflow.go

@@ -42,14 +42,11 @@ type ScheduleInfo struct {
 // WorkflowVersion represents a workflow version
 type WorkflowVersion struct {
 	ID           uuid.UUID           `json:"id"`
-	Version      int                 `json:"version"`
 	WorkflowInfo uuid.UUID           `json:"workflow_info"`
 	Name         *string             `json:"name,omitempty"`
 	Description  string              `json:"description"`
-	Public       bool                `json:"public"`
 	CreatedDate  time.Time           `json:"created_date"`
 	RunCount     int                 `json:"run_count"`
-	MaxMachines  Machines            `json:"max_machines"`
 	Snapshot     bool                `json:"snapshot"`
 	Data         WorkflowVersionData `json:"data"`
 }