Merge branch 'version/0-46-0-RC1' into mitchell/dx-2921

Author: mitchell-as

internal/runners/initialize/init.go

@@ -302,7 +302,8 @@ func (r *Initialize) Run(params *RunParams) (rerr error) {
 	}
 	solveSpinner.Stop(locale.T("progress_success"))
 
-	dependencies.OutputSummary(r.out, commit.BuildPlan().RequestedArtifacts())
+	// When running `state init` we want to show all of the dependencies that will be installed.
+	dependencies.OutputSummary(r.out, commit.BuildPlan().Artifacts())
 	rti, err := runtime_runbit.Update(r.prime, trigger.TriggerInit, runtime_runbit.WithCommit(commit))
 	if err != nil {
 		return errs.Wrap(err, "Could not setup runtime after init")

internal/runners/packages/import.go

@@ -134,19 +134,20 @@ func (i *Import) Run(params *ImportRunParams) (rerr error) {
 		Description:  msg,
 		Script:       bs,
 	})
+	// Always update the local commit ID even if the commit fails to build
+	if stagedCommit != nil && stagedCommit.Commit != nil && stagedCommit.Commit.CommitID != "" {
+		if err := localcommit.Set(proj.Dir(), stagedCommit.CommitID.String()); err != nil {
+			solveSpinner.Stop(locale.T("progress_fail"))
+			return locale.WrapError(err, "err_package_update_commit_id")
+		}
+		pg.Stop(locale.T("progress_success"))
+		pg = nil
+	}
 	if err != nil {
 		solveSpinner.Stop(locale.T("progress_fail"))
 		return locale.WrapError(err, "err_commit_changeset", "Could not commit import changes")
 	}
 
-	pg.Stop(locale.T("progress_success"))
-	pg = nil
-
-	if err := localcommit.Set(proj.Dir(), stagedCommit.CommitID.String()); err != nil {
-		solveSpinner.Stop(locale.T("progress_fail"))
-		return locale.WrapError(err, "err_package_update_commit_id")
-	}
-
 	// Output change summary.
 	previousCommit, err := bp.FetchCommit(localCommitId, proj.Owner(), proj.Name(), nil)
 	if err != nil {

pkg/platform/model/buildplanner/commit.go

@@ -64,7 +64,7 @@ func (b *BuildPlanner) StageCommit(params StageCommitParams) (*Commit, error) {
 	}
 
 	if response.IsErrorResponse(resp.Commit.Build.Type) {
-		return nil, response.ProcessBuildError(resp.Commit.Build, "Could not process error response from stage commit")
+		return &Commit{resp.Commit, nil, nil}, response.ProcessBuildError(resp.Commit.Build, "Could not process error response from stage commit")
 	}
 
 	// The BuildPlanner will return a build plan with a status of

test/integration/init_int_test.go

@@ -242,8 +242,7 @@ func (suite *InitIntegrationTestSuite) TestInit_ChangeSummary() {
 	cp.Expect("Done")
 	ts.NotifyProjectCreated(e2e.PersistentUsername, project)
 	cp.Expect("Setting up the following dependencies:")
-	cp.Expect("└─ [email protected]")
-	suite.Assert().NotContains(cp.Snapshot(), "├─", "more than one dependency was printed")
+	cp.Expect("├─ [email protected]")
 	cp.ExpectExitCode(0)
 }