Automerge not working with Bitbucket Server

[philslab-ninja]

When using automerge with Bitbucket Server this happens:

Automerging failed: making request "POST http://bitbucket-on-prem.example.org:7990/rest/api/1.0/projects/exampleproject/repos/examplerepo/pull-requests/1/merge" unexpected status code: 403, body: XSRF check failed

Seems to be fixable by adding X-Atlassian-Token header to each request, setting the value to no-check. see: https://confluence.atlassian.com/cloudkb/xsrf-check-failed-when-calling-cloud-apis-826874382.html

[lkysow]

@philslab-ninja I've released https://github.com/runatlantis/atlantis/releases/tag/v0.4.15 with what is hopefully a fix. Can you test it for me please?

[philslab-ninja]

Hi,

I can confirm this issue is resolved.

Unfortunately a new issue has shown now, when the merge is being done this error happens:

Automerging failed: making request "POST http://xxx:7990/rest/api/1.0/projects/xxx/repos/xxx/pull-requests/2/merge" unexpected status code: 409, body: {"errors":[{"context":null,"message":"You are attempting to modify a pull request based on out-of-date information.","exceptionName":"com.atlassian.bitbucket.pull.PullRequestOutOfDateException","currentVersion":1,"expectedVersion":-1,"pullRequest":{"id":2,"version":1,"title":"Testing Atlantis Automerge" (...)

Seems this only affects bitbucket server (on-prem) and seems to be fixable by first polling for the current PR version, then using that version in the merge call.

see: https://confluence.atlassian.com/bitbucketserverkb/bitbucket-server-rest-api-for-merging-pull-request-fails-792309002.html

Thanks so much!

[philslab-ninja]

I will open a seperate issue for this to keep things clean 👍 This issue has been resolved

[lkysow]

Thanks Phillip. Sorry for the trouble, Bitbucket Server is hard to test because I only have a trial license that expires 30 days after I create it.