auto merge if apply has no changes

Signed-off-by: davidwin93 <[email protected]>
zapier · Oct 19, 2023 · 6495533 · 6495533
1 parent 9afdb2d
commit 6495533
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/pkg/vcs/github/run_events_worker.go b/pkg/vcs/github/run_events_worker.go
@@ -88,6 +88,14 @@ func (w *RunEventsWorker) postRunStatusComment(ctx context.Context, run *tfe.Run
 		// The applying phase of a run has completed.
 		w.mergePRIfPossible(ctx, rmd)
 	}
+	if run.Status == tfe.RunPlannedAndFinished {
+		if len(run.TargetAddrs) > 0 {
+			return
+		}
+		if rmd.GetAction() == "apply" {
+			w.mergePRIfPossible(ctx, rmd)
+		}
+	}
 }
 func (w *RunEventsWorker) mergePRIfPossible(ctx context.Context, rmd runstream.RunMetadata) {
 	if !rmd.GetAutoMerge() {

diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go
@@ -76,8 +76,12 @@ func (p *RunStatusUpdater) updateCommitStatusForRun(ctx context.Context, run *tf
 		// This is a final state.
 		p.updateStatus(ctx, gogitlab.Success, rmd.GetAction(), rmd)
 		if run.HasChanges {
-			// TODO: is pending enough to block merging before apply?
 			p.updateStatus(ctx, gogitlab.Pending, "apply", rmd)
+		} else {
+			// if the apply returns no changes we can still go ahead and merge if auto-merge is enabled
+			if rmd.GetAction() == "apply" {
+				p.mergeMRIfPossible(ctx, rmd)
+			}
 		}
 
 	case tfe.RunPolicySoftFailed: