add config variables for brick details

Author: mirkoCrobu

internal/orchestrator/bricks/bricks.go

@@ -78,7 +78,7 @@ func (s *Service) AppBrickInstancesList(a *app.ArduinoApp) (AppBrickInstancesRes
 			return AppBrickInstancesResult{}, fmt.Errorf("brick not found with id %s", brickInstance.ID)
 		}
 
-		variablesMap, configVariables := getBrickConfigDetails(brick, brickInstance.Variables)
+		variablesMap, configVariables := getInstanceBrickConfigVAriableDetails(brick, brickInstance.Variables)
 
 		res.BrickInstances[i] = BrickInstanceListItem{
 			ID:              brick.ID,
@@ -107,7 +107,7 @@ func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (Br
 		return BrickInstance{}, fmt.Errorf("brick %s not added in the app", brickID)
 	}
 
-	variables, configVariables := getBrickConfigDetails(brick, a.Descriptor.Bricks[brickIndex].Variables)
+	variables, configVariables := getInstanceBrickConfigVAriableDetails(brick, a.Descriptor.Bricks[brickIndex].Variables)
 
 	modelID := a.Descriptor.Bricks[brickIndex].Model
 	if modelID == "" {
@@ -134,7 +134,7 @@ func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (Br
 	}, nil
 }
 
-func getBrickConfigDetails(
+func getInstanceBrickConfigVAriableDetails(
 	brick *bricksindex.Brick, userVariables map[string]string,
 ) (map[string]string, []BrickConfigVariable) {
 	variablesMap := make(map[string]string, len(brick.Variables))
@@ -167,15 +167,6 @@ func (s *Service) BricksDetails(id string, idProvider *app.IDProvider,
 		return BrickDetailsResult{}, ErrBrickNotFound
 	}
 
-	variables := make(map[string]BrickVariable, len(brick.Variables))
-	for _, v := range brick.Variables {
-		variables[v.Name] = BrickVariable{
-			DefaultValue: v.DefaultValue,
-			Description:  v.Description,
-			Required:     v.IsRequired(),
-		}
-	}
-
 	readme, err := s.staticStore.GetBrickReadmeFromID(brick.ID)
 	if err != nil {
 		return BrickDetailsResult{}, fmt.Errorf("cannot open docs for brick %s: %w", id, err)
@@ -200,6 +191,9 @@ func (s *Service) BricksDetails(id string, idProvider *app.IDProvider,
 	if err != nil {
 		return BrickDetailsResult{}, fmt.Errorf("unable to get used by apps: %w", err)
 	}
+
+	variables, configVariables := getBrickConfigVariableDetails(brick)
+
 	return BrickDetailsResult{
 		ID:           id,
 		Name:         brick.Name,
@@ -220,9 +214,33 @@ func (s *Service) BricksDetails(id string, idProvider *app.IDProvider,
 				Description: m.ModuleDescription,
 			}
 		}),
+		ConfigVariables: configVariables,
 	}, nil
 }
 
+func getBrickConfigVariableDetails(
+	brick *bricksindex.Brick) (map[string]BrickVariable, []BrickConfigVariable) {
+	variablesMap := make(map[string]BrickVariable, len(brick.Variables))
+	variableDetails := make([]BrickConfigVariable, 0, len(brick.Variables))
+
+	for _, v := range brick.Variables {
+		variablesMap[v.Name] = BrickVariable{
+			DefaultValue: v.DefaultValue,
+			Description:  v.Description,
+			Required:     v.IsRequired(),
+		}
+
+		variableDetails = append(variableDetails, BrickConfigVariable{
+			Name:        v.Name,
+			Value:       v.DefaultValue,
+			Description: v.Description,
+			Required:    v.IsRequired(),
+		})
+	}
+
+	return variablesMap, variableDetails
+}
+
 func getUsedByApps(
 	cfg config.Configuration, brickId string, idProvider *app.IDProvider) ([]AppReference, error) {
 	var (

internal/orchestrator/bricks/bricks_test.go

@@ -317,7 +317,7 @@ func TestGetBrickInstanceVariableDetails(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actualVariableMap, actualConfigVariables := getBrickConfigDetails(tt.brick, tt.userVariables)
+			actualVariableMap, actualConfigVariables := getInstanceBrickConfigVAriableDetails(tt.brick, tt.userVariables)
 			require.Equal(t, tt.expectedVariableMap, actualVariableMap)
 			require.Equal(t, tt.expectedConfigVariables, actualConfigVariables)
 		})

internal/orchestrator/bricks/types.go

@@ -91,10 +91,11 @@ type BrickDetailsResult struct {
 	Category         string                   `json:"category"`
 	Status           string                   `json:"status"`
 	RequireModel     bool                     `json:"require_model"`
-	Variables        map[string]BrickVariable `json:"variables,omitempty"`
+	Variables        map[string]BrickVariable `json:"variables" description:"Deprecated: use config_variables instead. This field is kept for backward compatibility."`
 	Readme           string                   `json:"readme"`
 	ApiDocsPath      string                   `json:"api_docs_path"`
 	CodeExamples     []CodeExample            `json:"code_examples"`
 	UsedByApps       []AppReference           `json:"used_by_apps"`
 	CompatibleModels []AIModel                `json:"compatible_models"`
+	ConfigVariables  []BrickConfigVariable    `json:"config_variables"`
 }