Added sort/limit

Author: rjtokenring

cli/ota/status.go

@@ -31,6 +31,8 @@ import (
 type statusFlags struct {
 	otaID    		string
 	deviceId 		string
+	limit			int16
+	sort			string
 }
 
 func initOtaStatusCommand() *cobra.Command {
@@ -48,6 +50,8 @@ func initOtaStatusCommand() *cobra.Command {
 	}
 	uploadCommand.Flags().StringVarP(&flags.otaID, "ota-id", "o", "", "OTA ID")
 	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)")
 
 	return uploadCommand
 }
@@ -62,5 +66,5 @@ func runOtaStatusCommand(flags *statusFlags) error {
 		return fmt.Errorf("retrieving credentials: %w", err)
 	}
 
-	return ota.PrintOtaStatus(flags.otaID, flags.deviceId, cred)
+	return ota.PrintOtaStatus(flags.otaID, flags.deviceId, cred, int(flags.limit), flags.sort)
 }

command/ota/status.go

@@ -53,7 +53,7 @@ func printOut(res any) {
 	}
 }
 
-func PrintOtaStatus(otaid, device string, cred *config.Credentials) error {
+func PrintOtaStatus(otaid, 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")
@@ -72,7 +72,7 @@ func PrintOtaStatus(otaid, device string, cred *config.Credentials) error {
 			return err
 		}
 	} else if device != "" {
-		res, err := otapi.GetOtaStatusByDeviceID(device)
+		res, err := otapi.GetOtaStatusByDeviceID(device, limit, order)
 		if err == nil && res != nil {
 			formatOutputSlice(res.Ota)
 		} else if err != nil {

internal/ota-api/client.go

@@ -23,9 +23,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"sort"
 	"strings"
-	"time"
 
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
@@ -105,7 +103,7 @@ func (c *OtaApiClient) GetOtaStatusByOtaID(otaid string) (*OtaStatusResponse, er
 	return nil, err
 }
 
-func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string) (*OtaStatusByDeviceResponse, error) {
+func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string, limit int, order string) (*OtaStatusByDeviceResponse, error) {
 
 	if deviceID == "" {
 		return nil, fmt.Errorf("invalid device-id: empty")
@@ -120,6 +118,12 @@ func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string) (*OtaStatusByDevi
 	}
 
 	endpoint := c.host + "/ota/v1/ota?device_id=" + deviceID
+	if limit > 0 {
+		endpoint += "&limit=" + fmt.Sprintf("%d", limit)
+	}
+	if order != "" && (order == "asc" || order == "desc") {
+		endpoint += "&order=" + order
+	}
 	res, err := c.performGetRequest(endpoint, userRequestToken.AccessToken)
 	if err != nil {
 		return nil, err
@@ -136,6 +140,7 @@ func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string) (*OtaStatusByDevi
 			}
 		}
 
+		/*
 		if len(otaResponse.Ota) > 0 {
 			// Sort output by StartedAt
 			sort.Slice(otaResponse.Ota, func(i, j int) bool {
@@ -150,6 +155,7 @@ func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string) (*OtaStatusByDevi
 				return t1.After(t2)
 			})
 		}
+		*/
 		return &otaResponse, nil
 	} else if res.StatusCode == 404 || res.StatusCode == 400 {
 		return nil, fmt.Errorf("device-id %s not found", deviceID)