Atlantis apply succeeds on unmergeable MR with apply_requirements mergeable in Gitlab

[Balsir]

Community Note

• Please vote on this issue by adding a :+1: reaction to the original issue to help the community and maintainers prioritize this request. Searching for pre-existing feature requests helps us consolidate datapoints for identical requirements into a single place, thank you!
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.
• If you are interested in working on this issue or have submitted a pull request, please leave a comment.

  ---

  Overview of the Issue

  In Gitlab, Atlantis runs apply with apply_requirement mergeable even if the merge request cannot be merged.

Reproduction Steps

1. Configure checkout strategy merge and apply_requirements approved, mergeable, undiverged
2. In Gitlab repo, set Merge method to Merge commit with semi-linear history.
3. Create merge request and run atlantis plan
4. Change a different file and push directly to main. The following should show up on the merge request, preventing merging.
5. Run atlantis apply. The apply succeeds. I would expect it to fail until rebase is completed.

   Environment details

   • Atlantis version: v0.26.0
   • Deployment method: helm
   • Gitlab version v16.5.1-ee

Atlantis server-side config file:

repos:
- apply_requirements:
  - approved
  - mergeable
  - undiverged
  id: /.*/

Repo atlantis.yaml file:

version: 3
parallel_plan: true
parallel_apply: true
projects:
  - name: terraform
    dir: terraform
    autoplan:
      when_modified: [ "*.tf" ]
    terraform_version: 1.5.6

[dorian-tsorfy]

Hello I tried to reproduce this issue in version v0.28.5 of Atlantis and my apply was failed with error - Apply Failed: Default branch must be rebased onto pull request before running apply.. This is a good behavior, try and check again and tell me if the issue still exist