Added no-header feature in binary upload

Author: rjtokenring

cli/ota/encode.go

@@ -31,8 +31,8 @@ import (
 )
 
 type encodeBinaryFlags struct {
-	FQBN 	string
-	file    string
+	FQBN string
+	file string
 }
 
 func initEncodeBinaryCommand() *cobra.Command {
@@ -64,8 +64,8 @@ func runEncodeCommand(flags *encodeBinaryFlags) error {
 	}
 
 	params := &ota.EncodeParams{
-		FQBN: 	flags.FQBN,
-		File:   flags.file,
+		FQBN: flags.FQBN,
+		File: flags.file,
 	}
 	otafile, err := ota.Encode(context.TODO(), params, cred)
 	if err != nil {

cli/ota/massupload.go

@@ -34,11 +34,12 @@ import (
 )
 
 type massUploadFlags struct {
-	deviceIDs []string
-	tags      map[string]string
-	file      string
-	deferred  bool
-	fqbn      string
+	deviceIDs        []string
+	tags             map[string]string
+	file             string
+	deferred         bool
+	fqbn             string
+	doNotApplyHeader bool
 }
 
 func initMassUploadCommand() *cobra.Command {
@@ -64,6 +65,7 @@ func initMassUploadCommand() *cobra.Command {
 	massUploadCommand.Flags().StringVarP(&flags.file, "file", "", "", "Binary file (.bin) to be uploaded")
 	massUploadCommand.Flags().BoolVar(&flags.deferred, "deferred", false, "Perform a deferred OTA. It can take up to 1 week.")
 	massUploadCommand.Flags().StringVarP(&flags.fqbn, "fqbn", "b", "", "FQBN of the devices to update")
+	massUploadCommand.Flags().BoolVar(&flags.doNotApplyHeader, "no-header", false, "Do not apply header and compression to binary file before upload.")
 	massUploadCommand.MarkFlagRequired("file")
 	massUploadCommand.MarkFlagRequired("fqbn")
 	return massUploadCommand
@@ -73,11 +75,12 @@ func runMassUploadCommand(flags *massUploadFlags) error {
 	logrus.Infof("Uploading binary %s", flags.file)
 
 	params := &ota.MassUploadParams{
-		DeviceIDs: flags.deviceIDs,
-		Tags:      flags.tags,
-		File:      flags.file,
-		Deferred:  flags.deferred,
-		FQBN:      flags.fqbn,
+		DeviceIDs:        flags.deviceIDs,
+		Tags:             flags.tags,
+		File:             flags.file,
+		Deferred:         flags.deferred,
+		FQBN:             flags.fqbn,
+		DoNotApplyHeader: flags.doNotApplyHeader,
 	}
 
 	cred, err := config.RetrieveCredentials()

cli/ota/upload.go

@@ -31,9 +31,10 @@ import (
 )
 
 type uploadFlags struct {
-	deviceID string
-	file     string
-	deferred bool
+	deviceID         string
+	file             string
+	deferred         bool
+	doNotApplyHeader bool
 }
 
 func initUploadCommand() *cobra.Command {
@@ -52,6 +53,7 @@ func initUploadCommand() *cobra.Command {
 	uploadCommand.Flags().StringVarP(&flags.deviceID, "device-id", "d", "", "Device ID")
 	uploadCommand.Flags().StringVarP(&flags.file, "file", "", "", "Binary file (.bin) to be uploaded")
 	uploadCommand.Flags().BoolVar(&flags.deferred, "deferred", false, "Perform a deferred OTA. It can take up to 1 week.")
+	uploadCommand.Flags().BoolVar(&flags.doNotApplyHeader, "no-header", false, "Do not apply header and compression to binary file before upload.")
 	uploadCommand.MarkFlagRequired("device-id")
 	uploadCommand.MarkFlagRequired("file")
 	return uploadCommand
@@ -66,9 +68,10 @@ func runUploadCommand(flags *uploadFlags) error {
 	}
 
 	params := &ota.UploadParams{
-		DeviceID: flags.deviceID,
-		File:     flags.file,
-		Deferred: flags.deferred,
+		DeviceID:         flags.deviceID,
+		File:             flags.file,
+		Deferred:         flags.deferred,
+		DoNotApplyHeader: flags.doNotApplyHeader,
 	}
 	err = ota.Upload(context.TODO(), params, cred)
 	if err != nil {

command/ota/encode.go

@@ -26,8 +26,8 @@ import (
 )
 
 type EncodeParams struct {
-	FQBN 	 string
-	File     string
+	FQBN string
+	File string
 }
 
 // Encode command is used to encode a firmware OTA

command/ota/massupload.go

@@ -21,7 +21,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -37,11 +36,12 @@ const (
 // MassUploadParams contains the parameters needed to
 // perform a Mass OTA upload.
 type MassUploadParams struct {
-	DeviceIDs []string
-	Tags      map[string]string
-	File      string
-	Deferred  bool
-	FQBN      string
+	DeviceIDs        []string
+	Tags             map[string]string
+	File             string
+	Deferred         bool
+	DoNotApplyHeader bool
+	FQBN             string
 }
 
 // Result of an ota upload on a device.
@@ -59,17 +59,27 @@ func MassUpload(ctx context.Context, params *MassUploadParams, cred *config.Cred
 		return nil, errors.New("cannot use both DeviceIDs and Tags. only one of them should be not nil")
 	}
 
-	// Generate .ota file
-	otaDir, err := ioutil.TempDir("", "")
+	_, err := os.Stat(params.File)
 	if err != nil {
-		return nil, fmt.Errorf("%s: %w", "cannot create temporary folder", err)
+		return nil, fmt.Errorf("file %s does not exists: %w", params.File, err)
 	}
-	otaFile := filepath.Join(otaDir, "temp.ota")
-	defer os.RemoveAll(otaDir)
 
-	err = Generate(params.File, otaFile, params.FQBN)
-	if err != nil {
-		return nil, fmt.Errorf("%s: %w", "cannot generate .ota file", err)
+	// Generate .ota file
+	var otaFile string
+	if params.DoNotApplyHeader {
+		otaFile = params.File
+	} else {
+		otaDir, err := os.MkdirTemp("", "")
+		if err != nil {
+			return nil, fmt.Errorf("%s: %w", "cannot create temporary folder", err)
+		}
+		otaFile := filepath.Join(otaDir, "temp.ota")
+		defer os.RemoveAll(otaDir)
+
+		err = Generate(params.File, otaFile, params.FQBN)
+		if err != nil {
+			return nil, fmt.Errorf("%s: %w", "cannot generate .ota file", err)
+		}
 	}
 
 	iotClient, err := iot.NewClient(cred)

command/ota/upload.go

@@ -20,7 +20,6 @@ package ota
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -38,14 +37,20 @@ const (
 // UploadParams contains the parameters needed to
 // perform an OTA upload.
 type UploadParams struct {
-	DeviceID string
-	File     string
-	Deferred bool
+	DeviceID         string
+	File             string
+	Deferred         bool
+	DoNotApplyHeader bool
 }
 
 // Upload command is used to upload a firmware OTA,
 // on a device of Arduino IoT Cloud.
 func Upload(ctx context.Context, params *UploadParams, cred *config.Credentials) error {
+	_, err := os.Stat(params.File)
+	if err != nil {
+		return fmt.Errorf("file %s does not exists: %w", params.File, err)
+	}
+
 	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
@@ -56,16 +61,21 @@ func Upload(ctx context.Context, params *UploadParams, cred *config.Credentials)
 		return err
 	}
 
-	otaDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		return fmt.Errorf("%s: %w", "cannot create temporary folder", err)
-	}
-	otaFile := filepath.Join(otaDir, "temp.ota")
-	defer os.RemoveAll(otaDir)
+	var otaFile string
+	if params.DoNotApplyHeader {
+		otaFile = params.File
+	} else {
+		otaDir, err := os.MkdirTemp("", "")
+		if err != nil {
+			return fmt.Errorf("%s: %w", "cannot create temporary folder", err)
+		}
+		otaFile = filepath.Join(otaDir, "temp.ota")
+		defer os.RemoveAll(otaDir)
 
-	err = Generate(params.File, otaFile, dev.Fqbn)
-	if err != nil {
-		return fmt.Errorf("%s: %w", "cannot generate .ota file", err)
+		err = Generate(params.File, otaFile, dev.Fqbn)
+		if err != nil {
+			return fmt.Errorf("%s: %w", "cannot generate .ota file", err)
+		}
 	}
 
 	file, err := os.Open(otaFile)