Gitlab MR with approvals_before_merge > 0 causes issues with mergeable requirement

[JoshiiSinfield]

Hi,

When apply_requirements: [approved, mergeable] is specified, and a MR is generated, we are unable to apply the MR due to the following error message:

Apply Failed: Pull request must be mergeable before running apply.

Looking through the code I believe it's because of

atlantis/server/events/vcs/gitlab_client.go

Line 172 in 1b6541a

if mr.MergeStatus == "can_be_merged" && mr.ApprovalsBeforeMerge <= 0 {

When a merge request has approvals required the "approvals_before_merge" field on the MR has as number >0. This causes the MR to always be "not mergeable" based on the above.

Is this expected behaviour? I'm still not sure what makes this field be >1, because we have the same apply_requirements on other gitlab repos, with approval rules to require >=1 approval and this issue doesn't happen.

Running atlantis 0.9.0.

Cheers,
Josh

[lkysow]

Hi Josh, that number should be set to the number of approvals required and then decremented by each approval.

If this is not happening can you provide me screenshots of your settings, the approvals, and the result of the API call as well your version of GitLab.

Thanks!

[lkysow]

Closing this because I haven't heard back.

[JoshiiSinfield]

Hi @lkysow,

Apologies for not replying to you sooner.
the number wasn't been decremented no. I'll do my best to get you some screenshots in the next few days or so.

Cheers,
Josh

[ghost]

I ran into this bug awhile back and did some digging in the code but never got around to filing an issue. The problem is that Atlantis checks the approval count on the wrong Gitlab resource. It is looking at the approvals_before_merge field on the merge request resource when it should be looking at the approvals_left field on the merge request approvals resource. As far as I can tell, the approvals_before_merge field is the configured number of approvals required for the MR and not the remaining number of approvals. That is why the value doesn't is still greater than zero even though the MR has been approved. When I was digging through the code, the Gitlab Go library did not have support for the merge request approvals resource but it looks like it has since been added.