Allow platforms without fixed version in profiles.

Author: cmaglie

commands/instances.go

@@ -243,7 +243,7 @@ func (s *arduinoCoreServerImpl) Init(req *rpc.InitRequest, stream rpc.ArduinoCor
 		}
 
 		// Load Platforms
-		if profile == nil {
+		if profile == nil || profile.RequireSystemInstalledPlatform() {
 			for _, err := range pmb.LoadHardware() {
 				s := &cmderrors.PlatformLoadingError{Cause: err}
 				responseError(s.GRPCStatus())

internal/arduino/cores/status.go

@@ -50,6 +50,13 @@ type Package struct {
 	Packages   Packages             `json:"-"`
 }
 
+// GetPackage returns the specified Package if it exists
+// and a boolean indicating whether it was found or not.
+func (packages Packages) GetPackage(packager string) (*Package, bool) {
+	targetPackage, ok := packages[packager]
+	return targetPackage, ok
+}
+
 // GetOrCreatePackage returns the specified Package or creates an empty one
 // filling all the cross-references
 func (packages Packages) GetOrCreatePackage(packager string) *Package {

internal/arduino/sketch/profiles.go

@@ -119,6 +119,11 @@ type Profile struct {
 	Libraries  ProfileRequiredLibraries `yaml:"libraries"`
 }
 
+// UsesSystemPlatform checks if this profile requires a system installed platform.
+func (p *Profile) RequireSystemInstalledPlatform() bool {
+	return p.Platforms[0].RequireSystemInstalledPlatform()
+}
+
 // ToRpc converts this Profile to an rpc.SketchProfile
 func (p *Profile) ToRpc() *rpc.SketchProfile {
 	var portConfig *rpc.MonitorPortConfiguration
@@ -205,6 +210,12 @@ type ProfilePlatformReference struct {
 	PlatformIndexURL *url.URL
 }
 
+// RequireSystemInstalledPlatform returns true if the platform reference
+// does not specify a version, meaning it requires the system installed platform.
+func (p *ProfilePlatformReference) RequireSystemInstalledPlatform() bool {
+	return p.Version == nil
+}
+
 // InternalUniqueIdentifier returns the unique identifier for this object
 func (p *ProfilePlatformReference) InternalUniqueIdentifier() string {
 	id := p.String()
@@ -223,20 +234,38 @@ func (p *ProfilePlatformReference) String() string {
 
 // AsYaml outputs the platform reference as Yaml
 func (p *ProfilePlatformReference) AsYaml() string {
-	res := fmt.Sprintf("      - platform: %s:%s (%s)\n", p.Packager, p.Architecture, p.Version)
+	res := ""
+	if p.Version != nil {
+		res += fmt.Sprintf("      - platform: %s:%s (%s)\n", p.Packager, p.Architecture, p.Version)
+	} else {
+		res += fmt.Sprintf("      - platform: %s:%s\n", p.Packager, p.Architecture)
+	}
 	if p.PlatformIndexURL != nil {
 		res += fmt.Sprintf("        platform_index_url: %s\n", p.PlatformIndexURL)
 	}
 	return res
 }
 
 func parseNameAndVersion(in string) (string, string, bool) {
-	re := regexp.MustCompile(`^([a-zA-Z0-9.\-_ :]+) \((.+)\)$`)
-	split := re.FindAllStringSubmatch(in, -1)
-	if len(split) != 1 || len(split[0]) != 3 {
-		return "", "", false
+	{
+		// Try to parse the input string in the format "VENDOR:ARCH (VERSION)"
+		re := regexp.MustCompile(`^([a-zA-Z0-9.\-_ :]+) \((.+)\)$`)
+		split := re.FindAllStringSubmatch(in, -1)
+		if len(split) == 1 && len(split[0]) == 3 {
+			return split[0][1], split[0][2], true
+		}
 	}
-	return split[0][1], split[0][2], true
+
+	{
+		// Try to parse the input string in the format "VENDOR:ARCH"
+		re := regexp.MustCompile(`^([a-zA-Z0-9.\-_ :]+)$`)
+		split := re.FindAllStringSubmatch(in, -1)
+		if len(split) == 1 && len(split[0]) == 2 {
+			return split[0][1], "", true
+		}
+	}
+
+	return "", "", false
 }
 
 // UnmarshalYAML decodes a ProfilePlatformReference from YAML source.
@@ -249,14 +278,23 @@ func (p *ProfilePlatformReference) UnmarshalYAML(unmarshal func(interface{}) err
 		return errors.New(i18n.Tr("missing '%s' directive", "platform"))
 	} else if platformID, platformVersion, ok := parseNameAndVersion(platformID); !ok {
 		return errors.New(i18n.Tr("invalid '%s' directive", "platform"))
-	} else if c, err := semver.Parse(platformVersion); err != nil {
-		return fmt.Errorf("%s: %w", i18n.Tr("error parsing version constraints"), err)
-	} else if split := strings.SplitN(platformID, ":", 2); len(split) != 2 {
-		return fmt.Errorf("%s: %s", i18n.Tr("invalid platform identifier"), platformID)
 	} else {
-		p.Packager = split[0]
-		p.Architecture = split[1]
-		p.Version = c
+		var version *semver.Version
+		if platformVersion != "" {
+			if v, err := semver.Parse(platformVersion); err != nil {
+				return fmt.Errorf("%s: %w", i18n.Tr("error parsing version constraints"), err)
+			} else {
+				version = v
+			}
+		}
+
+		if split := strings.SplitN(platformID, ":", 2); len(split) != 2 {
+			return fmt.Errorf("%s: %s", i18n.Tr("invalid platform identifier"), platformID)
+		} else {
+			p.Packager = split[0]
+			p.Architecture = split[1]
+			p.Version = version
+		}
 	}
 
 	if rawIndexURL, ok := data["platform_index_url"]; ok {

internal/arduino/sketch/profiles_test.go

@@ -16,7 +16,6 @@
 package sketch
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/arduino/go-paths-helper"
@@ -28,7 +27,6 @@ func TestProjectFileLoading(t *testing.T) {
 		sketchProj := paths.New("testdata", "SketchWithProfiles", "sketch.yml")
 		proj, err := LoadProjectFile(sketchProj)
 		require.NoError(t, err)
-		fmt.Println(proj)
 		golden, err := sketchProj.ReadFile()
 		require.NoError(t, err)
 		require.Equal(t, proj.AsYaml(), string(golden))
@@ -37,9 +35,16 @@ func TestProjectFileLoading(t *testing.T) {
 		sketchProj := paths.New("testdata", "SketchWithDefaultFQBNAndPort", "sketch.yml")
 		proj, err := LoadProjectFile(sketchProj)
 		require.NoError(t, err)
-		fmt.Println(proj)
 		golden, err := sketchProj.ReadFile()
 		require.NoError(t, err)
 		require.Equal(t, proj.AsYaml(), string(golden))
 	}
+	{
+		sketchProj := paths.New("testdata", "profiles", "profile_1.yml")
+		proj, err := LoadProjectFile(sketchProj)
+		require.NoError(t, err)
+		golden, err := sketchProj.ReadFile()
+		require.NoError(t, err)
+		require.Equal(t, string(golden), proj.AsYaml())
+	}
 }

internal/arduino/sketch/testdata/profiles/profile_1.yml

@@ -0,0 +1,12 @@
+profiles:
+  giga:
+    fqbn: arduino:mbed_giga:giga
+    platforms:
+      - platform: arduino:mbed_giga (4.3.1)
+
+  giga_any:
+    fqbn: arduino:mbed_giga:giga
+    platforms:
+      - platform: arduino:mbed_giga
+
+default_profile: giga_any