refactoring variables

Author: mirkoCrobu

internal/orchestrator/bricks/bricks.go

@@ -80,7 +80,7 @@ func (s *Service) AppBrickInstancesList(a *app.ArduinoApp) (AppBrickInstancesRes
 			return AppBrickInstancesResult{}, fmt.Errorf("brick not found with id %s", brickInstance.ID)
 		}
 
-		variablesMap, instanceVariables := getBrickConfigDetails(brick, brickInstance.Variables)
+		variablesMap, configVariables := getBrickConfigDetails(brick, brickInstance.Variables)
 
 		res.BrickInstances[i] = BrickInstance{
 			ID:              brick.ID,
@@ -90,7 +90,7 @@ func (s *Service) AppBrickInstancesList(a *app.ArduinoApp) (AppBrickInstancesRes
 			Status:          "installed",
 			ModelID:         brickInstance.Model, // TODO: in case is not set by the user, should we return the default model?
 			Variables:       variablesMap,        // TODO: do we want to show also the default value of not explicitly set variables?
-			ConfigVariables: instanceVariables,
+			ConfigVariables: configVariables,
 		}
 
 	}
@@ -108,7 +108,7 @@ func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (Br
 		return BrickInstance{}, fmt.Errorf("brick %s not added in the app", brickID)
 	}
 
-	variables, instanceVariables := getBrickConfigDetails(brick, a.Descriptor.Bricks[brickIndex].Variables)
+	variables, configVariables := getBrickConfigDetails(brick, a.Descriptor.Bricks[brickIndex].Variables)
 
 	modelID := a.Descriptor.Bricks[brickIndex].Model
 	if modelID == "" {
@@ -122,7 +122,7 @@ func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (Br
 		Category:        brick.Category,
 		Status:          "installed", // For now every Arduino brick are installed
 		Variables:       variables,
-		ConfigVariables: instanceVariables,
+		ConfigVariables: configVariables,
 		ModelID:         modelID,
 	}, nil
 }

internal/orchestrator/bricks/bricks_test.go

@@ -113,11 +113,11 @@ func TestBrickCreate(t *testing.T) {
 
 func TestGetBrickInstanceVariableDetails(t *testing.T) {
 	tests := []struct {
-		name                     string
-		brick                    *bricksindex.Brick
-		userVariables            map[string]string
-		expectedInstanceVariable []BrickConfigVariable
-		expectedVariableMap      map[string]string
+		name                    string
+		brick                   *bricksindex.Brick
+		userVariables           map[string]string
+		expectedConfigVariables []BrickConfigVariable
+		expectedVariableMap     map[string]string
 	}{
 		{
 			name: "variable is present in the map",
@@ -127,7 +127,7 @@ func TestGetBrickInstanceVariableDetails(t *testing.T) {
 				},
 			},
 			userVariables: map[string]string{"VAR1": "value1"},
-			expectedInstanceVariable: []BrickConfigVariable{
+			expectedConfigVariables: []BrickConfigVariable{
 				{Name: "VAR1", Value: "value1", Description: "desc", Required: true},
 			},
 			expectedVariableMap: map[string]string{"VAR1": "value1"},
@@ -140,7 +140,7 @@ func TestGetBrickInstanceVariableDetails(t *testing.T) {
 				},
 			},
 			userVariables: map[string]string{},
-			expectedInstanceVariable: []BrickConfigVariable{
+			expectedConfigVariables: []BrickConfigVariable{
 				{Name: "VAR1", Value: "", Description: "desc", Required: true},
 			},
 			expectedVariableMap: map[string]string{"VAR1": ""},
@@ -153,7 +153,7 @@ func TestGetBrickInstanceVariableDetails(t *testing.T) {
 				},
 			},
 			userVariables: map[string]string{},
-			expectedInstanceVariable: []BrickConfigVariable{
+			expectedConfigVariables: []BrickConfigVariable{
 				{Name: "VAR1", Value: "default", Description: "desc", Required: false},
 			},
 			expectedVariableMap: map[string]string{"VAR1": "default"},
@@ -167,26 +167,26 @@ func TestGetBrickInstanceVariableDetails(t *testing.T) {
 				},
 			},
 			userVariables: map[string]string{"VAR1": "v1"},
-			expectedInstanceVariable: []BrickConfigVariable{
+			expectedConfigVariables: []BrickConfigVariable{
 				{Name: "VAR1", Value: "v1", Description: "desc1", Required: true},
 				{Name: "VAR2", Value: "def2", Description: "desc2", Required: false},
 			},
 			expectedVariableMap: map[string]string{"VAR1": "v1", "VAR2": "def2"},
 		},
 		{
-			name:                     "no variables",
-			brick:                    &bricksindex.Brick{Variables: []bricksindex.BrickVariable{}},
-			userVariables:            map[string]string{},
-			expectedInstanceVariable: []BrickConfigVariable{},
-			expectedVariableMap:      map[string]string{},
+			name:                    "no variables",
+			brick:                   &bricksindex.Brick{Variables: []bricksindex.BrickVariable{}},
+			userVariables:           map[string]string{},
+			expectedConfigVariables: []BrickConfigVariable{},
+			expectedVariableMap:     map[string]string{},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actualVariableMap, actualInstanceVariables := getBrickConfigDetails(tt.brick, tt.userVariables)
+			actualVariableMap, actualConfigVariables := getBrickConfigDetails(tt.brick, tt.userVariables)
 			require.Equal(t, tt.expectedVariableMap, actualVariableMap)
-			require.Equal(t, tt.expectedInstanceVariable, actualInstanceVariables)
+			require.Equal(t, tt.expectedConfigVariables, actualConfigVariables)
 		})
 	}
 }