add buffer to FlashFirmware func to capture output for json printing

Author: umbynos

cli/certificates/flash.go

@@ -21,6 +21,7 @@ package certificates
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"

cli/firmware/flash.go

@@ -21,6 +21,7 @@ package firmware
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -201,21 +202,44 @@ func run(cmd *cobra.Command, args []string) {
 	}
 	defer f.Close()
 
-	if err := f.FlashFirmware(firmwareFile); err != nil {
+	// now flash the actual firmware
+	flasherOut := new(bytes.Buffer)
+	flasherErr := new(bytes.Buffer)
+	if feedback.GetFormat() == feedback.JSON {
+		err = f.FlashFirmware(firmwareFile, flasherOut)
+	} else {
+		err = f.FlashFirmware(firmwareFile, os.Stdout)
+	}
+	if err != nil {
 		feedback.Errorf("Error during firmware flashing: %s", err)
-		os.Exit(errorcodes.ErrGeneric)
+		flasherErr.Write([]byte(fmt.Sprintf("Error during firmware flashing: %s", err)))
 	}
 
 	// Print the results
 	feedback.PrintResult(&flashResult{
-		ProgrammerOut: programmerOut.String(),
-		ProgrammerErr: programmerErr.String(),
+		Programmer: (&ExecOutput{
+			Stdout: programmerOut.String(),
+			Stderr: programmerErr.String(),
+		}),
+		Flasher: (&ExecOutput{
+			Stdout: flasherOut.String(),
+			Stderr: flasherErr.String(),
+		}),
 	})
+	// Exit if something went wrong but after printing
+	if err != nil {
+		os.Exit(errorcodes.ErrGeneric)
+	}
 }
 
 type flashResult struct {
-	ProgrammerOut string
-	ProgrammerErr string
+	Programmer *ExecOutput `json:"programmer"`
+	Flasher    *ExecOutput `json:"flasher"`
+}
+
+type ExecOutput struct {
+	Stdout string `json:"stdout"`
+	Stderr string `json:"stderr"`
 }
 
 func (r *flashResult) Data() interface{} {

flasher/flasher.go

@@ -21,6 +21,7 @@ package flasher
 
 import (
 	"fmt"
+	"io"
 	"time"
 
 	"github.com/arduino/go-paths-helper"
@@ -48,7 +49,7 @@ func (e FlasherError) Error() string {
 }
 
 type Flasher interface {
-	FlashFirmware(firmwareFile *paths.Path) error
+	FlashFirmware(firmwareFile *paths.Path, flasherOut io.Writer) error
 	FlashCertificates(certificatePaths *paths.PathList, URLs []string) error
 	Close() error
 

flasher/nina.go

@@ -27,6 +27,7 @@ import (
 	"encoding/binary"
 	"encoding/pem"
 	"fmt"
+	"io"
 	"strconv"
 	"time"
 
@@ -64,8 +65,10 @@ type NinaFlasher struct {
 }
 
 // FlashFirmware in board connected to port using data from firmwareFile
-func (f *NinaFlasher) FlashFirmware(firmwareFile *paths.Path) error {
+func (f *NinaFlasher) FlashFirmware(firmwareFile *paths.Path, flasherOut io.Writer) error {
 	logrus.Infof("Flashing firmware %s", firmwareFile)
+	flasherOut.Write([]byte(fmt.Sprintf("Flashing firmware %s", firmwareFile)))
+	flasherOut.Write([]byte(fmt.Sprintln()))
 	if err := f.hello(); err != nil {
 		logrus.Error(err)
 		return err
@@ -91,6 +94,8 @@ func (f *NinaFlasher) FlashFirmware(firmwareFile *paths.Path) error {
 		return err
 	}
 	logrus.Infof("Flashed all the things")
+	flasherOut.Write([]byte("Flashed all the things"))
+	flasherOut.Write([]byte(fmt.Sprintln()))
 	return err //should be nil
 }
 

flasher/sara.go

@@ -21,6 +21,7 @@ package flasher
 
 import (
 	"fmt"
+	"io"
 	"strconv"
 	"strings"
 	"time"
@@ -45,8 +46,10 @@ type SaraFlasher struct {
 	payloadSize int
 }
 
-func (f *SaraFlasher) FlashFirmware(firmwareFile *paths.Path) error {
+func (f *SaraFlasher) FlashFirmware(firmwareFile *paths.Path, flasherOut io.Writer) error {
 	logrus.Infof("Flashing firmware %s", firmwareFile)
+	flasherOut.Write([]byte(fmt.Sprintf("Flashing firmware %s", firmwareFile)))
+	flasherOut.Write([]byte(fmt.Sprintln()))
 	data, err := firmwareFile.ReadFile()
 	if err != nil {
 		logrus.Error(err)
@@ -102,6 +105,8 @@ func (f *SaraFlasher) FlashFirmware(firmwareFile *paths.Path) error {
 		logrus.Error(err)
 	}
 	logrus.Infof("Flashed all the things")
+	flasherOut.Write([]byte("Flashed all the things"))
+	flasherOut.Write([]byte(fmt.Sprintln()))
 	return err //should be nil
 }
 

flasher/winc.go

@@ -27,6 +27,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"io"
 	"strconv"
 	"time"
 
@@ -59,8 +60,10 @@ type WincFlasher struct {
 	payloadSize int
 }
 
-func (f *WincFlasher) FlashFirmware(firmwareFile *paths.Path) error {
+func (f *WincFlasher) FlashFirmware(firmwareFile *paths.Path, flasherOut io.Writer) error {
 	logrus.Infof("Flashing firmware %s", firmwareFile)
+	flasherOut.Write([]byte(fmt.Sprintf("Flashing firmware %s", firmwareFile)))
+	flasherOut.Write([]byte(fmt.Sprintln()))
 	data, err := firmwareFile.ReadFile()
 	if err != nil {
 		logrus.Error(err)
@@ -72,6 +75,8 @@ func (f *WincFlasher) FlashFirmware(firmwareFile *paths.Path) error {
 		return err
 	}
 	logrus.Infof("Flashed all the things")
+	flasherOut.Write([]byte("Flashed all the things"))
+	flasherOut.Write([]byte(fmt.Sprintln()))
 	return err //should be nil
 }