[ORCA-558] Fix mergeability clause for tfe statuses. (#36)

runatlantis · Jun 24, 2021 · ee2e5ed · ee2e5ed
1 parent 5c07974
commit ee2e5ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/server/events/vcs/github_client.go b/server/events/vcs/github_client.go
@@ -310,7 +310,7 @@ func (g *GithubClient) getSubmitQueueMergeability(repo models.Repo, pull models.
 			ownersCheckApplied = true
 		}
 
-		if status.GetContext() == AtlantisApplyStatusContext ||
+		if strings.HasPrefix(status.GetContext(), AtlantisApplyStatusContext) ||
 			state == "success" ||
 			(state == "pending" && status.GetContext() == SubmitQueueReadinessStatusContext) {
 			continue

diff --git a/server/events/vcs/github_client_test.go b/server/events/vcs/github_client_test.go
@@ -602,6 +602,7 @@ func TestGithubClient_PullisMergeable_BlockedStatus(t *testing.T) {
 				fmt.Sprintf(statusJSON, "pending", "sq-ready-to-merge"),
 				fmt.Sprintf(statusJSON, "success", "_owners-check"),
 				fmt.Sprintf(statusJSON, "failure", "atlantis/apply"),
+				fmt.Sprintf(statusJSON, "failure", "atlantis/apply: terraform_cloud_workspace"),
 			},
 			true,
 		},