chore: Add project command output struct

server/controllers/api_controller.go

@@ -275,7 +275,7 @@ func (a *APIController) apiPlan(request *APIRequest, ctx *command.Context) (*com
 			}
 		}
 
-		res := a.ProjectPlanCommandRunner.Plan(cmd)
+		res := events.RunOneProjectCmd(a.ProjectPlanCommandRunner.Plan, cmd)
 		projectResults = append(projectResults, res)
 
 		a.PostWorkflowHooksCommandRunner.RunPostHooks(ctx, cc[i]) // nolint: errcheck
@@ -323,7 +323,7 @@ func (a *APIController) apiApply(request *APIRequest, ctx *command.Context) (*co
 			}
 		}
 
-		res := a.ProjectApplyCommandRunner.Apply(cmd)
+		res := events.RunOneProjectCmd(a.ProjectApplyCommandRunner.Apply, cmd)
 		projectResults = append(projectResults, res)
 
 		a.PostWorkflowHooksCommandRunner.RunPostHooks(ctx, cc[i]) // nolint: errcheck

server/controllers/api_controller_test.go

@@ -285,10 +285,10 @@ func setup(t *testing.T) (controllers.APIController, *MockProjectCommandBuilder,
 		}}, nil)
 
 	projectCommandRunner := NewMockProjectCommandRunner()
-	When(projectCommandRunner.Plan(Any[command.ProjectContext]())).ThenReturn(command.ProjectResult{
+	When(projectCommandRunner.Plan(Any[command.ProjectContext]())).ThenReturn(command.ProjectCommandOutput{
 		PlanSuccess: &models.PlanSuccess{},
 	})
-	When(projectCommandRunner.Apply(Any[command.ProjectContext]())).ThenReturn(command.ProjectResult{
+	When(projectCommandRunner.Apply(Any[command.ProjectContext]())).ThenReturn(command.ProjectCommandOutput{
 		ApplySuccess: "success",
 	})
 

server/controllers/locks_controller_test.go

@@ -306,9 +306,11 @@ func TestDeleteLock_UpdateProjectStatus(t *testing.T) {
 			Command:    command.Plan,
 			RepoRelDir: projectPath,
 			Workspace:  workspaceName,
-			PlanSuccess: &models.PlanSuccess{
-				TerraformOutput: "tf-output",
-				LockURL:         "lock-url",
+			ProjectCommandOutput: command.ProjectCommandOutput{
+				PlanSuccess: &models.PlanSuccess{
+					TerraformOutput: "tf-output",
+					LockURL:         "lock-url",
+				},
 			},
 		},
 	})

server/core/boltdb/boltdb_test.go

@@ -474,7 +474,9 @@ func TestPullStatus_UpdateGet(t *testing.T) {
 				Command:    command.Plan,
 				RepoRelDir: ".",
 				Workspace:  "default",
-				Failure:    "failure",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "failure",
+				},
 			},
 		})
 	Ok(t, err)
@@ -524,7 +526,9 @@ func TestPullStatus_UpdateDeleteGet(t *testing.T) {
 			{
 				RepoRelDir: ".",
 				Workspace:  "default",
-				Failure:    "failure",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "failure",
+				},
 			},
 		})
 	Ok(t, err)
@@ -570,12 +574,16 @@ func TestPullStatus_UpdateProject(t *testing.T) {
 			{
 				RepoRelDir: ".",
 				Workspace:  "default",
-				Failure:    "failure",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "failure",
+				},
 			},
 			{
-				RepoRelDir:   ".",
-				Workspace:    "staging",
-				ApplySuccess: "success!",
+				RepoRelDir: ".",
+				Workspace:  "staging",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					ApplySuccess: "success!",
+				},
 			},
 		})
 	Ok(t, err)
@@ -634,7 +642,9 @@ func TestPullStatus_UpdateNewCommit(t *testing.T) {
 			{
 				RepoRelDir: ".",
 				Workspace:  "default",
-				Failure:    "failure",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "failure",
+				},
 			},
 		})
 	Ok(t, err)
@@ -643,9 +653,11 @@ func TestPullStatus_UpdateNewCommit(t *testing.T) {
 	status, err := b.UpdatePullWithResults(pull,
 		[]command.ProjectResult{
 			{
-				RepoRelDir:   ".",
-				Workspace:    "staging",
-				ApplySuccess: "success!",
+				RepoRelDir: ".",
+				Workspace:  "staging",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					ApplySuccess: "success!",
+				},
 			},
 		})
 
