Inlining methods in ArduinoCoreServiceImpl (part 2)

Added the calls to:

* BoardDetails

Author: cmaglie

Diff for: commands/service.go

@@ -42,11 +42,6 @@ type arduinoCoreServerImpl struct {
 	versionString string
 }
 
-// BoardDetails FIXMEDOC
-func (s *arduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetailsResponse, error) {
-	return BoardDetails(ctx, req)
-}
-
 // BoardList FIXMEDOC
 func (s *arduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardListRequest) (*rpc.BoardListResponse, error) {
 	ports, _, err := BoardList(req)

Diff for: commands/service_board_details.go

@@ -27,7 +27,7 @@ import (
 
 // BoardDetails returns all details for a board including tools and HW identifiers.
 // This command basically gather al the information and translates it into the required grpc struct properties
-func BoardDetails(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetailsResponse, error) {
+func (s *arduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetailsResponse, error) {
 	pme, release, err := instances.GetPackageManagerExplorer(req.GetInstance())
 	if err != nil {
 		return nil, err

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

@@ -18,7 +18,6 @@ package arguments
 import (
 	"context"
 
-	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/spf13/cobra"
 )
@@ -40,14 +39,14 @@ func (p *Programmer) AddToCommand(cmd *cobra.Command, srv rpc.ArduinoCoreService
 
 // String returns the programmer specified by the user, or the default programmer
 // for the given board if defined.
-func (p *Programmer) String(inst *rpc.Instance, fqbn string) string {
+func (p *Programmer) String(inst *rpc.Instance, srv rpc.ArduinoCoreServiceServer, fqbn string) string {
 	if p.programmer != "" {
 		return p.programmer
 	}
 	if inst == nil || fqbn == "" {
 		return ""
 	}
-	details, err := commands.BoardDetails(context.Background(), &rpc.BoardDetailsRequest{
+	details, err := srv.BoardDetails(context.Background(), &rpc.BoardDetailsRequest{
 		Instance: inst,
 		Fqbn:     fqbn,
 	})

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

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/internal/cli/arguments"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/cli/feedback/result"
@@ -44,7 +43,7 @@ func initDetailsCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 		Example: "  " + os.Args[0] + " board details -b arduino:avr:nano",
 		Args:    cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			runDetailsCommand(fqbn.String(), showFullDetails, listProgrammers, showProperties)
+			runDetailsCommand(srv, fqbn.String(), showFullDetails, listProgrammers, showProperties)
 		},
 	}
 
@@ -56,7 +55,7 @@ func initDetailsCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	return detailsCommand
 }
 
-func runDetailsCommand(fqbn string, showFullDetails, listProgrammers bool, showProperties arguments.ShowProperties) {
+func runDetailsCommand(srv rpc.ArduinoCoreServiceServer, fqbn string, showFullDetails, listProgrammers bool, showProperties arguments.ShowProperties) {
 	inst := instance.CreateAndInit()
 
 	logrus.Info("Executing `arduino-cli board details`")
@@ -65,7 +64,7 @@ func runDetailsCommand(fqbn string, showFullDetails, listProgrammers bool, showP
 	if err != nil {
 		feedback.Fatal(err.Error(), feedback.ErrBadArgument)
 	}
-	res, err := commands.BoardDetails(context.Background(), &rpc.BoardDetailsRequest{
+	res, err := srv.BoardDetails(context.Background(), &rpc.BoardDetailsRequest{
 		Instance:                   inst,
 		Fqbn:                       fqbn,
 		DoNotExpandBuildProperties: showPropertiesMode == arguments.ShowPropertiesUnexpanded,

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

@@ -48,8 +48,10 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 		Short:   tr("Upload the bootloader."),
 		Long:    tr("Upload the bootloader on the board using an external programmer."),
 		Example: "  " + os.Args[0] + " burn-bootloader -b arduino:avr:uno -P atmel_ice",
-		Args:    cobra.MaximumNArgs(1),
-		Run:     runBootloaderCommand,
+		Args:    cobra.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			runBootloaderCommand(srv)
+		},
 	}
 
 	fqbn.AddToCommand(burnBootloaderCommand, srv)
@@ -63,7 +65,7 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	return burnBootloaderCommand
 }
 
-func runBootloaderCommand(command *cobra.Command, args []string) {
+func runBootloaderCommand(srv rpc.ArduinoCoreServiceServer) {
 	instance := instance.CreateAndInit()
 
 	logrus.Info("Executing `arduino-cli burn-bootloader`")
@@ -81,7 +83,7 @@ func runBootloaderCommand(command *cobra.Command, args []string) {
 		Port:       discoveryPort,
 		Verbose:    verbose,
 		Verify:     verify,
-		Programmer: programmer.String(instance, fqbn.String()),
+		Programmer: programmer.String(instance, srv, fqbn.String()),
 		DryRun:     dryRun,
 	}, stdOut, stdErr); err != nil {
 		errcode := feedback.ErrGeneric

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

@@ -87,7 +87,9 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 			"  " + os.Args[0] + ` compile -b arduino:avr:uno --build-property "build.extra_flags=-DPIN=2 \"-DMY_DEFINE=\"hello world\"\"" /home/user/Arduino/MySketch` + "\n" +
 			"  " + os.Args[0] + ` compile -b arduino:avr:uno --build-property build.extra_flags=-DPIN=2 --build-property "compiler.cpp.extra_flags=\"-DSSID=\"hello world\"\"" /home/user/Arduino/MySketch` + "\n",
 		Args: cobra.MaximumNArgs(1),
-		Run:  runCompileCommand,
+		Run: func(cmd *cobra.Command, args []string) {
+			runCompileCommand(cmd, args, srv)
+		},
 	}
 
 	fqbnArg.AddToCommand(compileCommand, srv)
@@ -140,7 +142,7 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	return compileCommand
 }
 
-func runCompileCommand(cmd *cobra.Command, args []string) {
+func runCompileCommand(cmd *cobra.Command, args []string, srv rpc.ArduinoCoreServiceServer) {
 	logrus.Info("Executing `arduino-cli compile`")
 
 	if profileArg.Get() != "" {
@@ -270,7 +272,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 
 		prog := profile.GetProgrammer()
 		if prog == "" || programmer.GetProgrammer() != "" {
-			prog = programmer.String(inst, fqbn)
+			prog = programmer.String(inst, srv, fqbn)
 		}
 		if prog == "" {
 			prog = sk.GetDefaultProgrammer()

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

@@ -56,7 +56,7 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 		Example: "  " + os.Args[0] + " debug -b arduino:samd:mkr1000 -P atmel_ice /home/user/Arduino/MySketch",
 		Args:    cobra.MaximumNArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			runDebugCommand(args, &portArgs, &fqbnArg, interpreter, importDir, &programmer, printInfo, &profileArg)
+			runDebugCommand(srv, args, &portArgs, &fqbnArg, interpreter, importDir, &programmer, printInfo, &profileArg)
 		},
 	}
 
@@ -72,7 +72,7 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	return debugCommand
 }
 
-func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments.Fqbn,
+func runDebugCommand(srv rpc.ArduinoCoreServiceServer, args []string, portArgs *arguments.Port, fqbnArg *arguments.Fqbn,
 	interpreter string, importDir string, programmer *arguments.Programmer, printInfo bool, profileArg *arguments.Profile) {
 	logrus.Info("Executing `arduino-cli debug`")
 
@@ -105,7 +105,7 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments
 
 	prog := profile.GetProgrammer()
 	if prog == "" || programmer.GetProgrammer() != "" {
-		prog = programmer.String(inst, fqbn)
+		prog = programmer.String(inst, srv, fqbn)
 	}
 	if prog == "" {
 		prog = sk.GetDefaultProgrammer()

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

@@ -41,7 +41,7 @@ func newDebugCheckCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 		Short:   tr("Check if the given board/programmer combination supports debugging."),
 		Example: "  " + os.Args[0] + " debug check -b arduino:samd:mkr1000 -P atmel_ice",
 		Run: func(cmd *cobra.Command, args []string) {
-			runDebugCheckCommand(&portArgs, &fqbnArg, interpreter, &programmer)
+			runDebugCheckCommand(srv, &portArgs, &fqbnArg, interpreter, &programmer)
 		},
 	}
 	fqbnArg.AddToCommand(debugCheckCommand, srv)
@@ -51,7 +51,7 @@ func newDebugCheckCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	return debugCheckCommand
 }
 
-func runDebugCheckCommand(portArgs *arguments.Port, fqbnArg *arguments.Fqbn, interpreter string, programmerArg *arguments.Programmer) {
+func runDebugCheckCommand(srv rpc.ArduinoCoreServiceServer, portArgs *arguments.Port, fqbnArg *arguments.Fqbn, interpreter string, programmerArg *arguments.Programmer) {
 	instance := instance.CreateAndInit()
 	logrus.Info("Executing `arduino-cli debug`")
 
@@ -65,7 +65,7 @@ func runDebugCheckCommand(portArgs *arguments.Port, fqbnArg *arguments.Fqbn, int
 		Fqbn:        fqbn,
 		Port:        port,
 		Interpreter: interpreter,
-		Programmer:  programmerArg.String(instance, fqbn),
+		Programmer:  programmerArg.String(instance, srv, fqbn),
 	})
 	if err != nil {
 		feedback.FatalError(err, feedback.ErrGeneric)

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

@@ -63,7 +63,7 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 			arguments.CheckFlagsConflicts(cmd, "input-file", "input-dir")
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			runUploadCommand(args, uploadFields)
+			runUploadCommand(srv, args, uploadFields)
 		},
 	}
 
@@ -81,7 +81,7 @@ func NewCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {
 	return uploadCommand
 }
 
-func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
+func runUploadCommand(srv rpc.ArduinoCoreServiceServer, args []string, uploadFieldsArgs map[string]string) {
 	logrus.Info("Executing `arduino-cli upload`")
 
 	path := ""
@@ -176,7 +176,7 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
 
 	prog := profile.GetProgrammer()
 	if prog == "" || programmer.GetProgrammer() != "" {
-		prog = programmer.String(inst, fqbn)
+		prog = programmer.String(inst, srv, fqbn)
 	}
 	if prog == "" {
 		prog = sketch.GetDefaultProgrammer()