Fix code naming issues

Author: silvanocerza

commands/upload/upload.go

@@ -59,12 +59,12 @@ func SupportedUserFields(ctx context.Context, req *rpc.SupportedUserFieldsReques
 		return nil, fmt.Errorf("loading board data: %s", err)
 	}
 
-	toolId, err := getToolId(board.Properties, "upload", req.Protocol)
+	toolID, err := getToolID(board.Properties, "upload", req.Protocol)
 	if err != nil {
 		return nil, err
 	}
 
-	userFields, err := getUserFields(toolId, platformRelease)
+	userFields, err := getUserFields(toolID, platformRelease)
 	if err != nil {
 		return nil, err
 	}
@@ -74,9 +74,9 @@ func SupportedUserFields(ctx context.Context, req *rpc.SupportedUserFieldsReques
 	}, nil
 }
 
-// getToolId returns the ID of the tool that supports the action and protocol combination by searching in props.
+// getToolID returns the ID of the tool that supports the action and protocol combination by searching in props.
 // Returns error if tool cannot be found.
-func getToolId(props *properties.Map, action, protocol string) (string, error) {
+func getToolID(props *properties.Map, action, protocol string) (string, error) {
 	toolProperty := fmt.Sprintf("%s.tool.%s", action, protocol)
 	defaultToolProperty := fmt.Sprintf("%s.tool.default", action)
 
@@ -92,9 +92,9 @@ func getToolId(props *properties.Map, action, protocol string) (string, error) {
 
 // getUserFields return all user fields supported by the tools specified.
 // Returns error only in case the secret property is not a valid boolean.
-func getUserFields(toolId string, platformRelease *cores.PlatformRelease) ([]*rpc.UserField, error) {
+func getUserFields(toolID string, platformRelease *cores.PlatformRelease) ([]*rpc.UserField, error) {
 	userFields := []*rpc.UserField{}
-	fields := platformRelease.Properties.SubTree(fmt.Sprintf("tools.%s.upload.field", toolId))
+	fields := platformRelease.Properties.SubTree(fmt.Sprintf("tools.%s.upload.field", toolID))
 	keys := fields.FirstLevelKeys()
 
 	for _, key := range keys {
@@ -106,10 +106,10 @@ func getUserFields(toolId string, platformRelease *cores.PlatformRelease) ([]*rp
 		}
 		isSecret, err := strconv.ParseBool(secret)
 		if err != nil {
-			return nil, fmt.Errorf(`parsing "tools.%s.upload.field.%s.secret", property is not a boolean`, toolId, key)
+			return nil, fmt.Errorf(`parsing "tools.%s.upload.field.%s.secret", property is not a boolean`, toolID, key)
 		}
 		userFields = append(userFields, &rpc.UserField{
-			ToolId: toolId,
+			ToolId: toolID,
 			Name:   key,
 			Label:  value,
 			Secret: isSecret,
@@ -242,7 +242,7 @@ func runProgramAction(pm *packagemanager.PackageManager,
 	} else if programmer != nil {
 		action = "program"
 	}
-	uploadToolID, err := getToolId(props, action, port.Protocol)
+	uploadToolID, err := getToolID(props, action, port.Protocol)
 	if err != nil {
 		return err
 	}

commands/upload/upload_test.go

@@ -230,42 +230,42 @@ upload.tool.serial=bossac
 upload.tool.network=arduino_ota`))
 	require.NoError(t, err)
 
-	toolId, err := getToolId(props, "upload", "serial")
+	toolID, err := getToolID(props, "upload", "serial")
 	require.NoError(t, err)
-	require.Equal(t, "bossac", toolId)
+	require.Equal(t, "bossac", toolID)
 
-	toolId, err = getToolId(props, "upload", "network")
+	toolID, err = getToolID(props, "upload", "network")
 	require.NoError(t, err)
-	require.Equal(t, "arduino_ota", toolId)
+	require.Equal(t, "arduino_ota", toolID)
 
-	toolId, err = getToolId(props, "bootloader", "serial")
+	toolID, err = getToolID(props, "bootloader", "serial")
 	require.NoError(t, err)
-	require.Equal(t, "avrdude", toolId)
+	require.Equal(t, "avrdude", toolID)
 
-	toolId, err = getToolId(props, "bootloader", "network")
+	toolID, err = getToolID(props, "bootloader", "network")
 	require.EqualError(t, err, "cannot find tool: undefined 'bootloader.tool.network' property")
-	require.Equal(t, "", toolId)
+	require.Equal(t, "", toolID)
 
 	props, err = properties.LoadFromBytes([]byte(`
 	bootloader.tool.default=avrdude
 	upload.tool.default=bossac`))
 	require.NoError(t, err)
 
-	toolId, err = getToolId(props, "upload", "serial")
+	toolID, err = getToolID(props, "upload", "serial")
 	require.NoError(t, err)
-	require.Equal(t, "bossac", toolId)
+	require.Equal(t, "bossac", toolID)
 
-	toolId, err = getToolId(props, "upload", "network")
+	toolID, err = getToolID(props, "upload", "network")
 	require.NoError(t, err)
-	require.Equal(t, "bossac", toolId)
+	require.Equal(t, "bossac", toolID)
 
-	toolId, err = getToolId(props, "bootloader", "serial")
+	toolID, err = getToolID(props, "bootloader", "serial")
 	require.NoError(t, err)
-	require.Equal(t, "avrdude", toolId)
+	require.Equal(t, "avrdude", toolID)
 
-	toolId, err = getToolId(props, "bootloader", "network")
+	toolID, err = getToolID(props, "bootloader", "network")
 	require.NoError(t, err)
-	require.Equal(t, "avrdude", toolId)
+	require.Equal(t, "avrdude", toolID)
 }
 
 func TestGetUserFields(t *testing.T) {