Merged together DebugConfigReq protoc type

It makes no sense to have two separate types to create a debug session
or to create a debug configuration.

Author: cmaglie

cli/debug/debug.go

@@ -78,15 +78,18 @@ func run(command *cobra.Command, args []string) {
 	}
 	sketchPath := initSketchPath(path)
 
+	debugConfigRequested := &dbg.DebugConfigReq{
+		Instance:    instance,
+		Fqbn:        fqbn,
+		SketchPath:  sketchPath.String(),
+		Port:        port,
+		Interpreter: interpreter,
+		ImportDir:   importDir,
+	}
+
 	if printInfo {
 
-		if res, err := debug.GetDebugInfo(context.Background(), &dbg.GetDebugInfoReq{
-			Instance:   instance,
-			Fqbn:       fqbn,
-			SketchPath: sketchPath.String(),
-			Port:       port,
-			ImportDir:  importDir,
-		}); err != nil {
+		if res, err := debug.GetDebugConfig(context.Background(), debugConfigRequested); err != nil {
 			feedback.Errorf("Error getting Debug info: %v", err)
 			os.Exit(errorcodes.ErrGeneric)
 		} else {
@@ -99,14 +102,7 @@ func run(command *cobra.Command, args []string) {
 		ctrlc := make(chan os.Signal, 1)
 		signal.Notify(ctrlc, os.Interrupt)
 
-		if _, err := debug.Debug(context.Background(), &dbg.DebugConfigReq{
-			Instance:    instance,
-			Fqbn:        fqbn,
-			SketchPath:  sketchPath.String(),
-			Port:        port,
-			Interpreter: interpreter,
-			ImportDir:   importDir,
-		}, os.Stdin, os.Stdout, ctrlc); err != nil {
+		if _, err := debug.Debug(context.Background(), debugConfigRequested, os.Stdin, os.Stdout, ctrlc); err != nil {
 			feedback.Errorf("Error during Debug: %v", err)
 			os.Exit(errorcodes.ErrGeneric)
 		}
@@ -130,7 +126,7 @@ func initSketchPath(sketchPath *paths.Path) *paths.Path {
 }
 
 type debugInfoResult struct {
-	info *dbg.GetDebugInfoResp
+	info *dbg.GetDebugConfigResp
 }
 
 func (r *debugInfoResult) Data() interface{} {

commands/daemon/debug.go

@@ -67,7 +67,7 @@ func (s *DebugService) Debug(stream dbg.Debug_DebugServer) error {
 	return stream.Send(resp)
 }
 
-// GetDebugInfo return metadata about a debug session
-func (s *DebugService) GetDebugInfo(ctx context.Context, req *debug.GetDebugInfoReq) (*debug.GetDebugInfoResp, error) {
-	return cmd.GetDebugInfo(ctx, req)
+// GetDebugConfig return metadata about a debug session
+func (s *DebugService) GetDebugConfig(ctx context.Context, req *debug.DebugConfigReq) (*debug.GetDebugConfigResp, error) {
+	return cmd.GetDebugConfig(ctx, req)
 }

commands/debug/debug.go

@@ -109,7 +109,7 @@ func Debug(ctx context.Context, req *dbg.DebugConfigReq, inStream io.Reader, out
 
 // getCommandLine compose a debug command represented by a core recipe
 func getCommandLine(req *dbg.DebugConfigReq, pm *packagemanager.PackageManager) ([]string, error) {
-	debugInfo, err := GetDebugInfo(context.Background(), &dbg.GetDebugInfoReq{
+	debugInfo, err := GetDebugConfig(context.Background(), &dbg.DebugConfigReq{
 		Instance:   req.GetInstance(),
 		Fqbn:       req.GetFqbn(),
 		SketchPath: req.GetSketchPath(),

commands/debug/debug_info.go

@@ -31,8 +31,8 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// GetDebugInfo returns metadata to start debugging with the specified board
-func GetDebugInfo(ctx context.Context, req *debug.GetDebugInfoReq) (*debug.GetDebugInfoResp, error) {
+// GetDebugConfig returns metadata to start debugging with the specified board
+func GetDebugConfig(ctx context.Context, req *debug.DebugConfigReq) (*debug.GetDebugConfigResp, error) {
 	pm := commands.GetPackageManager(req.GetInstance().GetId())
 
 	props, err := getDebugProperties(req, pm)
@@ -42,7 +42,7 @@ func GetDebugInfo(ctx context.Context, req *debug.GetDebugInfoReq) (*debug.GetDe
 
 	server := props.Get("server")
 	toolchain := props.Get("toolchain")
-	resp := &debug.GetDebugInfoResp{
+	resp := &debug.GetDebugConfigResp{
 		Executable:             props.Get("executable"),
 		Server:                 server,
 		ServerPath:             props.Get("server." + server + ".path"),
@@ -55,15 +55,7 @@ func GetDebugInfo(ctx context.Context, req *debug.GetDebugInfoReq) (*debug.GetDe
 	return resp, nil
 }
 
-// Target represents a target for a debug action
-type Target interface {
-	GetSketchPath() string
-	GetFqbn() string
-	GetImportDir() string
-	GetPort() string
-}
-
-func getDebugProperties(req Target, pm *packagemanager.PackageManager) (*properties.Map, error) {
+func getDebugProperties(req *debug.DebugConfigReq, pm *packagemanager.PackageManager) (*properties.Map, error) {
 	// TODO: make a generic function to extract sketch from request
 	// and remove duplication in commands/compile.go
 	if req.GetSketchPath() == "" {