Merge pull request #2114 from ActiveState/mitchell/dx-1252

Show a "default project no longer exists" error message for state shell too when applicable

Author: mitchell-as

internal/locale/locales/en-us.yaml

@@ -1896,6 +1896,8 @@ arg_state_use_namespace_description:
   other: "The org/project namespace of the project that you wish to use, or just the project name if previously checked out using [ACTIONABLE]`state checkout`[/RESET]."
 err_use_commit_id_mismatch:
   other: "Cannot switch to the given commit ID. Please use [ACTIONABLE]`state checkout`[/RESET] to check out a specific commit ID and then try again."
+err_use_default_project_does_not_exist:
+  other: "The default project no longer exists. Please either check it out again with [ACTIONABLE]state checkout[/RESET] or run [ACTIONABLE]state use reset[/RESET] to unset your default project."
 err_shell_commit_id_mismatch:
   other: "Cannot start a shell/prompt for the given commit ID. Please use [ACTIONABLE]`state checkout`[/RESET] to check out a specific commit ID and then try again."
 err_shell_cannot_load_project:

internal/runners/shell/shell.go

@@ -3,6 +3,7 @@ package shell
 import (
 	"github.com/ActiveState/cli/internal/analytics"
 	"github.com/ActiveState/cli/internal/config"
+	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
 	"github.com/ActiveState/cli/internal/output"
@@ -18,6 +19,7 @@ import (
 	"github.com/ActiveState/cli/pkg/platform/runtime/setup"
 	"github.com/ActiveState/cli/pkg/platform/runtime/target"
 	"github.com/ActiveState/cli/pkg/project"
+	"github.com/ActiveState/cli/pkg/projectfile"
 )
 
 type Params struct {
@@ -62,6 +64,9 @@ func (u *Shell) Run(params *Params) error {
 
 	proj, err := findproject.FromInputByPriority("", params.Namespace, u.config, u.prompt)
 	if err != nil {
+		if errs.Matches(err, &projectfile.ErrorNoProject{}) {
+			return locale.WrapError(err, "err_use_default_project_does_not_exist")
+		}
 		return locale.WrapError(err, "err_shell_cannot_load_project")
 	}
 

internal/runners/use/show.go

@@ -44,9 +44,7 @@ func (s *Show) Run() error {
 	proj, err := project.FromPath(projectDir)
 	if err != nil {
 		if errs.Matches(err, &projectfile.ErrorNoProject{}) {
-			return locale.WrapError(err,
-				"err_use_show_default_project_does_not_exist",
-				"The default project no longer exists. Please either check it out again with [ACTIONABLE]state checkout[/RESET] or run [ACTIONABLE]state use reset[/RESET] to unset your default project.")
+			return locale.WrapError(err, "err_use_default_project_does_not_exist")
 		}
 		return locale.WrapError(err, "err_use_show_get_project", "Could not get default project.")
 	}

test/integration/shell_int_test.go

@@ -1,6 +1,7 @@
 package integration
 
 import (
+	"os"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -157,6 +158,34 @@ func (suite *ShellIntegrationTestSuite) TestCd() {
 	cp.ExpectExitCode(0)
 }
 
+func (suite *ShellIntegrationTestSuite) TestDefaultNoLongerExists() {
+	suite.OnlyRunForTags(tagsuite.Shell)
+
+	ts := e2e.New(suite.T(), false)
+	defer ts.Close()
+
+	cp := ts.SpawnWithOpts(
+		e2e.WithArgs("checkout", "ActiveState-CLI/Python3"),
+		e2e.AppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
+	)
+	cp.Expect("Checked out project")
+	cp.ExpectExitCode(0)
+
+	cp = ts.SpawnWithOpts(
+		e2e.WithArgs("use", "ActiveState-CLI/Python3"),
+		e2e.AppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
+	)
+	cp.Expect("Switched to project")
+	cp.ExpectExitCode(0)
+
+	err := os.RemoveAll(filepath.Join(ts.Dirs.Work, "Python3"))
+	suite.Require().NoError(err)
+
+	cp = ts.SpawnWithOpts(e2e.WithArgs("shell"))
+	cp.Expect("The default project no longer exists")
+	cp.ExpectExitCode(1)
+}
+
 func TestShellIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(ShellIntegrationTestSuite))
 }