fix: Check for upstream changes to merge only when planning #3493
Conversation
This file contains 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
When using the merge checkout strategy, we would peviously re-clone on upstream updates on any call to Clone(), for example when running workflow hooks or runing import commands. If we had already ran a plan, and master was updated, this would delete the plan and apply would not have anything to apply. Modified to only re-clone on upstream updates in doPlan()
finnag
changed the title
finnag
changed the title
|
@GenPage @nitrocode any comments? It looks good to me |
nitrocode
reviewed
Jun 6, 2023
nitrocode
reviewed
Jun 6, 2023
nitrocode
reviewed
Jun 6, 2023
nitrocode
reviewed
Jun 6, 2023
nitrocode
approved these changes
Jun 6, 2023
2 tasks
mtavaresmedeiros
pushed a commit
to mtavaresmedeiros/atlantis
that referenced
this pull request
Jul 3, 2023
…tis#3493) * whitespace fixes * Only re-clone on upstream updates just before planning When using the merge checkout strategy, we would peviously re-clone on upstream updates on any call to Clone(), for example when running workflow hooks or runing import commands. If we had already ran a plan, and master was updated, this would delete the plan and apply would not have anything to apply. Modified to only re-clone on upstream updates in doPlan() * Apply suggestions from code review --------- Co-authored-by: PePe Amengual <jose.amengual@gmail.com> Co-authored-by: nitrocode <7775707+nitrocode@users.noreply.github.com>
ijames-gc
pushed a commit
to gocardless/atlantis
that referenced
this pull request
Feb 13, 2024
…tis#3493) * whitespace fixes * Only re-clone on upstream updates just before planning When using the merge checkout strategy, we would peviously re-clone on upstream updates on any call to Clone(), for example when running workflow hooks or runing import commands. If we had already ran a plan, and master was updated, this would delete the plan and apply would not have anything to apply. Modified to only re-clone on upstream updates in doPlan() * Apply suggestions from code review --------- Co-authored-by: PePe Amengual <jose.amengual@gmail.com> Co-authored-by: nitrocode <7775707+nitrocode@users.noreply.github.com>
ijames-gc
pushed a commit
to gocardless/atlantis
that referenced
this pull request
Feb 13, 2024
…tis#3493) * whitespace fixes * Only re-clone on upstream updates just before planning When using the merge checkout strategy, we would peviously re-clone on upstream updates on any call to Clone(), for example when running workflow hooks or runing import commands. If we had already ran a plan, and master was updated, this would delete the plan and apply would not have anything to apply. Modified to only re-clone on upstream updates in doPlan() * Apply suggestions from code review --------- Co-authored-by: PePe Amengual <jose.amengual@gmail.com> Co-authored-by: nitrocode <7775707+nitrocode@users.noreply.github.com>
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
When using the merge checkout strategy, only check for upstream changes and re-clone when creating a plan.
why
Previously we would check for upstream changes and merge them during any call to Clone(), but if we had already made a plan, this would remove the generated plan. This would always happen if any workflow hooks were defined, and any other PRs had been merged between plan and apply.
It is only safe to re-clone and merge new upstream changes and after grabbing the directory lock, but before creating a plan.
tests
references