Merge pull request #3804 from ActiveState/version/0-48-1-RC2

0.48.1-RC2

Author: mitchell-as

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
   # === OS Specific Job (runs on each OS) ===
   os_specific:
     name: ${{ matrix.sys.os }}
-    timeout-minutes: 90
+    timeout-minutes: 120
     strategy:
       matrix:
         go-version:
@@ -327,15 +327,14 @@ jobs:
           export TEST_SUITE_TAGS="$TEST_SUITE_TAGS"
           TIMEOUT=30m
           if [[ "$TEST_SUITE_TAGS" == "all" ]]; then
-            TIMEOUT=90m
+            TIMEOUT=120m
           fi
           SHELL='${{ matrix.sys.shell }}' go test -timeout $TIMEOUT -v `go list ./... | grep "integration"` -json 2>&1 | gotestfmt -hide empty-packages
         continue-on-error: ${{ github.event_name == 'schedule' }}
         env:
           INTEGRATION_TEST_USERNAME: ${{ secrets.INTEGRATION_TEST_USERNAME }}
           INTEGRATION_TEST_PASSWORD: ${{ secrets.INTEGRATION_TEST_PASSWORD }}
           INTEGRATION_TEST_TOKEN: ${{ secrets.INTEGRATION_TEST_TOKEN }}
-          PLATFORM_API_TOKEN: ${{ secrets.PLATFORM_API_TOKEN }}
 
       - # === Check if Unit Tests Failed ===
         name: Check if Unit Tests Failed

changelog.md

@@ -15,6 +15,7 @@ and this project adheres to
 ### Fixed
 
 - Fixed occasional panic due to a concurrent map read/write during runtime setup.
+- Fixed `state clean cache` from accidentally deleting State Tool binaries on Windows.
 
 ## 0.48.0
 

cmd/state-svc/main.go

@@ -55,7 +55,10 @@ func main() {
 		}
 
 		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
-			logging.Warning("Failing to wait events")
+			// Note: logger is closed, so cannot log here. Also, the activate integration tests seem to be
+			// affected by a write to os.Stderr. Regardless, since state-svc runs in the background for
+			// the most part, we realistically will not see this error.
+			//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

internal/installation/storage/storage.go

@@ -105,7 +105,13 @@ func CachePath() string {
 		return path
 	}
 
-	return filepath.Join(BaseCachePath(), relativeCachePath())
+	cachePath = filepath.Join(BaseCachePath(), relativeCachePath())
+	if runtime.GOOS == "windows" {
+		// Explicitly append "cache" dir as the cachedir on Windows.
+		// It is the same as the local appdata dir (conflicts with config)
+		cachePath = filepath.Join(cachePath, "cache")
+	}
+	return cachePath
 }
 
 func GlobalBinDir() string {

internal/installation/storage/storage_windows.go

@@ -18,5 +18,5 @@ func BaseCachePath() string {
 		return cache
 	}
 
-	return filepath.Join(homeDir, "AppData", "Local", "cache")
+	return filepath.Join(homeDir, "AppData", "Local")
 }

internal/testhelpers/e2e/clean.go

@@ -1,31 +1,12 @@
 package e2e
 
 import (
-	"testing"
-
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/pkg/platform/api/mono/mono_client/projects"
-	"github.com/ActiveState/cli/pkg/platform/api/mono/mono_client/users"
 	"github.com/ActiveState/cli/pkg/platform/api/mono/mono_models"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
-	"github.com/ActiveState/cli/pkg/platform/model"
 )
 
