Renamed SketchProfileLibraryReference -> ProfileLibraryReference

Author: cmaglie

internal/arduino/sketch/profiles.go

@@ -446,28 +446,28 @@ func (l *ProfileLibraryReference) Match(other *ProfileLibraryReference) bool {
 }
 
 // ToRpc converts this ProfileLibraryReference to an rpc.ProfileLibraryReference
-func (l *ProfileLibraryReference) ToRpc() *rpc.SketchProfileLibraryReference {
+func (l *ProfileLibraryReference) ToRpc() *rpc.ProfileLibraryReference {
 	if l.InstallDir != nil {
-		return &rpc.SketchProfileLibraryReference{
-			Library: &rpc.SketchProfileLibraryReference_LocalLibrary_{
-				LocalLibrary: &rpc.SketchProfileLibraryReference_LocalLibrary{
+		return &rpc.ProfileLibraryReference{
+			Library: &rpc.ProfileLibraryReference_LocalLibrary_{
+				LocalLibrary: &rpc.ProfileLibraryReference_LocalLibrary{
 					Path: l.InstallDir.String(),
 				},
 			},
 		}
 	}
 	if l.GitURL != nil {
-		return &rpc.SketchProfileLibraryReference{
-			Library: &rpc.SketchProfileLibraryReference_GitLibrary_{
-				GitLibrary: &rpc.SketchProfileLibraryReference_GitLibrary{
+		return &rpc.ProfileLibraryReference{
+			Library: &rpc.ProfileLibraryReference_GitLibrary_{
+				GitLibrary: &rpc.ProfileLibraryReference_GitLibrary{
 					Url: l.GitURL.String(),
 				},
 			},
 		}
 	}
-	return &rpc.SketchProfileLibraryReference{
-		Library: &rpc.SketchProfileLibraryReference_IndexLibrary_{
-			IndexLibrary: &rpc.SketchProfileLibraryReference_IndexLibrary{
+	return &rpc.ProfileLibraryReference{
+		Library: &rpc.ProfileLibraryReference_IndexLibrary_{
+			IndexLibrary: &rpc.ProfileLibraryReference_IndexLibrary{
 				Name:    l.Library,
 				Version: l.Version.String(),
 			},
@@ -476,7 +476,7 @@ func (l *ProfileLibraryReference) ToRpc() *rpc.SketchProfileLibraryReference {
 }
 
 // FromRpcProfileLibraryReference converts an rpc.ProfileLibraryReference to a ProfileLibraryReference
-func FromRpcProfileLibraryReference(l *rpc.SketchProfileLibraryReference) (*ProfileLibraryReference, error) {
+func FromRpcProfileLibraryReference(l *rpc.ProfileLibraryReference) (*ProfileLibraryReference, error) {
 	if localLib := l.GetLocalLibrary(); localLib != nil {
 		path := paths.New(localLib.GetPath())
 		if path == nil {

internal/cli/feedback/result/rpc.go

@@ -1126,33 +1126,33 @@ func NewIndexUpdateReport_Status(r rpc.IndexUpdateReport_Status) IndexUpdateRepo
 	}
 }
 
-type SketchProfileLibraryReference_GitLibraryResult struct {
+type ProfileLibraryReference_GitLibraryResult struct {
 	Url string `json:"url,omitempty"`
 }
 
-func NewSketchProfileLibraryReference_GitLibraryResult(resp *rpc.SketchProfileLibraryReference_GitLibrary) *SketchProfileLibraryReference_GitLibraryResult {
-	return &SketchProfileLibraryReference_GitLibraryResult{
+func NewProfileLibraryReference_GitLibraryResult(resp *rpc.ProfileLibraryReference_GitLibrary) *ProfileLibraryReference_GitLibraryResult {
+	return &ProfileLibraryReference_GitLibraryResult{
 		Url: resp.GetUrl(),
 	}
 }
 
-type SketchProfileLibraryReference_LocalLibraryResult struct {
+type ProfileLibraryReference_LocalLibraryResult struct {
 	Path string `json:"path,omitempty"`
 }
 
-func NewSketchProfileLibraryReference_LocalLibraryResult(resp *rpc.SketchProfileLibraryReference_LocalLibrary) *SketchProfileLibraryReference_LocalLibraryResult {
-	return &SketchProfileLibraryReference_LocalLibraryResult{
+func NewProfileLibraryReference_LocalLibraryResult(resp *rpc.ProfileLibraryReference_LocalLibrary) *ProfileLibraryReference_LocalLibraryResult {
+	return &ProfileLibraryReference_LocalLibraryResult{
 		Path: resp.GetPath(),
 	}
 }
 
-type SketchProfileLibraryReference_IndexLibraryResult struct {
+type ProfileLibraryReference_IndexLibraryResult struct {
 	Name    string `json:"name,omitempty"`
 	Version string `json:"version,omitempty"`
 }
 
-func NewSketchProfileLibraryReference_IndexLibraryResult(resp *rpc.SketchProfileLibraryReference_IndexLibrary) *SketchProfileLibraryReference_IndexLibraryResult {
-	return &SketchProfileLibraryReference_IndexLibraryResult{
+func NewProfileLibraryReference_IndexLibraryResult(resp *rpc.ProfileLibraryReference_IndexLibrary) *ProfileLibraryReference_IndexLibraryResult {
+	return &ProfileLibraryReference_IndexLibraryResult{
 		Name:    resp.GetName(),
 		Version: resp.GetVersion(),
 	}

internal/cli/feedback/result/rpc_test.go

@@ -234,17 +234,17 @@ func TestAllFieldAreMapped(t *testing.T) {
 	indexUpdateReportResult := result.NewIndexUpdateReportResult(indexUpdateReportRpc)
 	mustContainsAllPropertyOfRpcStruct(t, indexUpdateReportRpc, indexUpdateReportResult)
 
-	sketchProfileLibraryReference_IndexLibraryRpc := &rpc.SketchProfileLibraryReference_IndexLibrary{}
-	sketchProfileLibraryReference_IndexLibraryResult := result.NewSketchProfileLibraryReference_IndexLibraryResult(sketchProfileLibraryReference_IndexLibraryRpc)
-	mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_IndexLibraryRpc, sketchProfileLibraryReference_IndexLibraryResult)
+	profileLibraryReference_IndexLibraryRpc := &rpc.ProfileLibraryReference_IndexLibrary{}
+	profileLibraryReference_IndexLibraryResult := result.NewProfileLibraryReference_IndexLibraryResult(profileLibraryReference_IndexLibraryRpc)
+	mustContainsAllPropertyOfRpcStruct(t, profileLibraryReference_IndexLibraryRpc, profileLibraryReference_IndexLibraryResult)
 
-	sketchProfileLibraryReference_GitLibraryRpc := &rpc.SketchProfileLibraryReference_GitLibrary{}
-	sketchProfileLibraryReference_GitLibraryResult := result.NewSketchProfileLibraryReference_GitLibraryResult(sketchProfileLibraryReference_GitLibraryRpc)
-	mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_GitLibraryRpc, sketchProfileLibraryReference_GitLibraryResult)
+	profileLibraryReference_GitLibraryRpc := &rpc.ProfileLibraryReference_GitLibrary{}
+	profileLibraryReference_GitLibraryResult := result.NewProfileLibraryReference_GitLibraryResult(profileLibraryReference_GitLibraryRpc)
+	mustContainsAllPropertyOfRpcStruct(t, profileLibraryReference_GitLibraryRpc, profileLibraryReference_GitLibraryResult)
 
-	sketchProfileLibraryReference_LocalLibraryRpc := &rpc.SketchProfileLibraryReference_LocalLibrary{}
-	sketchProfileLibraryReference_LocalLibraryResult := result.NewSketchProfileLibraryReference_LocalLibraryResult(sketchProfileLibraryReference_LocalLibraryRpc)
-	mustContainsAllPropertyOfRpcStruct(t, sketchProfileLibraryReference_LocalLibraryRpc, sketchProfileLibraryReference_LocalLibraryResult)
+	profileLibraryReference_LocalLibraryRpc := &rpc.ProfileLibraryReference_LocalLibrary{}
+	profileLibraryReference_LocalLibraryResult := result.NewProfileLibraryReference_LocalLibraryResult(profileLibraryReference_LocalLibraryRpc)
+	mustContainsAllPropertyOfRpcStruct(t, profileLibraryReference_LocalLibraryRpc, profileLibraryReference_LocalLibraryResult)
 }
 
 func TestEnumsMapsEveryRpcCounterpart(t *testing.T) {