Moved a batch of function from commands/* subpackage to commands (part 5)

Author: cmaglie

commands/service_debug.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"os"
 
-	cmd "github.com/arduino/arduino-cli/commands/debug"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 )
 
@@ -44,7 +43,7 @@ func (s *ArduinoCoreServerImpl) Debug(stream rpc.ArduinoCoreService_DebugServer)
 	signalChan := make(chan os.Signal)
 	defer close(signalChan)
 	outStream := feedStreamTo(func(data []byte) { stream.Send(&rpc.DebugResponse{Data: data}) })
-	resp, debugErr := cmd.Debug(stream.Context(), req,
+	resp, debugErr := Debug(stream.Context(), req,
 		consumeStreamFrom(func() ([]byte, error) {
 			command, err := stream.Recv()
 			if command.GetSendInterrupt() {
@@ -63,12 +62,12 @@ func (s *ArduinoCoreServerImpl) Debug(stream rpc.ArduinoCoreService_DebugServer)
 
 // GetDebugConfig return metadata about a debug session
 func (s *ArduinoCoreServerImpl) GetDebugConfig(ctx context.Context, req *rpc.GetDebugConfigRequest) (*rpc.GetDebugConfigResponse, error) {
-	res, err := cmd.GetDebugConfig(ctx, req)
+	res, err := GetDebugConfig(ctx, req)
 	return res, convertErrorToRPCStatus(err)
 }
 
 // IsDebugSupported checks if debugging is supported for a given configuration
 func (s *ArduinoCoreServerImpl) IsDebugSupported(ctx context.Context, req *rpc.IsDebugSupportedRequest) (*rpc.IsDebugSupportedResponse, error) {
-	res, err := cmd.IsDebugSupported(ctx, req)
+	res, err := IsDebugSupported(ctx, req)
 	return res, convertErrorToRPCStatus(err)
 }

commands/debug/debug_info.go renamed to commands/service_debug_config.go

@@ -13,7 +13,7 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to license@arduino.cc.
 
-package debug
+package commands
 
 import (
 	"context"

commands/debug/debug.go renamed to commands/service_debug_run.go

@@ -13,7 +13,7 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to license@arduino.cc.
 
-package debug
+package commands
 
 import (
 	"context"
@@ -27,14 +27,11 @@ import (
 	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/commands/internal/instances"
 	"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
-	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 )
 
-var tr = i18n.Tr
-
 // Debug command launches a debug tool for a sketch.
 // It also implements streams routing:
 // gRPC In -> tool stdIn

commands/debug/debug_test.go renamed to commands/service_debug_test.go

@@ -12,7 +12,7 @@
 // modify or otherwise use the software for commercial activities involving the
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to license@arduino.cc.
-package debug
+package commands
 
 import (
 	"fmt"
@@ -30,10 +30,10 @@ import (
 )
 
 func TestGetCommandLine(t *testing.T) {
-	customHardware := paths.New("testdata", "custom_hardware")
-	dataDir := paths.New("testdata", "data_dir", "packages")
+	customHardware := paths.New("testdata", "debug", "custom_hardware")
+	dataDir := paths.New("testdata", "debug", "data_dir", "packages")
 	sketch := "hello"
-	sketchPath := paths.New("testdata", sketch)
+	sketchPath := paths.New("testdata", "debug", sketch)
 	require.NoError(t, sketchPath.ToAbs())
 
 	pmb := packagemanager.NewBuilder(nil, nil, nil, nil, "test")

commands/debug/testdata/custom_hardware/arduino-test/samd/boards.txt renamed to commands/testdata/debug/custom_hardware/arduino-test/samd/boards.txt

@@ -24,7 +24,6 @@ import (
 
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/commands/cmderrors"
-	"github.com/arduino/arduino-cli/commands/debug"
 	"github.com/arduino/arduino-cli/internal/cli/arguments"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/cli/feedback/table"
@@ -124,7 +123,7 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments
 
 	if printInfo {
 
-		if res, err := debug.GetDebugConfig(context.Background(), debugConfigRequested); err != nil {
+		if res, err := commands.GetDebugConfig(context.Background(), debugConfigRequested); err != nil {
 			errcode := feedback.ErrBadArgument
 			if errors.Is(err, &cmderrors.MissingProgrammerError{}) {
 				errcode = feedback.ErrMissingProgrammer
@@ -144,7 +143,7 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments
 		if err != nil {
 			feedback.FatalError(err, feedback.ErrBadArgument)
 		}
-		if _, err := debug.Debug(context.Background(), debugConfigRequested, in, out, ctrlc); err != nil {
+		if _, err := commands.Debug(context.Background(), debugConfigRequested, in, out, ctrlc); err != nil {
 			errcode := feedback.ErrGeneric
 			if errors.Is(err, &cmderrors.MissingProgrammerError{}) {
 				errcode = feedback.ErrMissingProgrammer

commands/debug/testdata/custom_hardware/arduino-test/samd/platform.txt renamed to commands/testdata/debug/custom_hardware/arduino-test/samd/platform.txt

@@ -19,7 +19,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/arduino/arduino-cli/commands/debug"
+	"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"
@@ -60,7 +60,7 @@ func runDebugCheckCommand(portArgs *arguments.Port, fqbnArg *arguments.Fqbn, int
 		feedback.FatalError(err, feedback.ErrBadArgument)
 	}
 	fqbn := fqbnArg.String()
-	resp, err := debug.IsDebugSupported(context.Background(), &rpc.IsDebugSupportedRequest{
+	resp, err := commands.IsDebugSupported(context.Background(), &rpc.IsDebugSupportedRequest{
 		Instance:    instance,
 		Fqbn:        fqbn,
 		Port:        port,