Added gRPC support for git-libraries in profiles

Author: cmaglie

commands/service_profile_lib_add.go

@@ -17,6 +17,7 @@ package commands
 
 import (
 	"context"
+	"net/url"
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/commands/internal/instances"
@@ -61,6 +62,15 @@ func (s *arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req *rpc.Prof
 		addedLib := &sketch.ProfileLibraryReference{InstallDir: path}
 		profile.Libraries = append(profile.Libraries, addedLib)
 		addedLibs = append(addedLibs, addedLib)
+	} else if reqGitLib := req.GetLibrary().GetGitLibrary(); reqGitLib != nil {
+		// Add a git library
+		gitURL, err := url.Parse(reqGitLib.GetUrl())
+		if err != nil {
+			return nil, &cmderrors.InvalidURLError{Cause: err}
+		}
+		addedLib := &sketch.ProfileLibraryReference{GitURL: gitURL}
+		profile.Libraries = append(profile.Libraries, addedLib)
+		addedLibs = append(addedLibs, addedLib)
 	} else if reqIndexLib := req.GetLibrary().GetIndexLibrary(); reqIndexLib != nil {
 		// Obtain the library index from the manager
 		li, err := instances.GetLibrariesIndex(req.GetInstance())

internal/arduino/sketch/profiles.go

@@ -430,6 +430,9 @@ func (l *ProfileLibraryReference) Match(other *ProfileLibraryReference) bool {
 	if l.InstallDir != nil {
 		return other.InstallDir != nil && l.InstallDir.EqualsTo(other.InstallDir)
 	}
+	if l.GitURL != nil {
+		return other.GitURL != nil && l.GitURL.String() == other.GitURL.String()
+	}
 	if other.InstallDir != nil {
 		return false
 	}
@@ -453,6 +456,15 @@ func (l *ProfileLibraryReference) ToRpc() *rpc.SketchProfileLibraryReference {
 			},
 		}
 	}
+	if l.GitURL != nil {
+		return &rpc.SketchProfileLibraryReference{
+			Library: &rpc.SketchProfileLibraryReference_GitLibrary_{
+				GitLibrary: &rpc.SketchProfileLibraryReference_GitLibrary{
+					Url: l.GitURL.String(),
+				},
+			},
+		}
+	}
 	return &rpc.SketchProfileLibraryReference{
 		Library: &rpc.SketchProfileLibraryReference_IndexLibrary_{
 			IndexLibrary: &rpc.SketchProfileLibraryReference_IndexLibrary{
@@ -472,6 +484,13 @@ func FromRpcProfileLibraryReference(l *rpc.SketchProfileLibraryReference) (*Prof
 		}
 		return &ProfileLibraryReference{InstallDir: path}, nil
 	}
+	if gitLib := l.GetGitLibrary(); gitLib != nil {
+		gitURL, err := url.Parse(gitLib.GetUrl())
+		if err != nil {
+			return nil, &cmderrors.InvalidURLError{Cause: err}
+		}
+		return &ProfileLibraryReference{GitURL: gitURL}, nil
+	}
 	if indexLib := l.GetIndexLibrary(); indexLib != nil {
 		var version *semver.Version
 		if indexLib.GetVersion() != "" {

internal/cli/feedback/result/rpc.go

@@ -1126,6 +1126,16 @@ func NewIndexUpdateReport_Status(r rpc.IndexUpdateReport_Status) IndexUpdateRepo
 	}
 }
 
+type SketchProfileLibraryReference_GitLibraryResult struct {
+	Url string `json:"url,omitempty"`
+}
+
+func NewSketchProfileLibraryReference_GitLibraryResult(resp *rpc.SketchProfileLibraryReference_GitLibrary) *SketchProfileLibraryReference_GitLibraryResult {
+	return &SketchProfileLibraryReference_GitLibraryResult{
+		Url: resp.GetUrl(),
+	}
+}
+
 type SketchProfileLibraryReference_LocalLibraryResult struct {
 	Path string `json:"path,omitempty"`
 }

internal/cli/feedback/result/rpc_test.go

@@ -238,6 +238,10 @@ func TestAllFieldAreMapped(t *testing.T) {
 	sketchProfileLibraryReference_IndexLibraryResult := result.NewSketchProfileLibraryReference_IndexLibraryResult(sketchProfileLibraryReference_IndexLibraryRpc)
 	mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_IndexLibraryRpc, sketchProfileLibraryReference_IndexLibraryResult)
 
+	sketchProfileLibraryReference_GitLibraryRpc := &rpc.SketchProfileLibraryReference_GitLibrary{}
+	sketchProfileLibraryReference_GitLibraryResult := result.NewSketchProfileLibraryReference_GitLibraryResult(sketchProfileLibraryReference_GitLibraryRpc)
+	mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_GitLibraryRpc, sketchProfileLibraryReference_GitLibraryResult)
+
 	sketchProfileLibraryReference_LocalLibraryRpc := &rpc.SketchProfileLibraryReference_LocalLibrary{}
 	sketchProfileLibraryReference_LocalLibraryResult := result.NewSketchProfileLibraryReference_LocalLibraryResult(sketchProfileLibraryReference_LocalLibraryRpc)
 	mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_LocalLibraryRpc, sketchProfileLibraryReference_LocalLibraryResult)

rpc/cc/arduino/cli/commands/v1/common.pb.go

@@ -249,10 +249,16 @@ message SketchProfileLibraryReference {
     // Absolute path to the library.
     string path = 1;
   }
+  message GitLibrary {
+    // URL to the git repo (the revision reference is in the fragment part of the URL).
+    string url = 1;
+  }
   oneof library {
     // The library is installed from the Library Index.
     IndexLibrary index_library = 1;
     // The library is a local library.
     LocalLibrary local_library = 2;
+    // The library is installed from a git repository.
+    GitLibrary git_library = 3;
   }
 }