Merge branch 'DX-2224' of https://github.com/ActiveState/cli into DX-…

…2224
ActiveState · Oct 30, 2023 · 28acf47 · 28acf47
2 parents 92da15e + 5a90844
commit 28acf47
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 17 deletions.
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -312,10 +312,6 @@ const ActiveStateSupportURL = "https://www.activestate.com/support/?utm_source=p
 // ActiveStateDashboardURL is the URL for the ActiveState account preferences page
 const ActiveStateDashboardURL = "https://platform.activestate.com/?utm_source=platform-application-gui&utm_medium=activestate-desktop&utm_content=drop-down&utm_campaign=maru"
 
-// DashboardCommitURL is the URL used to inspect commits
-// TODO: Can this be removed?
-const DashboardCommitURL = "https://platform.activestate.com/commit/"
-
 // BugTrackerURL is the URL of our bug tracker
 const BugTrackerURL = "https://github.com/ActiveState/state-tool/issues"
 

diff --git a/internal/runbits/rationalize/types.go b/internal/runbits/rationalize/types.go
@@ -17,8 +17,6 @@ var ErrNotAuthenticated = errors.New("not authenticated")
 
 var ErrActionAborted = errors.New("aborted by user")
 
-var ErrHeadless = errors.New("headless")
-
 type ErrAPI struct {
 	Wrapped error
 	Code    int

diff --git a/internal/runbits/requirements/requirements.go b/internal/runbits/requirements/requirements.go
@@ -19,6 +19,7 @@ import (
 	"github.com/ActiveState/cli/internal/prompt"
 	"github.com/ActiveState/cli/internal/rtutils/ptr"
 	"github.com/ActiveState/cli/internal/runbits"
+	"github.com/ActiveState/cli/internal/runbits/rationalize"
 	"github.com/ActiveState/cli/pkg/localcommit"
 	bpModel "github.com/ActiveState/cli/pkg/platform/api/buildplanner/model"
 	medmodel "github.com/ActiveState/cli/pkg/platform/api/mediator/model"
@@ -101,7 +102,7 @@ func (r *RequirementOperation) ExecuteRequirementOperation(requirementName, requ
 
 	var err error
 	if r.Project == nil {
-		return locale.NewInputError("err_no_project", "No project found")
+		return rationalize.ErrNoProject
 	}
 	out.Notice(locale.Tl("operating_message", "", r.Project.NamespaceString(), r.Project.Dir()))
 

diff --git a/pkg/platform/model/projects.go b/pkg/platform/model/projects.go
@@ -2,7 +2,6 @@ package model
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/go-openapi/strfmt"
 
@@ -264,11 +263,6 @@ func ProjectURL(owner, name, commitID string) string {
 	return url
 }
 
-// CommitURL creates a valid platform commit URL for the given commit
-func CommitURL(commitID string) string {
-	return fmt.Sprintf("%s/%s", strings.TrimSuffix(constants.DashboardCommitURL, "/"), commitID)
-}
-
 func AddBranch(projectID strfmt.UUID, label string) (strfmt.UUID, error) {
 	var branchID strfmt.UUID
 	addParams := projects.NewAddBranchParams()

diff --git a/test/integration/bundle_int_test.go b/test/integration/bundle_int_test.go
@@ -221,8 +221,9 @@ func (suite *BundleIntegrationTestSuite) TestJSON() {
 	cp.ExpectExitCode(0)
 	AssertValidJSON(suite.T(), cp)
 
-	cp = ts.Spawn("checkout", "ActiveState-CLI/Bundles", ".")
-	cp.Expect("Skipping runtime setup")
+	cp = ts.SpawnWithOpts(
+		e2e.OptArgs("checkout", "ActiveState-CLI/Bundles", "."),
+	)
 	cp.Expect("Checked out project")
 	cp.ExpectExitCode(0)
 

diff --git a/test/integration/package_int_test.go b/test/integration/package_int_test.go
@@ -470,8 +470,9 @@ func (suite *PackageIntegrationTestSuite) TestJSON() {
 	cp.ExpectExitCode(0)
 	AssertValidJSON(suite.T(), cp)
 
-	cp = ts.Spawn("checkout", "ActiveState-CLI/Packages-Perl", ".")
-	cp.Expect("Skipping runtime setup")
+	cp = ts.SpawnWithOpts(
+		e2e.OptArgs("checkout", "ActiveState-CLI/Packages-Perl", "."),
+	)
 	cp.Expect("Checked out project")
 	cp.ExpectExitCode(0)