Adapt to format-output changes

Author: polldo

cli/cli.go

@@ -10,6 +10,7 @@ import (
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/iot-cloud-cli/cli/config"
 	"github.com/arduino/iot-cloud-cli/cli/device"
+	"github.com/arduino/iot-cloud-cli/cli/ota"
 	"github.com/arduino/iot-cloud-cli/cli/thing"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -31,6 +32,7 @@ func Execute() {
 	cli.AddCommand(config.NewCommand())
 	cli.AddCommand(device.NewCommand())
 	cli.AddCommand(thing.NewCommand())
+	cli.AddCommand(ota.NewCommand())
 
 	cli.PersistentFlags().BoolVarP(&cliFlags.verbose, "verbose", "v", false, "Print the logs on the standard output.")
 	cli.PersistentFlags().StringVar(&cliFlags.outputFormat, "format", "text", "The output format, can be {text|json}.")

cli/ota/upload.go

@@ -1,9 +1,12 @@
 package ota
 
 import (
-	"fmt"
+	"os"
 
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/iot-cloud-cli/command/ota"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +20,7 @@ func initUploadCommand() *cobra.Command {
 		Use:   "upload",
 		Short: "OTA upload",
 		Long:  "OTA upload on a device of Arduino IoT Cloud",
-		RunE:  runUploadCommand,
+		Run:   runUploadCommand,
 	}
 
 	uploadCommand.Flags().StringVarP(&uploadFlags.deviceID, "device-id", "d", "", "Device ID")
@@ -28,18 +31,18 @@ func initUploadCommand() *cobra.Command {
 	return uploadCommand
 }
 
-func runUploadCommand(cmd *cobra.Command, args []string) error {
-	fmt.Printf("Uploading binary %s to device %s\n", uploadFlags.file, uploadFlags.deviceID)
+func runUploadCommand(cmd *cobra.Command, args []string) {
+	logrus.Infof("Uploading binary %s to device %s", uploadFlags.file, uploadFlags.deviceID)
 
 	params := &ota.UploadParams{
 		DeviceID: uploadFlags.deviceID,
 		File:     uploadFlags.file,
 	}
 	err := ota.Upload(params)
 	if err != nil {
-		return err
+		feedback.Errorf("Error during ota upload: %v", err)
+		os.Exit(errorcodes.ErrGeneric)
 	}
 
-	fmt.Println("Upload successfully started")
-	return nil
+	logrus.Info("Upload successfully started")
 }