Support for multiple ota-ids retreival

Author: rjtokenring

cli/ota/status.go

@@ -30,6 +30,7 @@ import (
 
 type statusFlags struct {
 	otaID    string
+	otaIDs   string
 	deviceId string
 	limit    int16
 	sort     string
@@ -49,6 +50,7 @@ func initOtaStatusCommand() *cobra.Command {
 		},
 	}
 	uploadCommand.Flags().StringVarP(&flags.otaID, "ota-id", "o", "", "OTA ID")
+	uploadCommand.Flags().StringVarP(&flags.otaIDs, "ota-ids", "", "", "OTA IDs (comma separated)")
 	uploadCommand.Flags().StringVarP(&flags.deviceId, "device-id", "d", "", "Device ID")
 	uploadCommand.Flags().Int16VarP(&flags.limit, "limit", "l", 10, "Output limit (default: 10)")
 	uploadCommand.Flags().StringVarP(&flags.sort, "sort", "s", "desc", "Sorting (default: desc)")
@@ -57,7 +59,7 @@ func initOtaStatusCommand() *cobra.Command {
 }
 
 func runOtaStatusCommand(flags *statusFlags) error {
-	if flags.otaID == "" && flags.deviceId == "" {
+	if flags.otaID == "" && flags.deviceId == "" && flags.otaIDs == "" {
 		return fmt.Errorf("required flag(s) \"ota-id\" or \"device-id\" or \"ota-ids\" not set")
 	}
 
@@ -66,5 +68,5 @@ func runOtaStatusCommand(flags *statusFlags) error {
 		return fmt.Errorf("retrieving credentials: %w", err)
 	}
 
-	return ota.PrintOtaStatus(flags.otaID, flags.deviceId, cred, int(flags.limit), flags.sort)
+	return ota.PrintOtaStatus(flags.otaID, flags.otaIDs, flags.deviceId, cred, int(flags.limit), flags.sort)
 }

command/ota/massupload.go

@@ -158,7 +158,7 @@ type otaUploader interface {
 }
 
 type otaStatusGetter interface {
-	GetOtaLastStatusByDeviceID(deviceID string) (*otaapi.OtaStatusByDeviceResponse, error)
+	GetOtaLastStatusByDeviceID(deviceID string) (*otaapi.OtaStatusList, error)
 }
 
 func run(ctx context.Context, uploader otaUploader, otapi otaStatusGetter, ids []string, otaFile string, expiration int) []Result {

command/ota/massupload_test.go

@@ -24,13 +24,13 @@ func (d *deviceUploaderTest) DeviceOTA(ctx context.Context, id string, file *os.
 
 type otaStatusGetterTest struct{}
 
-func (s *otaStatusGetterTest) GetOtaLastStatusByDeviceID(deviceID string) (*otaapi.OtaStatusByDeviceResponse, error) {
+func (s *otaStatusGetterTest) GetOtaLastStatusByDeviceID(deviceID string) (*otaapi.OtaStatusList, error) {
 	ota := otaapi.Ota{
 		ID:        uuid.Must(uuid.NewV4()).String(),
 		Status:    "in_progress",
 		StartedAt: "2021-09-01T12:00:00Z",
 	}
-	response := &otaapi.OtaStatusByDeviceResponse{
+	response := &otaapi.OtaStatusList{
 		Ota: []otaapi.Ota{ota},
 	}
 	return response, nil

command/ota/status.go

@@ -8,18 +8,25 @@ import (
 	otaapi "github.com/arduino/arduino-cloud-cli/internal/ota-api"
 )
 
-func PrintOtaStatus(otaid, device string, cred *config.Credentials, limit int, order string) error {
+func PrintOtaStatus(otaid, otaids, device string, cred *config.Credentials, limit int, order string) error {
 
 	if feedback.GetFormat() == feedback.JSONMini {
 		return fmt.Errorf("jsonmini format is not supported for this command")
 	}
 
 	otapi := otaapi.NewClient(cred)
 
-	if otaid != "" {
+	if otaids != "" {
+		res, err := otapi.GetOtaStatusByOtaIDs(otaids)
+		if err == nil && res != nil {
+			feedback.PrintResult(res)
+		} else if err != nil {
+			return err
+		}
+	} else if otaid != "" {
 		res, err := otapi.GetOtaStatusByOtaID(otaid, limit, order)
 		if err == nil && res != nil {
-			feedback.PrintResult(otaapi.OtaStatusPrint{
+			feedback.PrintResult(otaapi.OtaStatusDetail{
 				Ota:     res.Ota,
 				Details: res.States,
 			})

internal/ota-api/client.go

@@ -134,11 +134,33 @@ func (c *OtaApiClient) GetOtaStatusByOtaID(otaid string, limit int, order string
 	return nil, err
 }
 
-func (c *OtaApiClient) GetOtaLastStatusByDeviceID(deviceID string) (*OtaStatusByDeviceResponse, error) {
+func (c *OtaApiClient) GetOtaStatusByOtaIDs(otaids string) (*OtaStatusList, error) {
+
+	ids := strings.Split(otaids, ",")
+	if len(ids) == 0 {
+		return nil, fmt.Errorf("invalid ota-ids: empty")
+	}
+
+	returnStatus := OtaStatusList{}
+	for _, id := range ids {
+		if id != "" {
+			resp, err := c.GetOtaStatusByOtaID(id, 1, OrderDesc)
+			if err != nil {
+				return nil, err
+			}
+			returnStatus.Ota = append(returnStatus.Ota, resp.Ota)
+		}
+
+	}
+
+	return &returnStatus, nil
+}
+
+func (c *OtaApiClient) GetOtaLastStatusByDeviceID(deviceID string) (*OtaStatusList, error) {
 	return c.GetOtaStatusByDeviceID(deviceID, 1, OrderDesc)
 }
 
-func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string, limit int, order string) (*OtaStatusByDeviceResponse, error) {
+func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string, limit int, order string) (*OtaStatusList, error) {
 
 	if deviceID == "" {
 		return nil, fmt.Errorf("invalid device-id: empty")
@@ -167,7 +189,7 @@ func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string, limit int, order
 	bodyb, err := io.ReadAll(res.Body)
 
 	if res.StatusCode == 200 {
-		var otaResponse OtaStatusByDeviceResponse
+		var otaResponse OtaStatusList
 		if err == nil && bodyb != nil {
 			err = json.Unmarshal(bodyb, &otaResponse)
 			if err != nil {

internal/ota-api/dto.go

@@ -32,7 +32,7 @@ type (
 		States []State `json:"states,omitempty"`
 	}
 
-	OtaStatusByDeviceResponse struct {
+	OtaStatusList struct {
 		Ota []Ota `json:"ota"`
 	}
 
@@ -53,17 +53,17 @@ type (
 		Timestamp string `json:"timestamp,omitempty"`
 	}
 
-	OtaStatusPrint struct {
+	OtaStatusDetail struct {
 		Ota     Ota     `json:"ota"`
 		Details []State `json:"details,omitempty"`
 	}
 )
 
-func (r OtaStatusByDeviceResponse) Data() interface{} {
+func (r OtaStatusList) Data() interface{} {
 	return r.Ota
 }
 
-func (r OtaStatusByDeviceResponse) String() string {
+func (r OtaStatusList) String() string {
 	if len(r.Ota) == 0 {
 		return ""
 	}
@@ -125,11 +125,11 @@ func (r Ota) String() string {
 	return t.Render()
 }
 
-func (r OtaStatusPrint) Data() interface{} {
+func (r OtaStatusDetail) Data() interface{} {
 	return r.Ota
 }
 
-func (r OtaStatusPrint) String() string {
+func (r OtaStatusDetail) String() string {
 	if r.Ota.ID == "" {
 		return "No OTA found"
 	}