-func cleanUser(t *testing.T, username string, auth *authentication.Auth) error {
-	projects, err := getProjects(username, auth)
-	if err != nil {
-		return err
-	}
-	for _, proj := range projects {
-		err = model.DeleteProject(username, proj.Name, auth)
-		if err != nil {
-			return err
-		}
-	}
-
-	return deleteUser(username, auth)
-}
-
 func getProjects(org string, auth *authentication.Auth) ([]*mono_models.Project, error) {
 	authClient, err := auth.Client()
 	if err != nil {
@@ -40,20 +21,3 @@ func getProjects(org string, auth *authentication.Auth) ([]*mono_models.Project,
 
 	return listProjectsOK.Payload, nil
 }
-
-func deleteUser(name string, auth *authentication.Auth) error {
-	authClient, err := auth.Client()
-	if err != nil {
-		return errs.Wrap(err, "Could not get auth client")
-	}
-
-	params := users.NewDeleteUserParams()
-	params.SetUsername(name)
-
-	_, err = authClient.Users.DeleteUser(params, auth.ClientAuth())
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

internal/testhelpers/e2e/session.go

@@ -56,8 +56,6 @@ type Session struct {
 	Env             []string
 	retainDirs      bool
 	createdProjects []*project.Namespaced
-	// users created during session
-	users           []string
 	T               *testing.T
 	Exe             string
 	SvcExe          string
@@ -542,11 +540,6 @@ func (s *Session) Close() error {
 
 	s.spawned = []*SpawnedCmd{}
 
-	if os.Getenv("PLATFORM_API_TOKEN") == "" {
-		s.T.Log("PLATFORM_API_TOKEN env var not set, not running suite tear down")
-		return nil
-	}
-
 	auth := authentication.New(cfg)
 
 	if os.Getenv(constants.APIHostEnvVarName) == "" {
@@ -560,9 +553,11 @@ func (s *Session) Close() error {
 	}
 
 	err = auth.AuthenticateWithModel(&mono_models.Credentials{
-		Token: os.Getenv("PLATFORM_API_TOKEN"),
+		Username: PersistentUsername,
+		Password: PersistentPassword,
 	})
 	if err != nil {
+		s.T.Errorf("Could not login: %v", errs.JoinMessage(err))
 		return err
 	}
 
@@ -586,14 +581,7 @@ func (s *Session) Close() error {
 	for _, proj := range s.createdProjects {
 		err := model.DeleteProject(proj.Owner, proj.Project, auth)
 		if err != nil {
-			s.T.Errorf("Could not delete project %s: %v", proj.Project, errs.JoinMessage(err))
-		}
-	}
-
-	for _, user := range s.users {
-		err := cleanUser(s.T, user, auth)
-		if err != nil {
-			s.T.Errorf("Could not delete user %s: %v", user, errs.JoinMessage(err))
+			s.T.Errorf("Could not delete project %s/%s: %v", proj.Owner, proj.Project, errs.JoinMessage(err))
 		}
 	}
 
@@ -799,7 +787,7 @@ func (s *Session) SetupRCFileCustom(subshell subshell.SubShell) {
 	rcFile, err := subshell.RcFile()
 	require.NoError(s.T, err)
 
-	if fileutils.TargetExists(filepath.Join(s.Dirs.HomeDir, filepath.Base(rcFile))) {
+	if fileutils.TargetExists(rcFile) && fileutils.TargetExists(filepath.Join(s.Dirs.HomeDir, filepath.Base(rcFile))) {
 		err = fileutils.CopyFile(rcFile, filepath.Join(s.Dirs.HomeDir, filepath.Base(rcFile)))
 	} else {
 		err = fileutils.Touch(filepath.Join(s.Dirs.HomeDir, filepath.Base(rcFile)))

test/integration/buildscript_int_test.go

@@ -179,7 +179,7 @@ func (suite *BuildScriptIntegrationTestSuite) TestBuildScriptRequirementVersionA
 	cp.ExpectExitCode(0)
 
 	cp = ts.Spawn("install", "dotenv")
-	cp.Expect("Added: language/python/dotenv@Auto")
+	cp.Expect("Added: language/python/dotenv@Auto", e2e.RuntimeSolvingTimeoutOpt)
 	cp.ExpectExitCode(0)
 }
 

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 := "2023-06-21T12:34:56Z"
+	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)
 }