Added variable status output

Author: rjtokenring

command/ota/status.go

@@ -4,8 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cloud-cli/config"
 	otaapi "github.com/arduino/arduino-cloud-cli/internal/ota-api"
+	"gopkg.in/yaml.v3"
 )
 
 func formatOutput(wideOutput bool, status any) {
@@ -15,7 +17,7 @@ func formatOutput(wideOutput bool, status any) {
 			st.ErrorReason = ""
 			st.Sha256 = ""
 		}
-		printJson(st)
+		printOut(st, wideOutput)
 	}
 }
 
@@ -30,37 +32,78 @@ func formatOutputSlice(wideOutput bool, st []otaapi.Ota) {
 			st[i].Sha256 = ""
 		}
 	}
-	printJson(st)
+	printOut(st, wideOutput)
 }
 
-func printJson(res any) {
-	jsonRes, _ := json.MarshalIndent(res, "", "  ")
-	if jsonRes != nil {
-		fmt.Println(string(jsonRes))
+func printOut(res any, wideOutput bool) {
+	outputformat := feedback.GetFormat()
+	if outputformat == feedback.JSON || outputformat == feedback.JSONMini {
+		jsonRes, _ := json.MarshalIndent(res, "", "  ")
+		if jsonRes != nil {
+			fmt.Println(string(jsonRes))
+		}
+	}
+	if outputformat == feedback.YAML {
+		yamlRes, _ := yaml.Marshal(res)
+		if yamlRes != nil {
+			fmt.Println(string(yamlRes))
+		}
+	}
+	if outputformat == feedback.Text {
+		if st, ok := res.(otaapi.Ota); ok {
+			if wideOutput {
+				fmt.Println(st.GetWideCSVHeader())
+				fmt.Println(st.ToWideCSV())
+			} else {
+				fmt.Println(st.GetCSVHeader())
+				fmt.Println(st.ToCSV())
+			}
+		}
+		if st, ok := res.([]otaapi.Ota); ok {
+
+			for i := range st {
+				if i == 0 {
+					if wideOutput {
+						fmt.Println(st[i].GetWideCSVHeader())
+					} else {
+						fmt.Println(st[i].GetCSVHeader())
+					}
+				}
+				if wideOutput {
+					fmt.Println(st[i].ToWideCSV())
+				} else {
+					fmt.Println(st[i].ToCSV())
+				}
+			}
+		}
 	}
 }
 
 func PrintOtaStatus(otaid, device, otaidpath string, wideOutput bool, cred *config.Credentials) error {
+
+	if feedback.GetFormat() == feedback.JSONMini {
+		return fmt.Errorf("jsonmini format is not supported for this command")
+	}
+
 	otapi := otaapi.NewClient(cred)
 
-	var err error
 	if otaidpath != "" {
-	
+		// TODO: implement
 	} else if otaid != "" {
 		res, err := otapi.GetOtaStatusByOtaID(otaid)
 		if err == nil && res != nil {
 			formatOutput(wideOutput, res.Ota)
+		} else if err != nil {
+			return err
 		}
 	} else if device != "" {
 		res, err := otapi.GetOtaStatusByDeviceID(device)
 		if err == nil && res != nil {
 			formatOutputSlice(wideOutput, res.Ota)
+		} else if err != nil {
+			return err
 		}
 	}
 
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/ota-api/dto.go

@@ -17,6 +17,8 @@
 
 package otaapi
 
+import "fmt"
+
 type (
 	OtaStatusResponse struct {
 		Ota    Ota     `json:"ota"`
@@ -28,13 +30,13 @@ type (
 	}
 
 	Ota struct {
-		ID          string `json:"id,omitempty"`
-		DeviceID    string `json:"device_id,omitempty"`
-		Status      string `json:"status"`
-		StartedAt   string `json:"started_at"`
-		EndedAt     string `json:"ended_at,omitempty"`
-		ErrorReason string `json:"error_reason,omitempty"`
-		Sha256      string `json:"sha256,omitempty"`
+		ID          string `json:"id,omitempty" yaml:"id,omitempty"`
+		DeviceID    string `json:"device_id,omitempty" yaml:"device_id,omitempty"`
+		Status      string `json:"status" yaml:"status"`
+		StartedAt   string `json:"started_at" yaml:"started_at"`
+		EndedAt     string `json:"ended_at,omitempty" yaml:"ended_at,omitempty"`
+		ErrorReason string `json:"error_reason,omitempty" yaml:"error_reason,omitempty"`
+		Sha256      string `json:"sha256,omitempty" yaml:"sha256,omitempty"`
 	}
 
 	State struct {
@@ -44,3 +46,19 @@ type (
 		Timestamp string `json:"timestamp,omitempty"`
 	}
 )
+
+func (o Ota) GetWideCSVHeader() string {
+	return "id,device_id,status,started_at,ended_at,error_reason"
+}
+
+func (o Ota) ToWideCSV() string {
+	return fmt.Sprintf("%s,%s,%s,%s,%s,%s", o.ID, o.DeviceID, o.Status, o.StartedAt, o.EndedAt, o.ErrorReason)
+}
+
+func (o Ota) GetCSVHeader() string {
+	return "id,status,started_at,ended_at"
+}
+
+func (o Ota) ToCSV() string {
+	return fmt.Sprintf("%s,%s,%s,%s", o.ID, o.Status, o.StartedAt, o.EndedAt)
+}