refactor: rename MainSketchPath to mainSketchPath and update related methods

Author: dido18

internal/orchestrator/app/app.go

@@ -30,7 +30,7 @@ import (
 type ArduinoApp struct {
 	Name           string
 	MainPythonFile *paths.Path
-	MainSketchPath *paths.Path
+	mainSketchPath *paths.Path
 	FullPath       *paths.Path // FullPath is the path to the App folder
 	Descriptor     AppDescriptor
 }
@@ -76,10 +76,10 @@ func Load(appPath *paths.Path) (ArduinoApp, error) {
 
 	if appPath.Join("sketch", "sketch.ino").Exist() {
 		// TODO: check sketch casing?
-		app.MainSketchPath = appPath.Join("sketch")
+		app.mainSketchPath = appPath.Join("sketch")
 	}
 
-	if app.MainPythonFile == nil && app.MainSketchPath == nil {
+	if app.MainPythonFile == nil && app.mainSketchPath == nil {
 		return ArduinoApp{}, errors.New("main python file and sketch file missing from app")
 	}
 
@@ -91,6 +91,13 @@ func Load(appPath *paths.Path) (ArduinoApp, error) {
 	return app, nil
 }
 
+func (a *ArduinoApp) GetSketchPath() (*paths.Path, bool) {
+	if a == nil || a.mainSketchPath == nil {
+		return nil, false
+	}
+	return a.mainSketchPath, true
+}
+
 // GetDescriptorPath returns the path to the app descriptor file (app.yaml or app.yml)
 func (a *ArduinoApp) GetDescriptorPath() *paths.Path {
 	descriptorFile := a.FullPath.Join("app.yaml")

internal/orchestrator/app/app_test.go

@@ -58,9 +58,22 @@ func TestLoad(t *testing.T) {
 
 		assert.NotNil(t, app.MainPythonFile)
 		assert.Equal(t, f.Must(filepath.Abs("testdata/AppSimple/python/main.py")), app.MainPythonFile.String())
+		sketchPath, ok := app.GetSketchPath()
+		assert.True(t, ok)
+		assert.NotNil(t, sketchPath)
+		assert.Equal(t, f.Must(filepath.Abs("testdata/AppSimple/sketch")), sketchPath.String())
+	})
+
+	t.Run("it loads an app with misssing sketch folder", func(t *testing.T) {
+		app, err := Load(paths.New("testdata/MissingSketch"))
+		assert.NoError(t, err)
+		assert.NotEmpty(t, app)
+
+		assert.NotNil(t, app.MainPythonFile)
 
-		assert.NotNil(t, app.MainSketchPath)
-		assert.Equal(t, f.Must(filepath.Abs("testdata/AppSimple/sketch")), app.MainSketchPath.String())
+		sketchPath, ok := app.GetSketchPath()
+		assert.False(t, ok)
+		assert.Nil(t, sketchPath)
 	})
 }
 

internal/orchestrator/app/testdata/MissingSketch/app.yaml

@@ -0,0 +1,2 @@
+name: "An app with only python"
+description: "An app with only python

internal/orchestrator/app/testdata/MissingSketch/python/main.py

@@ -0,0 +1,2 @@
+
+print("Hello world!")

internal/orchestrator/orchestrator.go

@@ -154,7 +154,8 @@ func StartApp(
 		if !yield(StreamMessage{progress: &Progress{Name: "preparing", Progress: 0.0}}) {
 			return
 		}
-		if appToStart.MainSketchPath != nil {
+
+		if _, ok := appToStart.GetSketchPath(); ok {
 			if !yield(StreamMessage{progress: &Progress{Name: "sketch compiling and uploading", Progress: 0.0}}) {
 				return
 			}
@@ -175,7 +176,7 @@ func StartApp(
 				return
 			}
 			provisionStartProgress := float32(0.0)
-			if appToStart.MainSketchPath != nil {
+			if _, ok := appToStart.GetSketchPath(); ok {
 				provisionStartProgress = 10.0
 			}
 
@@ -402,7 +403,7 @@ func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp,
 			}
 		})
 
-		if app.MainSketchPath != nil {
+		if _, ok := app.GetSketchPath(); ok {
 			// Before stopping the microcontroller we want to make sure that the app was running.
 			appStatus, err := getAppStatus(ctx, docker, app)
 			if err != nil {
@@ -1162,9 +1163,12 @@ func compileUploadSketch(
 	defer func() {
 		_, _ = srv.Destroy(ctx, &rpc.DestroyRequest{Instance: inst})
 	}()
-	sketchPath := arduinoApp.MainSketchPath.String()
+	sketchPath, ok := arduinoApp.GetSketchPath()
+	if !ok {
+		return fmt.Errorf("no sketch path found in the Arduino app")
+	}
 	buildPath := arduinoApp.SketchBuildPath().String()
-	sketchResp, err := srv.LoadSketch(ctx, &rpc.LoadSketchRequest{SketchPath: sketchPath})
+	sketchResp, err := srv.LoadSketch(ctx, &rpc.LoadSketchRequest{SketchPath: sketchPath.String()})
 	if err != nil {
 		return err
 	}
@@ -1175,7 +1179,7 @@ func compileUploadSketch(
 	}
 	initReq := &rpc.InitRequest{
 		Instance:   inst,
-		SketchPath: sketchPath,
+		SketchPath: sketchPath.String(),
 		Profile:    profile,
 	}
 
@@ -1215,7 +1219,7 @@ func compileUploadSketch(
 	compileReq := rpc.CompileRequest{
 		Instance:   inst,
 		Fqbn:       "arduino:zephyr:unoq",
-		SketchPath: sketchPath,
+		SketchPath: sketchPath.String(),
 		BuildPath:  buildPath,
 		Jobs:       2,
 	}
@@ -1241,12 +1245,12 @@ func compileUploadSketch(
 		slog.Info("Used library " + lib.GetName() + " (" + lib.GetVersion() + ") in " + lib.GetInstallDir())
 	}
 
-	if err := uploadSketchInRam(ctx, w, srv, inst, sketchPath, buildPath); err != nil {
+	if err := uploadSketchInRam(ctx, w, srv, inst, sketchPath.String(), buildPath); err != nil {
 		slog.Warn("failed to upload in ram mode, trying to configure the board in ram mode, and retry", slog.String("error", err.Error()))
 		if err := configureMicroInRamMode(ctx, w, srv, inst); err != nil {
 			return err
 		}
-		return uploadSketchInRam(ctx, w, srv, inst, sketchPath, buildPath)
+		return uploadSketchInRam(ctx, w, srv, inst, sketchPath.String(), buildPath)
 	}
 	return nil
 }

internal/orchestrator/sketch_libs.go

@@ -17,6 +17,7 @@ package orchestrator
 
 import (
 	"context"
+	"errors"
 	"log/slog"
 	"time"
 
@@ -30,6 +31,11 @@ import (
 const indexUpdateInterval = 10 * time.Minute
 
 func AddSketchLibrary(ctx context.Context, app app.ArduinoApp, libRef LibraryReleaseID, addDeps bool) ([]LibraryReleaseID, error) {
+	sketchPath, ok := app.GetSketchPath()
+	if !ok {
+		return []LibraryReleaseID{}, errors.New("cannot add a library. Missing sketch folder")
+	}
+
 	srv := commands.NewArduinoCoreServer()
 	var inst *rpc.Instance
 	if res, err := srv.Create(ctx, &rpc.CreateRequest{}); err != nil {
@@ -58,7 +64,7 @@ func AddSketchLibrary(ctx context.Context, app app.ArduinoApp, libRef LibraryRel
 
 	resp, err := srv.ProfileLibAdd(ctx, &rpc.ProfileLibAddRequest{
 		Instance:   inst,
-		SketchPath: app.MainSketchPath.String(),
+		SketchPath: sketchPath.String(),
 		Library: &rpc.SketchProfileLibraryReference{
 			Library: &rpc.SketchProfileLibraryReference_IndexLibrary_{
 				IndexLibrary: &rpc.SketchProfileLibraryReference_IndexLibrary{
@@ -77,6 +83,10 @@ func AddSketchLibrary(ctx context.Context, app app.ArduinoApp, libRef LibraryRel
 }
 
 func RemoveSketchLibrary(ctx context.Context, app app.ArduinoApp, libRef LibraryReleaseID) (LibraryReleaseID, error) {
+	sketchPath, ok := app.GetSketchPath()
+	if !ok {
+		return LibraryReleaseID{}, errors.New("cannot remove a library. Missing sketch folder")
+	}
 	srv := commands.NewArduinoCoreServer()
 	var inst *rpc.Instance
 	if res, err := srv.Create(ctx, &rpc.CreateRequest{}); err != nil {
@@ -102,7 +112,7 @@ func RemoveSketchLibrary(ctx context.Context, app app.ArduinoApp, libRef Library
 				},
 			},
 		},
-		SketchPath: app.MainSketchPath.String(),
+		SketchPath: sketchPath.String(),
 	})
 	if err != nil {
 		return LibraryReleaseID{}, err
@@ -111,10 +121,15 @@ func RemoveSketchLibrary(ctx context.Context, app app.ArduinoApp, libRef Library
 }
 
 func ListSketchLibraries(ctx context.Context, app app.ArduinoApp) ([]LibraryReleaseID, error) {
+	sketchPath, ok := app.GetSketchPath()
+	if !ok {
+		return []LibraryReleaseID{}, errors.New("cannot list libraries. Missing sketch folder")
+	}
+
 	srv := commands.NewArduinoCoreServer()
 
 	resp, err := srv.ProfileLibList(ctx, &rpc.ProfileLibListRequest{
-		SketchPath: app.MainSketchPath.String(),
+		SketchPath: sketchPath.String(),
 	})
 	if err != nil {
 		return nil, err