Merge pull request #3737 from ActiveState/CP-1106

Remote installer respects and forwards config-set

Author: Naatan

cmd/state-installer/cmd.go

@@ -72,7 +72,11 @@ func main() {
 			exitCode = 1
 		}
 
-		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, an.Wait, logging.Close); err != nil {
+		ev := []func(){rollbar.Wait, logging.Close}
+		if an != nil {
+			ev = append(ev, an.Wait)
+		}
+		if err := events.WaitForEvents(5*time.Second, ev...); err != nil {
 			logging.Warning("state-installer failed to wait for events: %v", err)
 		}
 
@@ -98,6 +102,22 @@ func main() {
 		multilog.Critical("Could not set up configuration handler: " + errs.JoinMessage(err))
 		fmt.Fprintln(os.Stderr, err.Error())
 		exitCode = 1
+		return
+	}
+
+	// Set config as early as possible to ensure we respect the values
+	configArgs := []string{}
+	for i, arg := range os.Args[1:] {
+		if arg == "--config-set" && i+1 < len(os.Args[1:]) {
+			configArgs = append(configArgs, os.Args[1:][i+1])
+		}
+	}
+
+	if err := cfg.ApplyArgs(configArgs); err != nil {
+		multilog.Critical("Could not apply config: " + errs.JoinMessage(err))
+		fmt.Fprintln(os.Stderr, err.Error())
+		exitCode = 1
+		return
 	}
 
 	rollbar.SetConfig(cfg)
@@ -142,22 +162,10 @@ func main() {
 		break
 	}
 
-	// Parse command line arguments manually to extract config settings before analytics
-	params := newParams()
-
-	for i, arg := range processedArgs[1:] {
-		if arg == "--config-set" && i+1 < len(processedArgs[1:]) {
-			params.configSettings = append(params.configSettings, processedArgs[1:][i+1])
-		}
-	}
-
-	if err := applyConfigSettings(cfg, params.configSettings); err != nil {
-		logging.Warning("Could not apply config settings before analytics: %s", errs.JoinMessage(err))
-	}
-
 	an = sync.New(anaConst.SrcStateInstaller, cfg, nil, out)
 	an.Event(anaConst.CatInstallerFunnel, "start")
 
+	params := newParams()
 	cmd := captain.NewCommand(
 		"state-installer",
 		"",
@@ -522,44 +530,3 @@ func assertCompatibility() error {
 
 	return nil
 }
-
-func applyConfigSettings(cfg *config.Instance, configSettings []string) error {
-	for _, setting := range configSettings {
-		setting = strings.TrimSpace(setting)
-		if setting == "" {
-			continue // Skip empty settings
-		}
-		if err := applyConfigSetting(cfg, setting); err != nil {
-			return errs.Wrap(err, "Failed to apply config setting: %s", setting)
-		}
-	}
-	return nil
-}
-
-func applyConfigSetting(cfg *config.Instance, setting string) error {
-	var key, valueStr string
-
-	if strings.Contains(setting, "=") {
-		parts := strings.SplitN(setting, "=", 2)
-		if len(parts) == 2 {
-			key = strings.TrimSpace(parts[0])
-			valueStr = strings.TrimSpace(parts[1])
-		}
-	}
-
-	if key == "" || valueStr == "" {
-		return locale.NewInputError("err_config_invalid_format", "Config setting must be in 'key=value' format: {{.V0}}", setting)
-	}
-
-	// Store the raw string value without type validation since config options
-	// are not yet registered in the installer context
-	err := cfg.Set(key, valueStr)
-	if err != nil {
-		// Log the error but don't fail the installation for config issues
-		logging.Warning("Could not set config value %s=%s: %s", key, valueStr, errs.JoinMessage(err))
-		return locale.WrapError(err, "err_config_set", "Could not set value {{.V0}} for key {{.V1}}", valueStr, key)
-	}
-
-	logging.Debug("Config setting applied: %s=%s", key, valueStr)
-	return nil
-}

cmd/state-remote-installer/main.go

@@ -37,6 +37,7 @@ type Params struct {
 	force          bool
 	version        string
 	nonInteractive bool
+	configSettings []string
 }
 
 func newParams() *Params {
@@ -58,13 +59,18 @@ func main() {
 			exitCode = 1
 		}
 
-		if err := cfg.Close(); err != nil {
-			logging.Error("Failed to close config: %w", err)
+		ev := []func(){rollbar.Wait, logging.Close}
+		if an != nil {
+			ev = append(ev, an.Wait)
 		}
-
-		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, an.Wait, logging.Close); err != nil {
+		if err := events.WaitForEvents(5*time.Second, ev...); err != nil {
 			logging.Warning("state-remote-installer failed to wait for events: %v", err)
 		}
+
+		if cfg != nil {
+			events.Close("config", cfg.Close)
+		}
+
 		os.Exit(exitCode)
 	}()
 
@@ -84,6 +90,18 @@ func main() {
 		exitCode = 1
 	}
 
+	// Set config as early as possible to ensure we respect the values
+	configArgs := []string{}
+	for i, arg := range os.Args[1:] {
+		if arg == "--config-set" && i+1 < len(os.Args[1:]) {
+			configArgs = append(configArgs, os.Args[1:][i+1])
+		}
+	}
+
+	if err := cfg.ApplyArgs(configArgs); err != nil {
+		logging.Warning("Could not apply config settings before analytics: %s", errs.JoinMessage(err))
+	}
+
 	rollbar.SetConfig(cfg)
 
 	// Set up output handler
@@ -154,6 +172,11 @@ func main() {
 				Hidden:    true,
 				Value:     &params.nonInteractive,
 			},
+			{
+				Name:        "config-set",
+				Description: "Set config values in 'key=value' format, can be specified multiple times",
+				Value:       &params.configSettings,
+			},
 		},
 		[]*captain.Argument{},
 		func(ccmd *captain.Command, args []string) error {
@@ -224,6 +247,11 @@ func execute(out output.Outputer, prompt prompt.Prompter, cfg *config.Instance,
 	if params.force {
 		args = append(args, "--force") // forward to installer
 	}
+	if len(params.configSettings) > 0 {
+		for _, setting := range params.configSettings {
+			args = append(args, "--config-set", setting)
+		}
+	}
 	env := []string{
 		constants.InstallerNoSubshell + "=true",
 	}

internal/config/instance.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -258,3 +259,36 @@ func (i *Instance) GetStringMap(key string) map[string]interface{} {
 func (i *Instance) ConfigPath() string {
 	return i.appDataDir
 }
+
+// ApplyArgs applies command line arguments to the config instance
+// These take the format of 'key=value'
+func (i *Instance) ApplyArgs(args []string) error {
+	for _, setting := range args {
+		setting = strings.TrimSpace(setting)
+		if setting == "" {
+			continue // Skip empty settings
+		}
+		var key, valueStr string
+
+		if strings.Contains(setting, "=") {
+			parts := strings.SplitN(setting, "=", 2)
+			if len(parts) == 2 {
+				key = strings.TrimSpace(parts[0])
+				valueStr = strings.TrimSpace(parts[1])
+			}
+		}
+
+		if key == "" || valueStr == "" {
+			return errs.New("Config setting must be in 'key=value' format: %s", setting)
+		}
+
+		// Store the raw string value without type validation since config options
+		// are not yet registered in the installer context
+		err := i.Set(key, valueStr)
+		if err != nil {
+			// Log the error but don't fail the installation for config issues
+			return errs.Wrap(err, "Could not set value %s for key %s", valueStr, key)
+		}
+	}
+	return nil
+}