Proxy configuration is now part of Configuration struct

Author: cmaglie

configs/configuration.go

@@ -46,6 +46,18 @@ type Configuration struct {
 
 	// BoardManagerAdditionalUrls contains the additional URL for 3rd party packages
 	BoardManagerAdditionalUrls []*url.URL
+
+	// ProxyType is the type of proxy configured
+	ProxyType string
+
+	// ProxyHostname is the proxy hostname
+	ProxyHostname string
+
+	// ProxyUsername is the proxy user
+	ProxyUsername string
+
+	// ProxyPassword is the proxy password
+	ProxyPassword string
 }
 
 var defaultPackageIndexURL, _ = url.Parse("https://downloads.arduino.cc/packages/package_index.json")
@@ -66,6 +78,7 @@ func NewConfiguration() (*Configuration, error) {
 		DataDir:                    dataDir,
 		SketchbookDir:              sketchbookDir,
 		BoardManagerAdditionalUrls: []*url.URL{defaultPackageIndexURL},
+		ProxyType:                  "auto",
 	}, nil
 }
 

configs/env_vars_serializer.go

@@ -26,7 +26,7 @@ import (
 // LoadFromEnv read configurations from the environment variables
 func (config *Configuration) LoadFromEnv() {
 	if p, has := os.LookupEnv("PROXY_TYPE"); has {
-		ProxyType = p
+		config.ProxyType = p
 	}
 	if dir, has := os.LookupEnv("ARDUINO_SKETCHBOOK_DIR"); has {
 		config.SketchbookDir = paths.New(dir)

configs/preferences_txt_serializer.go

@@ -76,7 +76,7 @@ func (config *Configuration) LoadFromDesktopIDEPreferences() error {
 		logrus.WithError(err).Warn("Error during unserialize from IDE preferences")
 		return err
 	}
-	err = proxyConfigsFromIDEPrefs(props)
+	err = config.proxyConfigsFromIDEPrefs(props)
 	if err != nil {
 		logrus.WithError(err).Warn("Error during unserialize from IDE preferences")
 		return err
@@ -94,7 +94,7 @@ func (config *Configuration) LoadFromDesktopIDEPreferences() error {
 	return nil
 }
 
-func proxyConfigsFromIDEPrefs(props *properties.Map) error {
+func (config *Configuration) proxyConfigsFromIDEPrefs(props *properties.Map) error {
 	proxy := props.SubTree("proxy")
 	switch proxy.Get("type") {
 	case "auto":
@@ -110,10 +110,10 @@ func proxyConfigsFromIDEPrefs(props *properties.Map) error {
 		username := manualConfig.Get("username")
 		password := manualConfig.Get("password")
 
-		ProxyType = "manual"
-		ProxyHostname = hostname
-		ProxyUsername = username
-		ProxyPassword = password
+		config.ProxyType = "manual"
+		config.ProxyHostname = hostname
+		config.ProxyUsername = username
+		config.ProxyPassword = password
 		break
 	case "none":
 		// No proxy

configs/proxy.go

@@ -67,11 +67,11 @@ func (config *Configuration) LoadFromYAML(path *paths.Path) error {
 		config.SketchbookDir = paths.New(ret.SketchbookPath)
 	}
 	if ret.ProxyType != "" {
-		ProxyType = ret.ProxyType
+		config.ProxyType = ret.ProxyType
 		if ret.ProxyManualConfig != nil {
-			ProxyHostname = ret.ProxyManualConfig.Hostname
-			ProxyUsername = ret.ProxyManualConfig.Username
-			ProxyPassword = ret.ProxyManualConfig.Password
+			config.ProxyHostname = ret.ProxyManualConfig.Hostname
+			config.ProxyUsername = ret.ProxyManualConfig.Username
+			config.ProxyPassword = ret.ProxyManualConfig.Password
 		}
 	}
 	if ret.BoardsManager != nil {
@@ -96,12 +96,12 @@ func (config *Configuration) SerializeToYAML() ([]byte, error) {
 	if config.DataDir != nil {
 		c.ArduinoDataDir = config.DataDir.String()
 	}
-	c.ProxyType = ProxyType
-	if ProxyType == "manual" {
+	c.ProxyType = config.ProxyType
+	if config.ProxyType == "manual" {
 		c.ProxyManualConfig = &yamlProxyConfig{
-			Hostname: ProxyHostname,
-			Username: ProxyUsername,
-			Password: ProxyPassword,
+			Hostname: config.ProxyHostname,
+			Username: config.ProxyUsername,
+			Password: config.ProxyPassword,
 		}
 	}
 	if len(config.BoardManagerAdditionalUrls) > 1 {