refactor: rename index generation functions to Load for consistency

Author: dido18

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

@@ -42,11 +42,11 @@ func Init(cfg config.Configuration) {
 
 var (
 	GetBricksIndex = sync.OnceValue(func() *bricksindex.BricksIndex {
-		return f.Must(bricksindex.GenerateBricksIndexFromFile(GetStaticStore().GetAssetsFolder()))
+		return f.Must(bricksindex.Load(GetStaticStore().GetAssetsFolder()))
 	})
 
 	GetModelsIndex = sync.OnceValue(func() *modelsindex.ModelsIndex {
-		return f.Must(modelsindex.GenerateModelsIndexFromFile(GetStaticStore().GetAssetsFolder()))
+		return f.Must(modelsindex.Load(GetStaticStore().GetAssetsFolder()))
 	})
 
 	GetProvisioner = sync.OnceValue(func() *orchestrator.Provision {

internal/e2e/daemon/brick_test.go

@@ -72,7 +72,7 @@ func TestBricksList(t *testing.T) {
 	require.NoError(t, err)
 
 	staticStore := store.NewStaticStore(paths.New("testdata", "assets", cfg.RunnerVersion).String())
-	brickIndex, err := bricksindex.GenerateBricksIndexFromFile(staticStore.GetAssetsFolder())
+	brickIndex, err := bricksindex.Load(staticStore.GetAssetsFolder())
 	require.NoError(t, err)
 
 	// Compare the response with the bricks index

internal/orchestrator/bricks/bricks_test.go

@@ -27,7 +27,7 @@ import (
 )
 
 func TestBrickCreate(t *testing.T) {
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+	bricksIndex, err := bricksindex.Load(paths.New("testdata"))
 	require.Nil(t, err)
 	brickService := NewService(nil, bricksIndex, nil)
 
@@ -97,7 +97,7 @@ func TestBrickCreate(t *testing.T) {
 		require.Nil(t, err)
 		err = paths.New("testdata/dummy-app").CopyDirTo(tempDummyApp)
 		require.Nil(t, err)
-		bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+		bricksIndex, err := bricksindex.Load(paths.New("testdata"))
 		require.Nil(t, err)
 		brickService := NewService(nil, bricksIndex, nil)
 
@@ -124,7 +124,7 @@ func TestBrickCreate(t *testing.T) {
 }
 
 func TestUpdateBrick(t *testing.T) {
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+	bricksIndex, err := bricksindex.Load(paths.New("testdata"))
 	require.Nil(t, err)
 	brickService := NewService(nil, bricksIndex, nil)
 
@@ -184,7 +184,7 @@ func TestUpdateBrick(t *testing.T) {
 		tempDummyApp := paths.New("testdata/dummy-app.temp")
 		require.Nil(t, tempDummyApp.RemoveAll())
 		require.Nil(t, paths.New("testdata/dummy-app").CopyDirTo(tempDummyApp))
-		bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+		bricksIndex, err := bricksindex.Load(paths.New("testdata"))
 		require.Nil(t, err)
 		brickService := NewService(nil, bricksIndex, nil)
 
@@ -213,7 +213,7 @@ func TestUpdateBrick(t *testing.T) {
 		tempDummyApp := paths.New("testdata/dummy-app-for-update.temp")
 		require.Nil(t, tempDummyApp.RemoveAll())
 		require.Nil(t, paths.New("testdata/dummy-app-for-update").CopyDirTo(tempDummyApp))
-		bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+		bricksIndex, err := bricksindex.Load(paths.New("testdata"))
 		require.Nil(t, err)
 		brickService := NewService(nil, bricksIndex, nil)
 

internal/orchestrator/bricksindex/bricks_index.go

@@ -91,7 +91,7 @@ func unmarshalBricksIndex(content io.Reader) (*BricksIndex, error) {
 	return &index, nil
 }
 
-func GenerateBricksIndexFromFile(dir *paths.Path) (*BricksIndex, error) {
+func Load(dir *paths.Path) (*BricksIndex, error) {
 	content, err := dir.Join("bricks-list.yaml").Open()
 	if err != nil {
 		return nil, err

internal/orchestrator/bricksindex/bricks_index_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 func TestGenerateBricksIndexFromFile(t *testing.T) {
-	index, err := GenerateBricksIndexFromFile(paths.New("testdata"))
+	index, err := Load(paths.New("testdata"))
 	require.NoError(t, err)
 
 	// Check if ports are correctly set
@@ -189,7 +189,7 @@ func TestBricksIndexYAMLFormats(t *testing.T) {
 			err := os.WriteFile(brickIndex.String(), []byte(tc.yamlContent), 0600)
 			require.NoError(t, err)
 
-			index, err := GenerateBricksIndexFromFile(paths.New(tempDir))
+			index, err := Load(paths.New(tempDir))
 			if tc.expectedError != "" {
 				require.Error(t, err)
 				require.Contains(t, err.Error(), tc.expectedError)

internal/orchestrator/modelsindex/models_index.go

@@ -95,7 +95,7 @@ func (m *ModelsIndex) GetModelsByBricks(bricks []string) []AIModel {
 	return matchingModels
 }
 
-func GenerateModelsIndexFromFile(dir *paths.Path) (*ModelsIndex, error) {
+func Load(dir *paths.Path) (*ModelsIndex, error) {
 	content, err := dir.Join("models-list.yaml").ReadFile()
 	if err != nil {
 		return nil, err

internal/orchestrator/modelsindex/modelsindex_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestModelsIndex(t *testing.T) {
-	modelsIndex, err := GenerateModelsIndexFromFile(paths.New("testdata"))
+	modelsIndex, err := Load(paths.New("testdata"))
 	require.NoError(t, err)
 	require.NotNil(t, modelsIndex)
 
@@ -40,7 +40,7 @@ func TestModelsIndex(t *testing.T) {
 
 	t.Run("it fails if model-list.yaml does not exist", func(t *testing.T) {
 		nonExistentPath := paths.New("nonexistentdir")
-		modelsIndex, err := GenerateModelsIndexFromFile(nonExistentPath)
+		modelsIndex, err := Load(nonExistentPath)
 		assert.Error(t, err)
 		assert.Nil(t, modelsIndex)
 	})

internal/orchestrator/orchestrator_test.go

@@ -461,7 +461,7 @@ bricks:
 `)
 	err = cfg.AssetsDir().Join("bricks-list.yaml").WriteFile(bricksIndexContent)
 	require.NoError(t, err)
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(cfg.AssetsDir())
+	bricksIndex, err := bricksindex.Load(cfg.AssetsDir())
 	assert.NoError(t, err)
 
 	modelsIndexContent := []byte(`
@@ -483,7 +483,7 @@ models:
 `)
 	err = cfg.AssetsDir().Join("models-list.yaml").WriteFile(modelsIndexContent)
 	require.NoError(t, err)
-	modelIndex, err := modelsindex.GenerateModelsIndexFromFile(cfg.AssetsDir())
+	modelIndex, err := modelsindex.Load(cfg.AssetsDir())
 	require.NoError(t, err)
 
 	env := getAppEnvironmentVariables(appDesc, bricksIndex, modelIndex)
@@ -546,7 +546,7 @@ bricks:
 `)
 	err = cfg.AssetsDir().Join("bricks-list.yaml").WriteFile(bricksIndexContent)
 	require.NoError(t, err)
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(cfg.AssetsDir())
+	bricksIndex, err := bricksindex.Load(cfg.AssetsDir())
 	assert.NoError(t, err)
 
 	modelsIndexContent := []byte(`
@@ -568,7 +568,7 @@ models:
 `)
 	err = cfg.AssetsDir().Join("models-list.yaml").WriteFile(modelsIndexContent)
 	require.NoError(t, err)
-	modelIndex, err := modelsindex.GenerateModelsIndexFromFile(cfg.AssetsDir())
+	modelIndex, err := modelsindex.Load(cfg.AssetsDir())
 	require.NoError(t, err)
 
 	env := getAppEnvironmentVariables(appDesc, bricksIndex, modelIndex)

internal/orchestrator/provision_test.go

@@ -104,7 +104,7 @@ bricks:
 	require.NoError(t, err)
 
 	// Override brick index with custom test content
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(cfg.AssetsDir())
+	bricksIndex, err := bricksindex.Load(cfg.AssetsDir())
 	require.Nil(t, err, "Failed to load bricks index with custom content")
 
 	br, ok := bricksIndex.FindBrickByID("arduino:video_object_detection")
@@ -301,7 +301,7 @@ bricks:
 	err := cfg.AssetsDir().Join("bricks-list.yaml").WriteFile(bricksIndexContent)
 	require.NoError(t, err)
 
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(cfg.AssetsDir())
+	bricksIndex, err := bricksindex.Load(cfg.AssetsDir())
 	require.Nil(t, err, "Failed to load bricks index with custom content")
 	br, ok := bricksIndex.FindBrickByID("arduino:dbstorage_tsstore")
 	require.True(t, ok, "Brick arduino:dbstorage_tsstore should exist in the index")