Merge branch 'master' into CP-1084

Author: mitchell-as

cmd/state-installer/cmd.go

@@ -48,6 +48,7 @@ type Params struct {
 	activateDefault *project.Namespaced
 	showVersion     bool
 	nonInteractive  bool
+	configSettings  []string
 }
 
 func newParams() *Params {
@@ -71,13 +72,14 @@ func main() {
 			exitCode = 1
 		}
 
+		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, an.Wait, logging.Close); err != nil {
+			logging.Warning("state-installer failed to wait for events: %v", err)
+		}
+
 		if cfg != nil {
 			events.Close("config", cfg.Close)
 		}
 
-		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, an.Wait, logging.Close); err != nil {
-			logging.Warning("state-installer failed to wait for events: %v", err)
-		}
 		os.Exit(exitCode)
 	}()
 
@@ -194,6 +196,11 @@ func main() {
 				Value: &params.showVersion,
 			},
 			{Name: "non-interactive", Shorthand: "n", Hidden: true, Value: &params.nonInteractive}, // don't prompt
+			{
+				Name:        "config-set",
+				Description: "Set config values in 'key=value' format, can be specified multiple times",
+				Value:       &params.configSettings,
+			},
 			// The remaining flags are for backwards compatibility (ie. we don't want to error out when they're provided)
 			{Name: "channel", Hidden: true, Value: &garbageString},
 			{Name: "bbb", Shorthand: "b", Hidden: true, Value: &garbageString},
@@ -328,13 +335,26 @@ func execute(out output.Outputer, cfg *config.Instance, an analytics.Dispatcher,
 		out.Print(fmt.Sprintf("State Tool Package Manager is already installed at [NOTICE]%s[/RESET]. To reinstall use the [ACTIONABLE]--force[/RESET] flag.", installPath))
 		an.Event(anaConst.CatInstallerFunnel, "already-installed")
 		params.isUpdate = true
+
+		// Apply config settings even when already installed
+		if err := applyConfigSettings(cfg, params.configSettings); err != nil {
+			return errs.Wrap(err, "Failed to apply config settings")
+		}
+
 		return postInstallEvents(out, cfg, an, params)
 	}
 
 	if err := installOrUpdateFromLocalSource(out, cfg, an, payloadPath, params); err != nil {
 		return err
 	}
 	storeInstallSource(params.sourceInstaller)
+
+	// Apply config settings after installation but before post-install events
+	// This ensures the State Tool's config is properly set up
+	if err := applyConfigSettings(cfg, params.configSettings); err != nil {
+		return errs.Wrap(err, "Failed to apply config settings")
+	}
+
 	return postInstallEvents(out, cfg, an, params)
 }
 
@@ -501,3 +521,44 @@ 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-mcp/internal/registry/tools.go

@@ -96,7 +96,8 @@ func DownloadLogsTool() Tool {
 			}
 
 			runner := downloadlogs.New(p)
-			params := downloadlogs.NewParams(url)
+			params := downloadlogs.NewParams()
+			params.LogUrl = url
 			err = runner.Run(params)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("error downloading logs: %s", errs.JoinMessage(err))), nil

cmd/state-remote-installer/main.go

@@ -208,7 +208,7 @@ func execute(out output.Outputer, prompt prompt.Prompter, cfg *config.Instance,
 		version = fmt.Sprintf("%s (%s)", version, channel)
 	}
 
