Add undiverged apply requirement #1587
Merged
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
* initial commit for undiverge apply req * Update documentation * Fix existing unit tests * HasDiverged unit test * project command runner unit test * Global config tests cases * update parser unit tests * Update project_test unit tests * Fix linting * fix test case with logging output * add space on readme markdown * Remove unused variable * remove deprecated flag option * Use global args struct instead of passing in args
|
lgtm |
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.
This PR adds an
undivergedApply requirement which prevents applies if there are any changes on the base branch since the most recent plan. The apply requirement only effects repos/projects with the 'merge' checkout strategy and prevents the situation where an 'apply' is run on Atlantis but not all changes from remote/master had been pulled locally to Atlantis. This is the same situation where we already warn users on the 'plan' but additionally prevents the apply.Example workflow: