Added programmer field in debug info output (#2391)

* Added `programmer` field to debug info response * Added integration test
arduino · Oct 26, 2023 · c1db8cb · c1db8cb
1 parent 5ed8d4b
commit c1db8cb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/commands/debug/debug_info.go b/commands/debug/debug_info.go
@@ -197,6 +197,7 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl
 		ToolchainPrefix:        debugProperties.Get("toolchain.prefix"),
 		ToolchainConfiguration: &toolchainConfiguration,
 		CortexDebugCustomJson:  cortexDebugCustomJson,
+		Programmer:             req.GetProgrammer(),
 	}, nil
 }
 

diff --git a/internal/cli/debug/debug.go b/internal/cli/debug/debug.go
@@ -126,6 +126,7 @@ type debugInfoResult struct {
 	ServerConfig            any    `json:"server_configuration,omitempty"`
 	SvdFile                 string `json:"svd_file,omitempty"`
 	CortexDebugCustomConfig any    `json:"cortex-debug_custom_configuration,omitempty"`
+	Programmer              string `json:"programmer"`
 }
 
 type openOcdServerConfigResult struct {
@@ -166,6 +167,7 @@ func newDebugInfoResult(info *rpc.GetDebugConfigResponse) *debugInfoResult {
 		ServerConfig:            serverConfig,
 		SvdFile:                 info.SvdFile,
 		CortexDebugCustomConfig: cortexDebugCustomConfig,
+		Programmer:              info.Programmer,
 	}
 }
 

diff --git a/internal/integrationtest/debug/debug_test.go b/internal/integrationtest/debug/debug_test.go
@@ -147,7 +147,8 @@ func testAllDebugInformation(t *testing.T, env *integrationtest.Environment, cli
 					"thb setup",
 					"c"
 				]
-			}
+			},
+			"programmer": "atmel_ice"
 		}`)
 	}
 
@@ -189,7 +190,8 @@ func testAllDebugInformation(t *testing.T, env *integrationtest.Environment, cli
 					"thb setup",
 					"c"
 				]
-			}
+			},
+			"programmer": "my_cold_ice"
 		}`)
 
 		{
@@ -211,7 +213,8 @@ func testAllDebugInformation(t *testing.T, env *integrationtest.Environment, cli
 						"single-script"
 					]
 				},
-				"svd_file": "svd-file"
+				"svd_file": "svd-file",
+				"programmer": "atmel_ice"
 			}`)
 		}
 
@@ -234,7 +237,8 @@ func testAllDebugInformation(t *testing.T, env *integrationtest.Environment, cli
 						"cold_ice_script"
 					]
 				},
-				"svd_file": "svd-file"
+				"svd_file": "svd-file",
+				"programmer": "my_cold_ice"
 			}`)
 		}
 

diff --git a/rpc/cc/arduino/cli/commands/v1/debug.pb.go b/rpc/cc/arduino/cli/commands/v1/debug.pb.go
diff --git a/rpc/cc/arduino/cli/commands/v1/debug.proto b/rpc/cc/arduino/cli/commands/v1/debug.proto
@@ -96,6 +96,8 @@ message GetDebugConfigResponse {
   string cortex_debug_custom_json = 9;
   // the SVD file to use
   string svd_file = 10;
+  // The programmer specified in the request
+  string programmer = 11;
 }
 
 // Configurations specific for the 'gcc' toolchain