DRAFT 3

Author: cmaglie

commands/instances.go

@@ -177,7 +177,7 @@ func (s *arduinoCoreServerImpl) Init(req *rpc.InitRequest, stream rpc.ArduinoCor
 	defaultIndexURL, _ := utils.URLParse(globals.DefaultIndexURL)
 	allPackageIndexUrls := []*url.URL{defaultIndexURL}
 	if profile == nil {
-		for _, u := range s.settings.GetStringSlice("board_manager.additional_urls") {
+		for _, u := range s.settings.BoardManagerAdditionalUrls() {
 			URL, err := utils.URLParse(u)
 			if err != nil {
 				e := &cmderrors.InitFailedError{

commands/service_settings.go

@@ -22,6 +22,7 @@ import (
 	"reflect"
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
+	"github.com/arduino/arduino-cli/internal/cli/configuration"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"google.golang.org/protobuf/proto"
 	"gopkg.in/yaml.v3"
@@ -192,16 +193,17 @@ func (s *arduinoCoreServerImpl) ConfigurationOpen(ctx context.Context, req *rpc.
 		if err != nil {
 			return nil, fmt.Errorf("error unmarshalling settings: %v", err)
 		}
-		return &rpc.ConfigurationOpenResponse{}, nil
 	case "json":
 		err := json.Unmarshal([]byte(req.GetEncodedSettings()), s.settings)
 		if err != nil {
 			return nil, fmt.Errorf("error unmarshalling settings: %v", err)
 		}
-		return &rpc.ConfigurationOpenResponse{}, nil
 	default:
 		return nil, &cmderrors.InvalidArgumentError{Message: fmt.Sprintf("unsupported format: %s", req.GetSettingsFormat())}
 	}
+
+	configuration.BindEnvVars(s.settings)
+	return &rpc.ConfigurationOpenResponse{}, nil
 }
 
 // SettingsEnumerate returns the list of all the settings keys.

go-configmap/cli.go

@@ -23,7 +23,6 @@ func (c *Map) SetFromCLIArgs(key string, args ...string) error {
 		}
 		return nil
 	}
-	fmt.Println(key, args)
 
 	// Find the correct type for the given setting
 	valueType, ok := c.schema[key]

internal/cli/configuration/configuration.go

@@ -44,49 +44,6 @@ func NewSettings() *Settings {
 	return res
 }
 
-// // Init initialize defaults and read the configuration file.
-// // Please note the logging system hasn't been configured yet,
-// // so logging shouldn't be used here.
-// func Init(configFile string) *Settings {
-// 	// Create a new viper instance with default values for all the settings
-// 	settings := NewSettings()
-
-// 	// Set config name and config path
-// 	if configFilePath := paths.New(configFile); configFilePath != nil {
-// 		settings.SetConfigName(strings.TrimSuffix(configFilePath.Base(), configFilePath.Ext()))
-// 		settings.AddConfigPath(configFilePath.Parent().String())
-// 	} else {
-// 		configDir := settings.GetString("directories.Data")
-// 		// Get default data path if none was provided
-// 		if configDir == "" {
-// 			configDir = getDefaultArduinoDataDir()
-// 		}
-
-// 		settings.SetConfigName("arduino-cli")
-// 		settings.AddConfigPath(configDir)
-// 	}
-
-// 	// Attempt to read config file
-// 	if err := settings.ReadInConfig(); err != nil {
-// 		// ConfigFileNotFoundError is acceptable, anything else
-// 		// should be reported to the user
-// 		if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
-// 			feedback.Warning(tr("Error reading config file: %v", err))
-// 		}
-// 	}
-
-// 	return settings
-// }
-
-// BindFlags creates all the flags binding between the cobra Command and the instance of viper
-// func BindFlags(cmd *cobra.Command, settings *Settings) {
-// 	settings.BindPFlag("logging.level", cmd.Flag("log-level"))
-// 	settings.BindPFlag("logging.file", cmd.Flag("log-file"))
-// 	settings.BindPFlag("logging.format", cmd.Flag("log-format"))
-// 	settings.BindPFlag("board_manager.additional_urls", cmd.Flag("additional-urls"))
-// 	settings.BindPFlag("output.no_color", cmd.Flag("no-color"))
-// }
-
 // getDefaultArduinoDataDir returns the full path to the default arduino folder
 func getDefaultArduinoDataDir() string {
 	userHomeDir, err := os.UserHomeDir()

internal/cli/configuration/defaults.go

@@ -64,19 +64,22 @@ func SetDefaults(settings *Settings) {
 
 	// updater settings
 	setDefaultValueAndKeyTypeSchema("updater.enable_notification", true)
+}
 
+// BindEnvVars binds environment variables to the settings
+func BindEnvVars(settings *Settings) {
 	// Bind env vars
-	settings.Defaults.InjectEnvVars(os.Environ(), "ARDUINO")
+	settings.InjectEnvVars(os.Environ(), "ARDUINO")
 
 	// Bind env aliases to keep backward compatibility
 	setIfEnvExists := func(key, env string) {
 		if v, ok := os.LookupEnv(env); ok {
-			settings.Defaults.SetFromCLIArgs(key, v)
+			settings.SetFromCLIArgs(key, v)
 		}
 	}
 	setIfEnvExists("library.enable_unsafe_install", "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL")
-	setIfEnvExists("directories.User", "ARDUINO_SKETCHBOOK_DIR")
-	setIfEnvExists("directories.Downloads", "ARDUINO_DOWNLOADS_DIR")
-	setIfEnvExists("directories.Data", "ARDUINO_DATA_DIR")
+	setIfEnvExists("directories.user", "ARDUINO_SKETCHBOOK_DIR")
+	setIfEnvExists("directories.downloads", "ARDUINO_DOWNLOADS_DIR")
+	setIfEnvExists("directories.data", "ARDUINO_DATA_DIR")
 	setIfEnvExists("sketch.always_export_binaries", "ARDUINO_SKETCH_ALWAYS_EXPORT_BINARIES")
 }

main.go

@@ -39,14 +39,14 @@ func main() {
 	ctx = context.WithValue(ctx, "config_file", configFile)
 
 	// Read the settings from the configuration file
+	openReq := &rpc.ConfigurationOpenRequest{SettingsFormat: "yaml"}
 	if configData, err := paths.New(configFile).ReadFile(); err == nil {
-		_, err := srv.ConfigurationOpen(ctx, &rpc.ConfigurationOpenRequest{SettingsFormat: "yaml", EncodedSettings: string(configData)})
-		if err != nil {
-			feedback.FatalError(fmt.Errorf("couldn't load configuration: %w", err), feedback.ErrGeneric)
-		}
+		openReq.EncodedSettings = string(configData)
 	} else if !os.IsNotExist(err) {
 		feedback.FatalError(fmt.Errorf("couldn't read configuration file: %w", err), feedback.ErrGeneric)
-		// TODO: read from default location
+	}
+	if _, err := srv.ConfigurationOpen(ctx, openReq); err != nil {
+		feedback.FatalError(fmt.Errorf("couldn't load configuration: %w", err), feedback.ErrGeneric)
 	}
 
 	// Get the current settings from the server