Add property conversion for platform not supporting pluggable discovery

Author: silvanocerza

arduino/cores/packagemanager/loader.go

@@ -341,6 +341,9 @@ func (pm *PackageManager) loadPlatformRelease(platform *cores.PlatformRelease, p
 	// Create programmers properties
 	if programmersProperties, err := properties.SafeLoad(programmersTxtPath.String()); err == nil {
 		for programmerID, programmerProperties := range programmersProperties.FirstLevelOf() {
+			if !platform.PluggableDiscoveryAware {
+				convertUploadToolsToPluggableDiscovery(programmersProperties)
+			}
 			platform.Programmers[programmerID] = pm.loadProgrammer(programmerProperties)
 			platform.Programmers[programmerID].PlatformRelease = platform
 		}
@@ -391,12 +394,6 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
 	// set all other boards properties
 	delete(propertiesByBoard, "menu")
 
-	if !platform.PluggableDiscoveryAware {
-		for _, boardProperties := range propertiesByBoard {
-			convertVidPidIdentificationPropertiesToPluggableDiscovery(boardProperties)
-		}
-	}
-
 	skippedBoards := []string{}
 	for boardID, boardProperties := range propertiesByBoard {
 		var board *cores.Board
@@ -415,6 +412,12 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
 				goto next_board
 			}
 		}
+
+		if !platform.PluggableDiscoveryAware {
+			convertVidPidIdentificationPropertiesToPluggableDiscovery(boardProperties)
+			convertUploadToolsToPluggableDiscovery(boardProperties)
+		}
+
 		// The board's ID must be available in a board's properties since it can
 		// be used in all configuration files for several reasons, like setting compilation
 		// flags depending on the board id.
@@ -471,6 +474,22 @@ func convertVidPidIdentificationPropertiesToPluggableDiscovery(boardProperties *
 	}
 }
 
+func convertUploadToolsToPluggableDiscovery(props *properties.Map) {
+	actions := []string{"upload", "bootloader", "program"}
+	for _, action := range actions {
+		if !props.ContainsKey(fmt.Sprintf("%s.tool.default", action)) {
+			tool, found := props.GetOk(fmt.Sprintf("%s.tool", action))
+			if !found {
+				// Just skip it, ideally this must never happen but if a platform
+				// doesn't define an expected upload.tool, bootloader.tool or program.tool
+				// there will be other issues further down the road after this conversion
+				continue
+			}
+			props.Set(fmt.Sprintf("%s.tool.default", action), tool)
+		}
+	}
+}
+
 func (pm *PackageManager) loadToolsFromPackage(targetPackage *cores.Package, toolsPath *paths.Path) []*status.Status {
 	pm.Log.Infof("Loading tools from dir: %s", toolsPath)
 

arduino/cores/packagemanager/loader_test.go

@@ -193,3 +193,56 @@ func TestLoadDiscoveries(t *testing.T) {
 	require.Contains(t, discoveries, "arduino:serial-discovery")
 	require.Contains(t, discoveries, "teensy")
 }
+
+func TestConvertUploadToolsToPluggableDiscovery(t *testing.T) {
+	props, err := properties.LoadFromBytes([]byte(`
+upload.tool=avrdude
+upload.protocol=arduino
+upload.maximum_size=32256
+upload.maximum_data_size=2048
+upload.speed=115200
+bootloader.tool=avrdude
+bootloader.low_fuses=0xFF
+bootloader.high_fuses=0xDE
+bootloader.extended_fuses=0xFD
+bootloader.unlock_bits=0x3F
+bootloader.lock_bits=0x0F
+bootloader.file=optiboot/optiboot_atmega328.hex
+name=AVR ISP
+communication=serial
+protocol=stk500v1
+program.protocol=stk500v1
+program.tool=avrdude
+program.extra_params=-P{serial.port}
+`))
+	require.NoError(t, err)
+
+	convertUploadToolsToPluggableDiscovery(props)
+
+	expectedProps, err := properties.LoadFromBytes([]byte(`
+upload.tool=avrdude
+upload.tool.default=avrdude
+upload.protocol=arduino
+upload.maximum_size=32256
+upload.maximum_data_size=2048
+upload.speed=115200
+bootloader.tool=avrdude
+bootloader.tool.default=avrdude
+bootloader.low_fuses=0xFF
+bootloader.high_fuses=0xDE
+bootloader.extended_fuses=0xFD
+bootloader.unlock_bits=0x3F
+bootloader.lock_bits=0x0F
+bootloader.file=optiboot/optiboot_atmega328.hex
+name=AVR ISP
+communication=serial
+protocol=stk500v1
+program.protocol=stk500v1
+program.tool=avrdude
+program.tool.default=avrdude
+program.extra_params=-P{serial.port}
+`))
+	require.NoError(t, err)
+
+	require.Equal(t, expectedProps.AsMap(), props.AsMap())
+}