Updating message when project is locked. #325
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
marcb1
force-pushed
the
updating-message-when-project-is-locked
branch
2 times, most recently
from
847d839
to
9b5a967
Compare
Codecov Report
@@ Coverage Diff @@
## master #325 +/- ##
==========================================
+ Coverage 70.56% 70.57% +<.01%
==========================================
Files 61 61
Lines 3642 3643 +1
==========================================
+ Hits 2570 2571 +1
Misses 893 893
Partials 179 179
Continue to review full report at Codecov.
|
lkysow
requested changes
Oct 26, 2018
server/events/project_locker.go
Outdated
| @@ -63,7 +63,7 @@ func (p *DefaultProjectLocker) TryLock(log *logging.SimpleLogger, pull models.Pu | |||
| } | |||
| if !lockAttempt.LockAcquired && lockAttempt.CurrLock.Pull.Num != pull.Num { | |||
| failureMsg := fmt.Sprintf( | |||
| "This project is currently locked by #%d. The locking plan must be applied or discarded before future plans can execute.", | |||
| "This project is currently locked by #%d. The locking plan must be applied or discarded before future plans can execute. Comment with `atlantis plan` on this PR, once the lock is released.", | |||
There was a problem hiding this comment.
I'd like to change this so it looks like:
Unable to run plan. This project is currently locked by an unapplied plan from pull #2. To continue, delete the lock from #2 or apply that plan and merge the pull request.
Once the lock is released, comment atlantis plan here to re-plan.
The full string will be:
fmt.Sprintf("**Unable to run `plan`**. This project is currently locked by an unapplied plan from pull #%d. To continue, delete the lock from #%d or apply that plan and merge the pull request.\n\nOnce the lock is released, comment `atlantis plan` here to re-plan.", lockAttempt.CurrLock.Pull.Num, lockAttempt.CurrLock.Pull.Num)
2a6a74e
to
7010971
Compare
marcb1
force-pushed
the
updating-message-when-project-is-locked
branch
from
7010971
to
189b059
Compare
|
Looks great! |
lkysow
approved these changes
Oct 30, 2018
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.
Just updating the message atlantis spits out when the project is locked. Once the locking plan is released, atlantis doesn't auto-run
planon subsequent PR's. This message makes it clear to users that they should manually run plan.