Remove some direct access to sketch.Sketch

Author: cmaglie

Diff for: internal/cli/arguments/fqbn.go

@@ -19,7 +19,6 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/arduino"
-	"github.com/arduino/arduino-cli/arduino/sketch"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/spf13/cobra"
@@ -70,12 +69,10 @@ func (f *Fqbn) Set(fqbn string) {
 //   - the port is not found, in this case nil is returned
 //   - the FQBN autodetection fail, in this case the function prints an error and
 //     terminates the execution
-func CalculateFQBNAndPort(portArgs *Port, fqbnArg *Fqbn, instance *rpc.Instance, sk *sketch.Sketch) (string, *rpc.Port) {
-	// TODO: REMOVE sketch.Sketch from here
-
+func CalculateFQBNAndPort(portArgs *Port, fqbnArg *Fqbn, instance *rpc.Instance, defaultFQBN, defaultAddress, defaultProtocol string) (string, *rpc.Port) {
 	fqbn := fqbnArg.String()
-	if fqbn == "" && sk != nil {
-		fqbn = sk.GetDefaultFQBN()
+	if fqbn == "" {
+		fqbn = defaultFQBN
 	}
 	if fqbn == "" {
 		if portArgs == nil || portArgs.address == "" {
@@ -88,7 +85,7 @@ func CalculateFQBNAndPort(portArgs *Port, fqbnArg *Fqbn, instance *rpc.Instance,
 		return fqbn, port
 	}
 
-	port, err := portArgs.GetPort(instance, sk)
+	port, err := portArgs.GetPort(instance, defaultAddress, defaultProtocol)
 	if err != nil {
 		feedback.Fatal(tr("Error getting port metadata: %v", err), feedback.ErrGeneric)
 	}

Diff for: internal/cli/arguments/port.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino"
 	"github.com/arduino/arduino-cli/arduino/discovery"
-	"github.com/arduino/arduino-cli/arduino/sketch"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
@@ -57,11 +56,12 @@ func (p *Port) AddToCommand(cmd *cobra.Command) {
 // This method allows will bypass the discoveries if:
 // - a nil instance is passed: in this case the plain port and protocol arguments are returned (even if empty)
 // - a protocol is specified: in this case the discoveries are not needed to autodetect the protocol.
-func (p *Port) GetPortAddressAndProtocol(instance *rpc.Instance, sk *sketch.Sketch) (string, string, error) {
+func (p *Port) GetPortAddressAndProtocol(instance *rpc.Instance, defaultAddress, defaultProtocol string) (string, string, error) {
 	if p.protocol != "" || instance == nil {
 		return p.address, p.protocol, nil
 	}
-	port, err := p.GetPort(instance, sk)
+
+	port, err := p.GetPort(instance, defaultAddress, defaultProtocol)
 	if err != nil {
 		return "", "", err
 	}
@@ -70,15 +70,13 @@ func (p *Port) GetPortAddressAndProtocol(instance *rpc.Instance, sk *sketch.Sket
 
 // GetPort returns the Port obtained by parsing command line arguments.
 // The extra metadata for the ports is obtained using the pluggable discoveries.
-func (p *Port) GetPort(instance *rpc.Instance, sk *sketch.Sketch) (*discovery.Port, error) {
-	// TODO: REMOVE sketch.Sketch from here
+func (p *Port) GetPort(instance *rpc.Instance, defaultAddress, defaultProtocol string) (*discovery.Port, error) {
 	// TODO: REMOVE discovery from here (use board.List instead)
 
 	address := p.address
 	protocol := p.protocol
-
-	if address == "" && sk != nil {
-		address, protocol = sk.GetDefaultPortAddressAndProtocol()
+	if address == "" && (defaultAddress != "" || defaultProtocol != "") {
+		address, protocol = defaultAddress, defaultProtocol
 	}
 	if address == "" {
 		// If no address is provided we assume the user is trying to upload

Diff for: internal/cli/arguments/sketch.go

@@ -43,6 +43,7 @@ func InitSketchPath(path string) (sketchPath *paths.Path) {
 }
 
 // NewSketch is a helper function useful to create a sketch instance
+// TODO: Remove this function, we should not access sketch:Sketch directly
 func NewSketch(sketchPath *paths.Path) *sketch.Sketch {
 	sketch, err := sketch.New(sketchPath)
 	if err != nil {

Diff for: internal/cli/board/attach.go

@@ -64,7 +64,9 @@ func runAttachCommand(path string, port *arguments.Port, fqbn string) {
 		Port: currentPort,
 		Fqbn: sk.GetDefaultFQBN(),
 	}
-	address, protocol, _ := port.GetPortAddressAndProtocol(nil, sk)
+
+	defaultAddress, defaultProtocol := sk.GetDefaultPortAddressAndProtocol()
+	address, protocol, _ := port.GetPortAddressAndProtocol(nil, defaultAddress, defaultProtocol)
 	if address != "" {
 		if err := sk.SetDefaultPort(address, protocol); err != nil {
 			feedback.Fatal(fmt.Sprintf("%s: %s", tr("Error saving sketch metadata"), err), feedback.ErrGeneric)

Diff for: internal/cli/burnbootloader/burnbootloader.go

@@ -67,7 +67,7 @@ func runBootloaderCommand(command *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino-cli burn-bootloader`")
 
 	// We don't need a Sketch to upload a board's bootloader
-	discoveryPort, err := port.GetPort(instance, nil)
+	discoveryPort, err := port.GetPort(instance, "", "")
 	if err != nil {
 		feedback.Fatal(tr("Error during Upload: %v", err), feedback.ErrGeneric)
 	}

Diff for: internal/cli/compile/compile.go

@@ -158,14 +158,15 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 	}
 
 	sketchPath := arguments.InitSketchPath(path)
-	sk := arguments.NewSketch(sketchPath)
-
 	inst, profile := instance.CreateAndInitWithProfile(profileArg.Get(), sketchPath)
 	if fqbnArg.String() == "" {
 		fqbnArg.Set(profile.GetFqbn())
 	}
 
-	fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, inst, sk)
+	sk := arguments.NewSketch(sketchPath)
+	defaultFQBN := sk.GetDefaultFQBN()
+	defaultAddress, defaultProtocol := sk.GetDefaultPortAddressAndProtocol()
+	fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, inst, defaultFQBN, defaultAddress, defaultProtocol)
 
 	if keysKeychain != "" || signKey != "" || encryptKey != "" {
 		arguments.CheckFlagsMandatory(cmd, "keys-keychain", "sign-key", "encrypt-key")

Diff for: internal/cli/debug/debug.go

@@ -76,7 +76,9 @@ func runDebugCommand(command *cobra.Command, args []string) {
 
 	sketchPath := arguments.InitSketchPath(path)
 	sk := arguments.NewSketch(sketchPath)
-	fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, instance, sk)
+	defaultFQBN := sk.GetDefaultFQBN()
+	defatulAddress, degaultProtocol := sk.GetDefaultPortAddressAndProtocol()
+	fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, instance, defaultFQBN, defatulAddress, degaultProtocol)
 	debugConfigRequested := &dbg.DebugConfigRequest{
 		Instance:    instance,
 		Fqbn:        fqbn,

Diff for: internal/cli/monitor/monitor.go

@@ -74,7 +74,8 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
 		quiet = true
 	}
 
-	portAddress, portProtocol, err := portArgs.GetPortAddressAndProtocol(instance, nil)
+	// TODO: Should use sketch default_port/protocol?
+	portAddress, portProtocol, err := portArgs.GetPortAddressAndProtocol(instance, "", "")
 	if err != nil {
 		feedback.FatalError(err, feedback.ErrGeneric)
 	}

Diff for: internal/cli/upload/upload.go

@@ -100,7 +100,9 @@ func runUploadCommand(command *cobra.Command, args []string) {
 		fqbnArg.Set(profile.GetFqbn())
 	}
 
-	fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, instance, sk)
+	defaultFQBN := sk.GetDefaultFQBN()
+	defaultAddress, defaultProtocol := sk.GetDefaultPortAddressAndProtocol()
+	fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, instance, defaultFQBN, defaultAddress, defaultProtocol)
 
 	userFieldRes, err := upload.SupportedUserFields(context.Background(), &rpc.SupportedUserFieldsRequest{
 		Instance: instance,