-	update := updater.NewUpdateInstaller(an, availableUpdate)
+	update := updater.NewUpdateInstaller(cfg, an, availableUpdate)
 	out.Fprint(os.Stdout, locale.Tl("remote_install_downloading", "• Downloading State Tool version [NOTICE]{{.V0}}[/RESET]... ", version))
 	tmpDir, err := update.DownloadAndUnpack()
 	if err != nil {

cmd/state-svc/internal/notifications/notifications.go

@@ -11,7 +11,6 @@ import (
 	"github.com/ActiveState/cli/internal/config"
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
-	"github.com/ActiveState/cli/internal/fileutils"
 	"github.com/ActiveState/cli/internal/graph"
 	"github.com/ActiveState/cli/internal/httputil"
 	"github.com/ActiveState/cli/internal/logging"
@@ -21,8 +20,14 @@ import (
 	auth "github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/sysinfo"
 	"github.com/blang/semver"
+
+	configMediator "github.com/ActiveState/cli/internal/mediators/config"
 )
 
+func init() {
+	configMediator.RegisterOption(constants.NotificationsURLConfig, configMediator.String, "")
+}
+
 const ConfigKeyLastReport = "notifications.last_reported"
 
 type Notifications struct {
@@ -48,11 +53,11 @@ func New(cfg *config.Instance, auth *auth.Auth) (*Notifications, error) {
 		defer func() {
 			panics.LogAndPanic(recover(), debug.Stack())
 		}()
-		resp, err := fetch()
+		resp, err := fetch(cfg)
 		return resp, err
 	})
 
-	return &Notifications{
+	notifications := &Notifications{
 		baseParams: &ConditionParams{
 			OS:           sysinfo.OS().String(),
 			OSVersion:    NewVersionFromSysinfo(osVersion),
@@ -62,7 +67,20 @@ func New(cfg *config.Instance, auth *auth.Auth) (*Notifications, error) {
 		cfg:  cfg,
 		auth: auth,
 		poll: poll,
-	}, nil
+	}
+
+	configMediator.AddListener(constants.NotificationsURLConfig, func() {
+		notifications.poll.Close()
+		notifications.poll = poller.New(10*time.Minute, func() (interface{}, error) {
+			defer func() {
+				panics.LogAndPanic(recover(), debug.Stack())
+			}()
+			resp, err := fetch(cfg)
+			return resp, err
+		})
+	})
+
+	return notifications, nil
 }
 
 func (m *Notifications) Close() error {
@@ -168,8 +186,7 @@ func check(params *ConditionParams, notifications []*graph.NotificationInfo, las
 		// Check if message is within date range
 		inRange, err := notificationInDateRange(notification, baseTime)
 		if err != nil {
-			logging.Warning("Could not check if notification %s is in date range: %v", notification.ID, err)
-			continue
+			return nil, errs.Wrap(err, "Could not check if notification %s is in date range", notification.ID)
 		}
 		if !inRange {
 			logging.Debug("Skipping notification %s as it is outside of its date range", notification.ID)
@@ -198,17 +215,36 @@ func check(params *ConditionParams, notifications []*graph.NotificationInfo, las
 	return filteredNotifications, nil
 }
 
-func fetch() ([]*graph.NotificationInfo, error) {
+func fetch(cfg *config.Instance) ([]*graph.NotificationInfo, error) {
 	var body []byte
 	var err error
 
-	if v := os.Getenv(constants.NotificationsOverrideEnvVarName); v != "" {
-		body, err = fileutils.ReadFile(v)
+	var (
+		notificationsURL string
+
+		envURL    = os.Getenv(constants.NotificationsOverrideEnvVarName)
+		configURL = cfg.GetString(constants.NotificationsURLConfig)
+	)
+
+	switch {
+	case envURL != "":
+		notificationsURL = envURL
+	case configURL != "":
+		notificationsURL = configURL
+	default:
+		notificationsURL = constants.NotificationsInfoURL
+	}
+
+	logging.Debug("Fetching notifications from %s", notificationsURL)
+	// Check if this is a local file path (when using environment override)
+	if envURL != "" {
+		body, err = os.ReadFile(notificationsURL)
 		if err != nil {
-			return nil, errs.Wrap(err, "Could not read notifications override file")
+			return nil, errs.Wrap(err, "Could not read notifications file")
 		}
 	} else {
-		body, err = httputil.Get(constants.NotificationsInfoURL)
+		// Use HTTP client for remote URLs
+		body, err = httputil.Get(notificationsURL)
 		if err != nil {
 			return nil, errs.Wrap(err, "Could not fetch notifications information")
 		}

cmd/state/autoupdate.go

@@ -53,7 +53,7 @@ func autoUpdate(svc *model.SvcModel, args []string, childCmd *captain.Command, c
 	}
 
 	avUpdate := updater.NewAvailableUpdate(upd.Channel, upd.Version, upd.Platform, upd.Path, upd.Sha256, "")
-	up := updater.NewUpdateInstaller(an, avUpdate)
+	up := updater.NewUpdateInstaller(cfg, an, avUpdate)
 	if !up.ShouldInstall() {
 		logging.Debug("Update is not needed")
 		return false, nil

cmd/state/main.go

@@ -97,6 +97,7 @@ func main() {
 	// Configuration options
 	// This should only be used if the config option is not exclusive to one package.
 	configMediator.RegisterOption(constants.OptinBuildscriptsConfig, configMediator.Bool, false)
+	configMediator.RegisterOption(constants.NotificationsURLConfig, configMediator.String, "")
 
 	// Set up our output formatter/writer
 	outFlags := parseOutputFlags(os.Args)

go.mod

@@ -175,7 +175,7 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/ulikunitz/xz v0.5.11 // indirect
+	github.com/ulikunitz/xz v0.5.14 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect

go.sum

@@ -679,8 +679,8 @@ github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9f
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=
+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=

installers/install.ps1

@@ -41,8 +41,29 @@ function getopt([string] $opt, [string] $default, [string[]] $arr)
     return $default
 }
 
+# Collect all instances of a flag (for flags that can appear multiple times)
+function getopt_all([string] $opt, [string[]] $arr)
+{
+    $result = @()
+    for ($i = 0; $i -lt $arr.Length; $i++)
+    {
+        $arg = $arr[$i]
+        if ($arg -eq $opt -and ($i + 1) -lt $arr.Length)
+        {
+            $value = $arr[$i + 1]
+            if ($value -and -not $value.StartsWith("-"))
+            {
+                $result += $opt
+                $result += $value
+            }
+        }
+    }
+    return $result
+}
+
 $script:CHANNEL = getopt "-b" $script:CHANNEL $args
 $script:VERSION = getopt "-v" $script:VERSION $args
+$script:CONFIG_SET_ARGS = getopt_all "--config-set" $args
 
 function download([string] $url, [string] $out)
 {
@@ -269,7 +290,30 @@ $PSDefaultParameterValues['*:Encoding'] = 'utf8'
 # Run the installer.
 $env:ACTIVESTATE_SESSION_TOKEN = $script:SESSION_TOKEN_VALUE
 setShellOverride
-& $exePath $args --source-installer="install.ps1"
+
+# Build installer arguments by reconstructing the command line properly
+$cmdArgs = @()
+
+# Add non-config-set arguments first
+for ($i = 0; $i -lt $args.Length; $i++) {
+    if ($args[$i] -eq "--config-set" -and ($i + 1) -lt $args.Length) {
+        # Skip the --config-set flag and its value, we'll add them back from our processed array
+        $i++ # Skip the value too
+    } else {
+        $cmdArgs += $args[$i]
+    }
+}
+
+# Add the processed config-set arguments (pass through without comma splitting - let Go handle it)
+if ($script:CONFIG_SET_ARGS -and $script:CONFIG_SET_ARGS.Length -gt 0) {
+    $cmdArgs += $script:CONFIG_SET_ARGS
+}
+
+# Add the source installer flag
+$cmdArgs += "--source-installer=install.ps1"
+
+# Execute with the properly constructed arguments
+& $exePath @cmdArgs
 $success = $?
 if (Test-Path env:ACTIVESTATE_SESSION_TOKEN)
 {

installers/install.sh

@@ -17,7 +17,7 @@ DOWNLOADEXT=".tar.gz"
 BINARYEXT=""
 SHA256SUM="sha256sum"
 
-SESSION_TOKEN_VERIFY="{TOKEN""}"
+SESSION_TOKEN_VERIFY="{TOKEN}"
 SESSION_TOKEN="{TOKEN}"
 SESSION_TOKEN_VALUE=""
 
@@ -36,8 +36,30 @@ getopt() {
   echo $default
 }
 
+# Collect all instances of a flag (for flags that can appear multiple times)
+getopt_all() {
+  opt=$1; shift
+  result=""
+  i=0
+  for arg in $@; do
+    i=$((i + 1))
+    if [ "${arg}" = "$opt" ]; then
+      value=$(echo "$@" | cut -d' ' -f$(($i + 1)))
+      if [ -n "$value" ] && [ "${value#-}" = "$value" ]; then # ensure value doesn't start with -
+        if [ -n "$result" ]; then
+          result="$result $opt $value"
+        else
+          result="$opt $value"
+        fi
+      fi
+    fi
+  done
+  echo $result
+}
+
 CHANNEL=$(getopt "-b" "$CHANNEL" $@)
 VERSION=$(getopt "-v" "$VERSION" $@)
+CONFIG_SET_ARGS=$(getopt_all "--config-set" $@)
 
 if [ -z "${TERM}" ] || [ "${TERM}" = "dumb" ]; then
   OUTPUT_OK=""
@@ -205,7 +227,7 @@ progress_done
 echo ""
 
 # Run the installer.
-ACTIVESTATE_SESSION_TOKEN=$SESSION_TOKEN_VALUE $INSTALLERTMPDIR/$INSTALLERNAME$BINARYEXT "$@" --source-installer="install.sh"
+ACTIVESTATE_SESSION_TOKEN=$SESSION_TOKEN_VALUE $INSTALLERTMPDIR/$INSTALLERNAME$BINARYEXT "$@" $CONFIG_SET_ARGS --source-installer="install.sh"
 
 # Remove temp files
 rm -r $INSTALLERTMPDIR