Skip to content

Commit 1861a8f

Browse files
dido18lucarin91
dido18
and
lucarin91
authored
refact: use the Load function uniformely in all the yaml loaders (#107)
* feat(tests): add bricks index test and YAML data for bricks * refactor: rename index generation functions to Load for consistency * use paths.path as argument in app.load * use dir instead of path in app.Load --------- Co-authored-by: Luca Rinaldi <l.rinaldi@arduino.cc>
1 parent 3d8b8ea commit 1861a8f

File tree

26 files changed

+382
-227
lines changed

26 files changed

+382
-227
lines changed

‎cmd/arduino-app-cli/app/app.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ func Load(idOrPath string) (app.ArduinoApp, error) {
5050
return app.ArduinoApp{}, fmt.Errorf("invalid app path: %s", idOrPath)
5151
}
5252

53-
return app.Load(id.ToPath().String())
53+
return app.Load(id.ToPath())
5454
}

‎cmd/arduino-app-cli/internal/servicelocator/servicelocator.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ func Init(cfg config.Configuration) {
4242

4343
var (
4444
GetBricksIndex = sync.OnceValue(func() *bricksindex.BricksIndex {
45-
return f.Must(bricksindex.GenerateBricksIndexFromFile(GetStaticStore().GetAssetsFolder()))
45+
return f.Must(bricksindex.Load(GetStaticStore().GetAssetsFolder()))
4646
})
4747

4848
GetModelsIndex = sync.OnceValue(func() *modelsindex.ModelsIndex {
49-
return f.Must(modelsindex.GenerateModelsIndexFromFile(GetStaticStore().GetAssetsFolder()))
49+
return f.Must(modelsindex.Load(GetStaticStore().GetAssetsFolder()))
5050
})
5151

5252
GetProvisioner = sync.OnceValue(func() *orchestrator.Provision {

‎internal/api/handlers/app_delete.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func HandleAppDelete(
4242
return
4343
}
4444

45-
app, err := app.Load(id.ToPath().String())
45+
app, err := app.Load(id.ToPath())
4646
if err != nil {
4747
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
4848
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

‎internal/api/handlers/app_details.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func HandleAppDetails(
4545
return
4646
}
4747

48-
app, err := app.Load(id.ToPath().String())
48+
app, err := app.Load(id.ToPath())
4949
if err != nil {
5050
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
5151
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
@@ -81,7 +81,7 @@ func HandleAppDetailsEdits(
8181
render.EncodeResponse(w, http.StatusPreconditionFailed, models.ErrorResponse{Details: "invalid id"})
8282
return
8383
}
84-
appToEdit, err := app.Load(id.ToPath().String())
84+
appToEdit, err := app.Load(id.ToPath())
8585
if err != nil {
8686
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
8787
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

‎internal/api/handlers/app_logs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func HandleAppLogs(
4343
return
4444
}
4545

46-
app, err := app.Load(id.ToPath().String())
46+
app, err := app.Load(id.ToPath())
4747
if err != nil {
4848
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
4949
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

‎internal/api/handlers/app_ports.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func HandleAppPorts(
4747
return
4848
}
4949

50-
app, err := app.Load(id.ToPath().String())
50+
app, err := app.Load(id.ToPath())
5151
if err != nil {
5252
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
5353
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

‎internal/api/handlers/app_sketch_libs.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func HandleSketchAddLibrary(idProvider *app.IDProvider) http.HandlerFunc {
3636
render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: "cannot alter examples"})
3737
return
3838
}
39-
app, err := app.Load(id.ToPath().String())
39+
app, err := app.Load(id.ToPath())
4040

4141
// Get query param addDeps (default false)
4242
addDeps, _ := strconv.ParseBool(r.URL.Query().Get("add_deps"))
@@ -78,7 +78,7 @@ func HandleSketchRemoveLibrary(idProvider *app.IDProvider) http.HandlerFunc {
7878
render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: "cannot alter examples"})
7979
return
8080
}
81-
app, err := app.Load(id.ToPath().String())
81+
app, err := app.Load(id.ToPath())
8282
if err != nil {
8383
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
8484
return
@@ -114,7 +114,7 @@ func HandleSketchListLibraries(idProvider *app.IDProvider) http.HandlerFunc {
114114
render.EncodeResponse(w, http.StatusPreconditionFailed, models.ErrorResponse{Details: "invalid id"})
115115
return
116116
}
117-
app, err := app.Load(id.ToPath().String())
117+
app, err := app.Load(id.ToPath())
118118
if err != nil {
119119
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
120120
return

‎internal/api/handlers/app_start.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func HandleAppStart(
4747
return
4848
}
4949

50-
app, err := app.Load(id.ToPath().String())
50+
app, err := app.Load(id.ToPath())
5151
if err != nil {
5252
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
5353
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

‎internal/api/handlers/app_stop.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func HandleAppStop(
3838
return
3939
}
4040

41-
app, err := app.Load(id.ToPath().String())
41+
app, err := app.Load(id.ToPath())
4242
if err != nil {
4343
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
4444
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

‎internal/api/handlers/bricks.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func HandleAppBrickInstancesList(
5555
}
5656
appPath := appId.ToPath()
5757

58-
app, err := app.Load(appPath.String())
58+
app, err := app.Load(appPath)
5959
if err != nil {
6060
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", appId.String()))
6161
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
@@ -85,7 +85,7 @@ func HandleAppBrickInstanceDetails(
8585
}
8686
appPath := appId.ToPath()
8787

88-
app, err := app.Load(appPath.String())
88+
app, err := app.Load(appPath)
8989
if err != nil {
9090
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", appId.String()))
9191
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
@@ -120,7 +120,7 @@ func HandleBrickCreate(
120120
}
121121
appPath := appId.ToPath()
122122

123-
app, err := app.Load(appPath.String())
123+
app, err := app.Load(appPath)
124124
if err != nil {
125125
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", appId.String()))
126126
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
@@ -190,7 +190,7 @@ func HandleBrickUpdates(
190190
}
191191
appPath := appId.ToPath()
192192

193-
app, err := app.Load(appPath.String())
193+
app, err := app.Load(appPath)
194194
if err != nil {
195195
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", appId.String()))
196196
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
@@ -236,7 +236,7 @@ func HandleBrickDelete(
236236
}
237237
appPath := appId.ToPath()
238238

239-
app, err := app.Load(appPath.String())
239+
app, err := app.Load(appPath)
240240
if err != nil {
241241
slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", appId.String()))
242242
render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

0 commit comments

Comments
 (0)