sketch.GetProfile returns an error if profile is not found

Author: cmaglie

commands/instances.go

@@ -142,9 +142,9 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 		if err != nil {
 			return &cmderrors.InvalidArgumentError{Cause: err}
 		}
-		profile = sk.GetProfile(req.GetProfile())
-		if profile == nil {
-			return &cmderrors.UnknownProfileError{Profile: req.GetProfile()}
+		profile, err := sk.GetProfile(req.GetProfile())
+		if err != nil {
+			return err
 		}
 		responseCallback(&rpc.InitResponse{
 			Message: &rpc.InitResponse_Profile{

commands/sketch/load.go

@@ -58,8 +58,8 @@ func LoadSketch(ctx context.Context, req *rpc.LoadSketchRequest) (*rpc.LoadSketc
 	}
 
 	defaultProfileResp := &rpc.SketchProfile{}
-	defaultProfile := sk.GetProfile(sk.Project.DefaultProfile)
-	if defaultProfile != nil {
+	defaultProfile, err := sk.GetProfile(sk.Project.DefaultProfile)
+	if err == nil {
 		defaultProfileResp.Name = defaultProfile.Name
 		defaultProfileResp.Fqbn = defaultProfile.FQBN
 	}

internal/arduino/sketch/sketch.go

@@ -23,6 +23,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/internal/arduino/globals"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/go-paths-helper"
@@ -180,15 +181,14 @@ func (s *Sketch) supportedFiles() (*paths.PathList, error) {
 	return &files, nil
 }
 
-// GetProfile returns the requested profile or nil if the profile
-// is not found.
-func (s *Sketch) GetProfile(profileName string) *Profile {
+// GetProfile returns the requested profile or an error if not found
+func (s *Sketch) GetProfile(profileName string) (*Profile, error) {
 	for _, p := range s.Project.Profiles {
 		if p.Name == profileName {
-			return p
+			return p, nil
 		}
 	}
-	return nil
+	return nil, &cmderrors.UnknownProfileError{Profile: profileName}
 }
 
 // checkSketchCasing returns an error if the casing of the sketch folder and the main file are different.