public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-08-03 18:18:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating message when project is locked.

Browse Source
This commit is contained in:
marc bassil
2018-10-26 14:03:08 -04:00
parent f56e06a578
commit 189b0591ef
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -9,4 +9,5 @@ output
.terraform/
node_modules/
**/.vuepress/dist
helm/test-values.yaml
helm/test-values.yaml
*.swp

3
server/events/project_locker.go
View File

@@ -63,7 +63,8 @@ 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.",
"**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)
return &TryLockResponse{
LockAcquired: false,

2
server/events/project_locker_test.go
View File

@@ -52,7 +52,7 @@ func TestDefaultProjectLocker_TryLockWhenLocked(t *testing.T) {
Ok(t, err)
Equals(t, &events.TryLockResponse{
LockAcquired: false,
LockFailureReason: "This project is currently locked by #2. The locking plan must be applied or discarded before future plans can execute.",
LockFailureReason: "**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.\n\nOnce the lock is released, comment `atlantis plan` here to re-plan.",
}, res)
}