Merge branch version/0-37-0-RC1 to adopt changes from PR #2402

Author: as-builds

cmd/state/internal/cmdtree/checkout.go

@@ -25,9 +25,9 @@ func newCheckoutCommand(prime *primer.Values) *captain.Command {
 				Value:       &params.Branch,
 			},
 			{
-				Name:        locale.Tl("flag_state_checkout_cache", "set-cache"),
-				Description: locale.Tl("flag_state_checkout_cache_description", "Path to store the runtime files"),
-				Value:       &params.Cache,
+				Name:        locale.Tl("flag_state_checkout_runtime-path", "runtime-path"),
+				Description: locale.Tl("flag_state_checkout_runtime-path_description", "Path to store the runtime files"),
+				Value:       &params.RuntimePath,
 			},
 		},
 		[]*captain.Argument{

internal/runners/checkout/checkout.go

@@ -24,7 +24,7 @@ type Params struct {
 	Namespace     *project.Namespaced
 	PreferredPath string
 	Branch        string
-	Cache         string
+	RuntimePath   string
 }
 
 type primeable interface {
@@ -66,7 +66,7 @@ func (u *Checkout) Run(params *Params) error {
 
 	logging.Debug("Checking out %s to %s", params.Namespace.String(), params.PreferredPath)
 	var err error
-	projectDir, err := u.checkout.Run(params.Namespace, params.Branch, params.Cache, params.PreferredPath)
+	projectDir, err := u.checkout.Run(params.Namespace, params.Branch, params.RuntimePath, params.PreferredPath)
 	if err != nil {
 		return locale.WrapError(err, "err_checkout_project", "", params.Namespace.String())
 	}

test/integration/checkout_int_test.go

@@ -149,26 +149,26 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutWithFlags() {
 	cp.ExpectExitCode(1)
 }
 
-func (suite *CheckoutIntegrationTestSuite) TestCheckoutCustomCache() {
+func (suite *CheckoutIntegrationTestSuite) TestCheckoutCustomRTPath() {
 	suite.OnlyRunForTags(tagsuite.Checkout)
 
 	ts := e2e.New(suite.T(), true)
 	defer ts.Close()
 
-	customCache, err := fileutils.ResolveUniquePath(filepath.Join(ts.Dirs.Work, "custom-cache"))
+	customRTPath, err := fileutils.ResolveUniquePath(filepath.Join(ts.Dirs.Work, "custom-cache"))
 	suite.Require().NoError(err)
-	err = fileutils.Mkdir(customCache)
+	err = fileutils.Mkdir(customRTPath)
 	suite.Require().NoError(err)
 
 	// Checkout and verify.
 	cp := ts.SpawnWithOpts(
-		e2e.WithArgs("checkout", "ActiveState-CLI/Python3", fmt.Sprintf("--set-cache=%s", customCache)),
+		e2e.WithArgs("checkout", "ActiveState-CLI/Python3", fmt.Sprintf("--runtime-path=%s", customRTPath)),
 		e2e.AppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
 	)
 	cp.Expect("Checked out project")
 
-	pythonExe := filepath.Join(setup.ExecDir(customCache), "python3"+exeutils.Extension)
-	suite.Require().True(fileutils.DirExists(customCache))
+	pythonExe := filepath.Join(setup.ExecDir(customRTPath), "python3"+exeutils.Extension)
+	suite.Require().True(fileutils.DirExists(customRTPath))
 	suite.Require().True(fileutils.FileExists(pythonExe))
 
 	// Verify runtime was installed correctly and works.
@@ -183,11 +183,11 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutCustomCache() {
 		e2e.WithWorkDirectory(filepath.Join(ts.Dirs.Work, "Python3")),
 	)
 	if runtime.GOOS == "windows" {
-		customCache, err = fileutils.GetLongPathName(customCache)
+		customRTPath, err = fileutils.GetLongPathName(customRTPath)
 		suite.Require().NoError(err)
-		customCache = strings.ToLower(customCache)
+		customRTPath = strings.ToLower(customRTPath)
 	}
-	cp.Expect(customCache)
+	cp.Expect(customRTPath)
 }
 
 func TestCheckoutIntegrationTestSuite(t *testing.T) {