state import with SBOMs should still update the commit.

We expect the solve to fail, but we should still update the commit so the user can see what was added, even if the runtime is no longer viable.

internal/runners/packages/import.go

@@ -1,8 +1,10 @@
 package packages
 
 import (
+	"errors"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
@@ -19,6 +21,7 @@ import (
 	"github.com/ActiveState/cli/pkg/buildscript"
 	"github.com/ActiveState/cli/pkg/localcommit"
 	"github.com/ActiveState/cli/pkg/platform/api"
+	"github.com/ActiveState/cli/pkg/platform/api/buildplanner/response"
 	"github.com/ActiveState/cli/pkg/platform/api/buildplanner/types"
 	"github.com/ActiveState/cli/pkg/platform/api/reqsimport"
 	"github.com/ActiveState/cli/pkg/platform/model"
@@ -143,7 +146,26 @@ func (i *Import) Run(params *ImportRunParams) (rerr error) {
 	// Solve the runtime.
 	rtCommit, err := bp.FetchCommit(stagedCommitId, proj.Owner(), proj.Name(), nil)
 	if err != nil {
-		return errs.Wrap(err, "Failed to fetch build result for previous commit")
+		var buildplannerErr *response.BuildPlannerError
+		if errors.As(err, &buildplannerErr) {
+			// When importing CycloneDX and SPDX SBOMs, we put all packages in the 'private/<org>'
+			// namespace, which will fail to solve. That is expected. However, we still want to update the
+			// local commit so the user can see what was imported, even if the runtime is not viable.
+			for _, verr := range buildplannerErr.ValidationErrors {
+				if strings.Contains(verr, "non-existent namespace: private/") {
+					if err := localcommit.Set(proj.Dir(), stagedCommitId.String()); err != nil {
+						return locale.WrapError(err, "err_package_update_commit_id")
+					}
+					out.Notice("") // blank line
+					out.Notice(locale.Tl("import_finished_no_runtime", "[WARNING]Import Finished, but a runtime could not be created.[/RESET]"))
+					return nil
+				}
+			}
+		}
+
+		if err != nil {
+			return errs.Wrap(err, "Failed to fetch build result for staged commit")
+		}
 	}
 
 	// Output change summary.

test/integration/import_int_test.go

@@ -158,6 +158,9 @@ func (suite *ImportIntegrationTestSuite) TestImportCycloneDx() {
 
 	ts.PrepareEmptyProject()
 
+	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
+	cp.ExpectExitCode(0)
+
 	jsonSbom := filepath.Join(osutil.GetTestDataDir(), "import", "cyclonedx", "bom.json")
 	xmlSbom := filepath.Join(osutil.GetTestDataDir(), "import", "cyclonedx", "bom.xml")
 
@@ -193,9 +196,12 @@ func (suite *ImportIntegrationTestSuite) TestImportSpdx() {
 
 	ts.PrepareEmptyProject()
 
+	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
+	cp.ExpectExitCode(0)
+
 	jsonSbom := filepath.Join(osutil.GetTestDataDir(), "import", "spdx", "appbomination.spdx.json")
 
-	cp := ts.Spawn("import", jsonSbom)
+	cp = ts.Spawn("import", jsonSbom)
 	cp.Expect("Creating commit")
 	cp.Expect("Done")
 	cp.ExpectNotExitCode(0) // solve should fail due to private namespace