Merge branch 'master' into miked/CP-1124

Author: MDrakos

changelog.md

@@ -10,7 +10,11 @@ and this project adheres to
 
 ### Security
 
-Addressed all known, fixable CVEs.
+- Addressed all known, fixable CVEs.
+
+### Fixed
+
+- Fixed occasional panic due to a concurrent map read/write during runtime setup.
 
 ## 0.48.0
 

cmd/state-svc/main.go

@@ -55,7 +55,7 @@ func main() {
 		}
 
 		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
-			logging.Warning("Failing to wait events")
+			fmt.Fprintf(os.Stderr, "Warning: failed to wait for events")
 		}
 		os.Exit(exitCode)
 	}()

cmd/state-svc/test/integration/svc_int_test.go

@@ -157,7 +157,10 @@ func (suite *SvcIntegrationTestSuite) TestStartDuplicateErrorOutput() {
 func (suite *SvcIntegrationTestSuite) TestSingleSvc() {
 	suite.OnlyRunForTags(tagsuite.Service)
 	ts := e2e.New(suite.T(), false)
-	defer ts.Close()
+	// TODO: CP-1268 should remove this conditional.
+	if runtime.GOOS != "windows" || !condition.OnCI() {
+		defer ts.Close()
+	}
 
 	ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("stop"))
 	time.Sleep(2 * time.Second) // allow for some time to stop the existing available process

pkg/runtime/depot.go

@@ -160,6 +160,9 @@ func (d *depot) SetCacheSize(mb int) {
 // Artifact metadata comes from the depot's cache, and may not exist for installed artifacts that
 // predate the cache.
 func (d *depot) Exists(id strfmt.UUID) (bool, *artifactInfo) {
+	d.mapMutex.Lock()
+	defer d.mapMutex.Unlock()
+
 	if _, ok := d.artifacts[id]; ok {
 		if artifact, exists := d.config.Cache[id]; exists {
 			return true, artifact

test/integration/commit_int_test.go

@@ -67,7 +67,7 @@ func (suite *CommitIntegrationTestSuite) TestCommitAtTimeChange() {
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	ts.PrepareProjectAndBuildScript("ActiveState-CLI/Commit-Test-A", "7a1b416e-c17f-4d4a-9e27-cbad9e8f5655")
+	ts.PrepareProjectAndBuildScript("ActiveState-CLI/Commit-Test-A", "2ab50eba-4410-4be2-ba9d-c04ebeda640d")
 
 	proj, err := project.FromPath(ts.Dirs.Work)
 	suite.NoError(err, "Error loading project")
@@ -76,11 +76,11 @@ func (suite *CommitIntegrationTestSuite) TestCommitAtTimeChange() {
 	suite.Require().NoError(err) // verify validity
 
 	// Update top-level at_time variable.
-	dateTime := "2025-12-05T16:08:55.440Z"
+	dateTime := "2025-12-11T12:34:56Z"
 	buildScriptFile := filepath.Join(proj.Dir(), constants.BuildScriptFileName)
 	contents, err := fileutils.ReadFile(buildScriptFile)
 	suite.Require().NoError(err)
-	contents = bytes.Replace(contents, []byte("2023-06-22T21:56:10Z"), []byte(dateTime), 1)
+	contents = bytes.Replace(contents, []byte("2025-12-10T17:03:26Z"), []byte(dateTime), 1)
 	suite.Require().NoError(fileutils.WriteFile(buildScriptFile, contents))
 	suite.Require().Contains(string(fileutils.ReadFileUnsafe(filepath.Join(proj.Dir(), constants.BuildScriptFileName))), dateTime)
 
@@ -152,14 +152,16 @@ func (suite *CommitIntegrationTestSuite) TestCommitSkipValidation() {
 	suite.Require().NoError(fileutils.WriteFile(scriptPath, data))
 
 	cp := ts.Spawn("commit")
-	cp.Expect("solver_version in body should be")
+	cp.Expect("solver_version")
+	cp.Expect("should be")
 	cp.ExpectExitCode(1)
 
 	cp = ts.Spawn("commit", "--skip-validation")
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("refresh")
-	cp.Expect("solver_version in body should be")
+	cp.Expect("solver_version")
+	cp.Expect("should be")
 	cp.ExpectExitCode(1)
 }
 

test/integration/package_int_test.go

@@ -679,12 +679,14 @@ func (suite *PackageIntegrationTestSuite) TestChangeSummary() {
 	cp.Expect("Successfully set")
 	cp.ExpectExitCode(0)
 
-	ts.PrepareProject("ActiveState-CLI/ChangeSummary", "e2414800-3c35-4ed2-8938-5d36e954ce09")
+	ts.PrepareProject("ActiveState-CLI/small-python", "66f0259d-5d7a-48ce-a814-fd9db46c5ce6")
 
 	cp = ts.Spawn("install", "requests@2.31.0")
 	cp.Expect("Resolving Dependencies")
 	cp.Expect("Done")
-	cp.Expect("Installing requests@2.31.0 includes 4 direct dependencies")
+	cp.Expect("Installing")
+	cp.Expect("requests@2.31.0")
+	cp.Expect("includes 4 direct dependencies")
 	cp.Expect("├─ ")
 	cp.Expect("├─ ")
 	cp.Expect("├─ ")

test/integration/revert_int_test.go

@@ -24,10 +24,10 @@ func (suite *RevertIntegrationTestSuite) TestRevert() {
 	defer ts.Close()
 
 	namespace := "ActiveState-CLI/Revert"
-	ts.PrepareProject(namespace, "c9444988-2761-4b39-8c4c-eb5fdaaa8dca")
+	ts.PrepareProject(namespace, "ca615135-ef95-4392-aff5-85b6c7132789")
 
 	// Revert the commit that added urllib3.
-	commitID := "d105e865-d12f-4c42-a1a0-6767590d87da"
+	commitID := "c44885ee-af0e-4f52-b8ef-63c56fe255c6"
 	cp := ts.Spawn("revert", commitID)
 	cp.Expect(fmt.Sprintf("Operating on project %s", namespace))
 	cp.Expect("You are about to revert the following commit:")
@@ -48,7 +48,7 @@ func (suite *RevertIntegrationTestSuite) TestRevert() {
 	cp = ts.Spawn("shell", "Revert")
 	cp.ExpectInput(e2e.RuntimeSourcingTimeoutOpt)
 	cp.SendLine("python3")
-	cp.Expect("3.9.15")
+	cp.Expect("3.11.12")
 	cp.SendLine("import urllib3")
 	cp.Expect("No module named 'urllib3'")
 	cp.SendLine("import argparse")
@@ -63,7 +63,7 @@ func (suite *RevertIntegrationTestSuite) TestRevertRemote() {
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	ts.PrepareProject("ActiveState-CLI/Revert", "75ae9c67-df55-4a95-be6f-b7975e5bb523")
+	ts.PrepareProject("ActiveState-CLI/Revert", "ca615135-ef95-4392-aff5-85b6c7132789")
 
 	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
 	cp.ExpectExitCode(0)
@@ -106,13 +106,13 @@ func (suite *RevertIntegrationTestSuite) TestRevertTo() {
 	defer ts.Close()
 
 	namespace := "ActiveState-CLI/Revert"
-	ts.PrepareProject(namespace, "c9444988-2761-4b39-8c4c-eb5fdaaa8dca")
+	ts.PrepareProject(namespace, "ca615135-ef95-4392-aff5-85b6c7132789")
 
 	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
 	cp.ExpectExitCode(0)
 
 	// Revert the commit that added urllib3.
-	commitID := "d105e865-d12f-4c42-a1a0-6767590d87da"
+	commitID := "c44885ee-af0e-4f52-b8ef-63c56fe255c6"
 	cp = ts.Spawn("revert", "--to", commitID)
 	cp.Expect(fmt.Sprintf("Operating on project %s", namespace))
 	cp.Expect("You are about to revert to the following commit:")
@@ -153,12 +153,12 @@ func (suite *RevertIntegrationTestSuite) TestJSON() {
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	ts.PrepareProject("ActiveState-CLI/Revert", "c9444988-2761-4b39-8c4c-eb5fdaaa8dca")
+	ts.PrepareProject("ActiveState-CLI/Revert", "ca615135-ef95-4392-aff5-85b6c7132789")
 
 	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
 	cp.ExpectExitCode(0)
 
-	cp = ts.Spawn("revert", "--to", "d105e865-d12f-4c42-a1a0-6767590d87da", "-o", "json")
+	cp = ts.Spawn("revert", "--to", "c44885ee-af0e-4f52-b8ef-63c56fe255c6", "-o", "json")
 	cp.Expect(`{"current_commit_id":`, e2e.RuntimeSourcingTimeoutOpt)
 	cp.ExpectExitCode(0)
 	AssertValidJSON(suite.T(), cp)