fix: gh-app merge #5600
Merged
fix: gh-app merge #5600
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MergeAgain() ends up calling recheckDiverged() which reset remotes URLs using CloneURL. Github App workingdir needs to fix the CloneURL of both remotes. Until recently this logic was done one Clone(). But recently MergeAgain() logic has been moved out of Clone(). So the same fix needs to be applied there. Without this fix, recheckDiverged() fails when running `git remote update`. Because it will use empty credentials. Also this failure is done silently because it does not return an error. Looking at FileWorkspace methods, we potentially also want to run the same fix for `HasDiverged()` which runs `git fetch`. But for now this function does not reset the remotes URLs the same way recheckDiverged() does. Signed-off-by: francois poinsot <[email protected]>
Signed-off-by: francois poinsot <[email protected]>
FrancoisPoinsot
force-pushed
the
fix-gh-app-merge
branch
from
d1b4489 to
df7d7fd
Compare
jamengual
approved these changes
Jun 4, 2025
jamengual
reviewed
Jun 4, 2025
|
@FrancoisPoinsot Thanks for your contribution. |
joe1981al
pushed a commit
to joe1981al/atlantis
that referenced
this pull request
Jun 20, 2025
Signed-off-by: francois poinsot <[email protected]> Signed-off-by: Joseph McDonald <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what
This PR has introduced an issue: #5264
When using gh app, with merge checkout policy: atlantis silently fails the merge.
You can easily spot it running this command in the git repo folder, after running atlantis plan:
why
Clone()logic for gh app has a small fix for the repo URL, to remove the empty credentials in the URL.recheckDiverged(), called byMergeAgain(), needs the same fix because it resets the repo URL, as a way to ensure the token generated by the gh-app is refreshed.But since the PR above,
MergeAgain()has moved out ofClone(), so the fix on repo URL was not applied anymore.tests
I am using this commit in the fork of atlantis I am running. This has solved the merge issue.
also ran
notes
The issue is not part of a release yet. So that did not affect too many people. You might want to include this fix before the next release.
recheckDiverged()failing silently is another problem that I have not addressed here. I might open another PR for this.I went for the most straightforward fix. In hope to get it merged before the next release. But having gh app logic spread over a few files sure makes this difficult to reason about.