Merge remote-tracking branch 'origin/master' into CP-1084

Author: Naatan

.github/workflows/build.yml

@@ -544,4 +544,4 @@ jobs:
             session-build-macos-13
             session-build-macos-latest
             session-build-windows-2025
-            session-build-ubuntu-24.04-arm
+            session-build-ubuntu-24.04-arm

cmd/state-svc/main.go

@@ -29,6 +29,7 @@ import (
 	"github.com/ActiveState/cli/internal/rollbar"
 	"github.com/ActiveState/cli/internal/runbits/panics"
 	"github.com/ActiveState/cli/internal/svcctl"
+	"github.com/ActiveState/cli/pkg/platform/api"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/inconshreveable/mousetrap"
 )
@@ -70,6 +71,8 @@ func main() {
 	rollbar.SetupRollbar(constants.StateServiceRollbarToken)
 	rollbar.SetConfig(cfg)
 
+	api.SetConfig(cfg)
+
 	if os.Getenv("VERBOSE") == "true" {
 		logging.CurrentHandler().SetVerbose(true)
 	}

cmd/state/main.go

@@ -37,6 +37,7 @@ import (
 	"github.com/ActiveState/cli/internal/runbits/panics"
 	"github.com/ActiveState/cli/internal/subshell"
 	"github.com/ActiveState/cli/internal/svcctl"
+	"github.com/ActiveState/cli/pkg/platform/api"
 	secretsapi "github.com/ActiveState/cli/pkg/platform/api/secrets"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
@@ -91,6 +92,7 @@ func main() {
 		return
 	}
 	rollbar.SetConfig(cfg)
+	api.SetConfig(cfg)
 
 	// Configuration options
 	// This should only be used if the config option is not exclusive to one package.

internal/analytics/analytics.go

@@ -6,6 +6,10 @@ import (
 	configMediator "github.com/ActiveState/cli/internal/mediators/config"
 )
 
+func init() {
+	configMediator.RegisterOption(constants.AnalyticsPixelOverrideConfig, configMediator.String, "")
+}
+
 // Dispatcher describes a struct that can send analytics event in the background
 type Dispatcher interface {
 	Event(category, action string, dim ...*dimensions.Values)

internal/analytics/client/sync/client.go

@@ -123,12 +123,12 @@ func New(source string, cfg *config.Instance, auth *authentication.Auth, out out
 	// Register reporters
 	if condition.InTest() {
 		logging.Debug("Using test reporter")
-		a.NewReporter(reporters.NewTestReporter(reporters.TestReportFilepath()))
+		a.NewReporter(reporters.NewTestReporter(reporters.TestReportFilepath(), a.cfg))
 		logging.Debug("Using test reporter as instructed by env")
 	} else if v := os.Getenv(constants.AnalyticsLogEnvVarName); v != "" {
-		a.NewReporter(reporters.NewTestReporter(v))
+		a.NewReporter(reporters.NewTestReporter(v, a.cfg))
 	} else {
-		a.NewReporter(reporters.NewPixelReporter())
+		a.NewReporter(reporters.NewPixelReporter(a.cfg))
 	}
 
 	return a

internal/analytics/client/sync/reporters/pixel.go

@@ -7,22 +7,26 @@ import (
 	"os"
 
 	"github.com/ActiveState/cli/internal/analytics/dimensions"
+	"github.com/ActiveState/cli/internal/config"
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
+
+	configMediator "github.com/ActiveState/cli/internal/mediators/config"
 )
 
 type PixelReporter struct {
 	url string
 }
 
-func NewPixelReporter() *PixelReporter {
-	var pixelUrl string
-
-	// Attempt to get the value for the pixel URL from the environment.  Fall back to default if that fails
-	if pixelUrl = os.Getenv(constants.AnalyticsPixelOverrideEnv); pixelUrl == "" {
-		pixelUrl = constants.DefaultAnalyticsPixel
+func NewPixelReporter(cfg *config.Instance) *PixelReporter {
+	reporter := &PixelReporter{
+		url: sourcePixelURL(cfg),
 	}
-	return &PixelReporter{pixelUrl}
+
+	configMediator.AddListener(constants.AnalyticsPixelOverrideConfig, func() {
+		reporter.url = sourcePixelURL(cfg)
+	})
+	return reporter
 }
 
 func (r *PixelReporter) ID() string {
@@ -55,3 +59,23 @@ func (r *PixelReporter) Event(category, action, source, label string, d *dimensi
 
 	return nil
 }
+
+func sourcePixelURL(cfg *config.Instance) string {
+	var (
+		pixelUrl string
+
+		envUrl = os.Getenv(constants.AnalyticsPixelOverrideEnv)
+		cfgUrl = cfg.GetString(constants.AnalyticsPixelOverrideConfig)
+	)
+
+	switch {
+	case envUrl != "":
+		pixelUrl = envUrl
+	case cfgUrl != "":
+		pixelUrl = cfgUrl
+	default:
+		pixelUrl = constants.DefaultAnalyticsPixel
+	}
+
+	return pixelUrl
+}

internal/analytics/client/sync/reporters/test.go

@@ -5,14 +5,18 @@ import (
 	"path/filepath"
 
 	"github.com/ActiveState/cli/internal/analytics/dimensions"
+	"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/installation/storage"
 	"github.com/ActiveState/cli/internal/logging"
+	configMediator "github.com/ActiveState/cli/internal/mediators/config"
 )
 
 type TestReporter struct {
 	path string
+	cfg  *config.Instance
 }
 
 const TestReportFilename = "analytics.log"
@@ -23,8 +27,12 @@ func TestReportFilepath() string {
 	return filepath.Join(appdata, TestReportFilename)
 }
 
-func NewTestReporter(path string) *TestReporter {
-	return &TestReporter{path}
+func NewTestReporter(path string, cfg *config.Instance) *TestReporter {
+	reporter := &TestReporter{path, cfg}
+	configMediator.AddListener(constants.AnalyticsPixelOverrideConfig, func() {
+		reporter.cfg = cfg
+	})
+	return reporter
 }
 
 func (r *TestReporter) ID() string {
@@ -36,11 +44,13 @@ type TestLogEntry struct {
 	Action     string
 	Source     string
 	Label      string
+	URL        string
 	Dimensions *dimensions.Values
 }
 
 func (r *TestReporter) Event(category, action, source, label string, d *dimensions.Values) error {
-	b, err := json.Marshal(TestLogEntry{category, action, source, label, d})
+	url := r.cfg.GetString(constants.AnalyticsPixelOverrideConfig)
+	b, err := json.Marshal(TestLogEntry{category, action, source, label, url, d})
 	if err != nil {
 		return errs.Wrap(err, "Could not marshal test log entry")
 	}

internal/captain/values.go

@@ -155,9 +155,9 @@ func (p *PackageValue) Set(s string) error {
 	}
 	switch {
 	case strings.Contains(s, ":"):
-		v := strings.Split(s, ":")
-		p.Namespace = strings.TrimSpace(strings.Join(v[0:len(v)-1], ":"))
-		p.Name = strings.TrimSpace(v[len(v)-1])
+		namespace, name, _ := strings.Cut(s, ":")
+		p.Namespace = strings.TrimSpace(namespace)
+		p.Name = strings.TrimSpace(name)
 	case strings.Contains(s, "/"):
 		v := strings.Split(s, "/")
 		p.Namespace = strings.TrimSpace(strings.Join(v[0:len(v)-1], "/"))

internal/constants/constants.go

@@ -261,6 +261,9 @@ const VulnerabilitiesAPIPath = "/v13s/v1/graphql"
 // HasuraInventoryAPIPath is the path used for the hasura inventory api
 const HasuraInventoryAPIPath = "/sv/hasura-inventory/v1/graphql"
 
+// UpdateInfoAPIPath is the path used for the update info api
+const UpdateInfoAPIPath = "/sv/state-update/api/v1"
+
 // NotificationsInfoURL is the URL we check against to see what versions are deprecated
 const NotificationsInfoURL = "https://state-tool.s3.amazonaws.com/messages.json"
 
@@ -409,6 +412,15 @@ const SecurityPromptConfig = "security.prompt.enabled"
 // SecurityPromptLevelConfig is the config key used to determine the level of security prompts
 const SecurityPromptLevelConfig = "security.prompt.level"
 
+// AnalyticsPixelOverrideConfig is the config key used to override the analytics pixel url
+const AnalyticsPixelOverrideConfig = "report.analytics.endpoint"
+
+// UpdateEndpointConfig is the config key used to determine the update endpoint to use
+const UpdateEndpointConfig = "update.endpoint"
+
+// APIHostConfig is the config key used to determine the api host
+const APIHostConfig = "api.host"
+
 // SvcAppName is the name we give our state-svc application
 const SvcAppName = "State Service"
 

internal/runbits/checkout/checkout.go

@@ -14,6 +14,7 @@ import (
 	"github.com/ActiveState/cli/internal/runbits/buildscript"
 	"github.com/ActiveState/cli/internal/runbits/git"
 	"github.com/ActiveState/cli/pkg/localcommit"
+	"github.com/ActiveState/cli/pkg/platform/api"
 	"github.com/ActiveState/cli/pkg/platform/api/mono/mono_models"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
@@ -193,6 +194,7 @@ func CreateProjectFiles(checkoutPath, cachePath, owner, name, branch, commitID,
 			Language:   language,
 			Cache:      cachePath,
 			Portable:   portable,
+			Host:       api.HostOverride(),
 		})
 		if err != nil {
 			if osutils.IsAccessDeniedError(err) {