@@ -698,24 +710,30 @@ func TestPullStatus_UpdateMerge_Apply(t *testing.T) {
 				Command:    command.Plan,
 				RepoRelDir: "mergeme",
 				Workspace:  "default",
-				Failure:    "failure",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "failure",
+				},
 			},
 			{
 				Command:     command.Plan,
 				RepoRelDir:  "projectname",
 				Workspace:   "default",
 				ProjectName: "projectname",
-				Failure:     "failure",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "failure",
+				},
 			},
 			{
 				Command:    command.Plan,
 				RepoRelDir: "staythesame",
 				Workspace:  "default",
-				PlanSuccess: &models.PlanSuccess{
-					TerraformOutput: "tf out",
-					LockURL:         "lock-url",
-					RePlanCmd:       "plan command",
-					ApplyCmd:        "apply command",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					PlanSuccess: &models.PlanSuccess{
+						TerraformOutput: "tf out",
+						LockURL:         "lock-url",
+						RePlanCmd:       "plan command",
+						ApplyCmd:        "apply command",
+					},
 				},
 			},
 		})
@@ -724,23 +742,29 @@ func TestPullStatus_UpdateMerge_Apply(t *testing.T) {
 	updateStatus, err := b.UpdatePullWithResults(pull,
 		[]command.ProjectResult{
 			{
-				Command:      command.Apply,
-				RepoRelDir:   "mergeme",
-				Workspace:    "default",
-				ApplySuccess: "applied!",
+				Command:    command.Apply,
+				RepoRelDir: "mergeme",
+				Workspace:  "default",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					ApplySuccess: "applied!",
+				},
 			},
 			{
 				Command:     command.Apply,
 				RepoRelDir:  "projectname",
 				Workspace:   "default",
 				ProjectName: "projectname",
-				Error:       errors.New("apply error"),
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Error: errors.New("apply error"),
+				},
 			},
 			{
-				Command:      command.Apply,
-				RepoRelDir:   "newresult",
-				Workspace:    "default",
-				ApplySuccess: "success!",
+				Command:    command.Apply,
+				RepoRelDir: "newresult",
+				Workspace:  "default",
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					ApplySuccess: "success!",
+				},
 			},
 		})
 	Ok(t, err)
@@ -811,12 +835,14 @@ func TestPullStatus_UpdateMerge_ApprovePolicies(t *testing.T) {
 				Command:    command.PolicyCheck,
 				RepoRelDir: "mergeme",
 				Workspace:  "default",
-				Failure:    "policy failure",
-				PolicyCheckResults: &models.PolicyCheckResults{
-					PolicySetResults: []models.PolicySetResult{
-						{
-							PolicySetName: "policy1",
-							ReqApprovals:  1,
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "policy failure",
+					PolicyCheckResults: &models.PolicyCheckResults{
+						PolicySetResults: []models.PolicySetResult{
+							{
+								PolicySetName: "policy1",
+								ReqApprovals:  1,
+							},
 						},
 					},
 				},
@@ -826,12 +852,14 @@ func TestPullStatus_UpdateMerge_ApprovePolicies(t *testing.T) {
 				RepoRelDir:  "projectname",
 				Workspace:   "default",
 				ProjectName: "projectname",
-				Failure:     "policy failure",
-				PolicyCheckResults: &models.PolicyCheckResults{
-					PolicySetResults: []models.PolicySetResult{
-						{
-							PolicySetName: "policy1",
-							ReqApprovals:  1,
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					Failure: "policy failure",
+					PolicyCheckResults: &models.PolicyCheckResults{
+						PolicySetResults: []models.PolicySetResult{
+							{
+								PolicySetName: "policy1",
+								ReqApprovals:  1,
+							},
 						},
 					},
 				},
@@ -845,12 +873,14 @@ func TestPullStatus_UpdateMerge_ApprovePolicies(t *testing.T) {
 				Command:    command.ApprovePolicies,
 				RepoRelDir: "mergeme",
 				Workspace:  "default",
-				PolicyCheckResults: &models.PolicyCheckResults{
-					PolicySetResults: []models.PolicySetResult{
-						{
-							PolicySetName: "policy1",
-							ReqApprovals:  1,
-							CurApprovals:  1,
+				ProjectCommandOutput: command.ProjectCommandOutput{
+					PolicyCheckResults: &models.PolicyCheckResults{
+						PolicySetResults: []models.PolicySetResult{
+							{
+								PolicySetName: "policy1",
+								ReqApprovals:  1,
+								CurApprovals:  1,
+							},
 						},
 					},
 				},