mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-07-31 23:58:45 +00:00
3ffd1c57df
* fix: add path to DefaultWorkingDirLocker.TryLock() In the release notes for v0.13.0: https://github.com/runatlantis/atlantis/blob/master/CHANGELOG.md#features-4 > Running in parallel is only supported if you're using workspaces to separate your projects. Projects in separate directories can not be run in parallel currently. This commit adds `path` as an argument to `DefaultWorkingDirLocker.TryLock()` and includes `path` in the `workspaceKey` used to check if a project is locked. This should allow projects in separate directories to run in parallel. To my knowledge, there is no functional reason that projects in separate directories cannot run in parallel. All calls to `DefaultWorkingDirLocker.TryLock()` have been updated. A new unit test `TestTryLockWithDifferentPaths` has been added to test the behavior of locking two separate directories with the same workspace name. * Add documntation for parallel_plan and parallel_apply options * Fix working_dir_locker_test.go - Fix expected error message for `TestTryLock()` - Use `.` as default path for calls to `DefaultWorkingDirLocker.TryLock()` Co-authored-by: Kevin Snyder <kevinsnyder@ip-192-168-4-61.ec2.internal> Co-authored-by: Kevin Snyder <kevinsnyder@ip-10-60-10-94.ec2.internal> Co-authored-by: Kevin Snyder <kevinsnyder@Kevin-Snyders-MacBook-Pro.local> Co-authored-by: Kevin Snyder <kevinsnyder@ip-10-60-10-189.ec2.internal> Co-authored-by: Rui Chen <rui@chenrui.dev>
217 lines
6.6 KiB
Go
217 lines
6.6 KiB
Go
// Copyright 2017 HootSuite Media Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the License);
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an AS IS BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
// Modified hereafter by contributors to runatlantis/atlantis.
|
|
|
|
package events_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/runatlantis/atlantis/server/events"
|
|
. "github.com/runatlantis/atlantis/testing"
|
|
)
|
|
|
|
var repo = "repo/owner"
|
|
var workspace = "default"
|
|
var path = "."
|
|
|
|
func TestTryLock(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
|
|
// The first lock should succeed.
|
|
unlockFn, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
|
|
// Now another lock for the same repo, workspace, and pull should fail
|
|
_, err = locker.TryLock(repo, 1, workspace, path)
|
|
ErrEquals(t, "The default workspace at path . is currently locked by another"+
|
|
" command that is running for this pull request.\n"+
|
|
"Wait until the previous command is complete and try again.", err)
|
|
|
|
// Unlock should work.
|
|
unlockFn()
|
|
_, err = locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
}
|
|
|
|
func TestTryLockDifferentWorkspaces(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
|
|
t.Log("a lock for the same repo and pull but different workspace should succeed")
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
_, err = locker.TryLock(repo, 1, "new-workspace", path)
|
|
Ok(t, err)
|
|
|
|
t.Log("and both should now be locked")
|
|
_, err = locker.TryLock(repo, 1, workspace, path)
|
|
Assert(t, err != nil, "exp err")
|
|
_, err = locker.TryLock(repo, 1, "new-workspace", path)
|
|
Assert(t, err != nil, "exp err")
|
|
}
|
|
|
|
func TestTryLockDifferentRepo(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
|
|
t.Log("a lock for a different repo but the same workspace and pull should succeed")
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
newRepo := "owner/newrepo"
|
|
_, err = locker.TryLock(newRepo, 1, workspace, path)
|
|
Ok(t, err)
|
|
|
|
t.Log("and both should now be locked")
|
|
_, err = locker.TryLock(repo, 1, workspace, path)
|
|
ErrContains(t, "currently locked", err)
|
|
_, err = locker.TryLock(newRepo, 1, workspace, path)
|
|
ErrContains(t, "currently locked", err)
|
|
}
|
|
|
|
func TestTryLockDifferentPulls(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
|
|
t.Log("a lock for a different pull but the same repo and workspace should succeed")
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
newPull := 2
|
|
_, err = locker.TryLock(repo, newPull, workspace, path)
|
|
Ok(t, err)
|
|
|
|
t.Log("and both should now be locked")
|
|
_, err = locker.TryLock(repo, 1, workspace, path)
|
|
ErrContains(t, "currently locked", err)
|
|
_, err = locker.TryLock(repo, newPull, workspace, path)
|
|
ErrContains(t, "currently locked", err)
|
|
}
|
|
|
|
func TestTryLockDifferentPaths(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
|
|
t.Log("a lock for a different path but the same repo, pull, and workspace should succeed")
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
newPath := "new-path"
|
|
_, err = locker.TryLock(repo, 1, workspace, newPath)
|
|
Ok(t, err)
|
|
|
|
t.Log("and both should now be locked")
|
|
_, err = locker.TryLock(repo, 1, workspace, path)
|
|
ErrContains(t, "currently locked", err)
|
|
_, err = locker.TryLock(repo, 1, workspace, newPath)
|
|
ErrContains(t, "currently locked", err)
|
|
}
|
|
|
|
func TestUnlock(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
|
|
t.Log("unlocking should work")
|
|
unlockFn, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
unlockFn()
|
|
_, err = locker.TryLock(repo, 1, workspace, "")
|
|
Ok(t, err)
|
|
}
|
|
|
|
func TestUnlockDifferentWorkspaces(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
t.Log("unlocking should work for different workspaces")
|
|
unlockFn1, err1 := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err1)
|
|
unlockFn2, err2 := locker.TryLock(repo, 1, "new-workspace", path)
|
|
Ok(t, err2)
|
|
unlockFn1()
|
|
unlockFn2()
|
|
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
_, err = locker.TryLock(repo, 1, "new-workspace", path)
|
|
Ok(t, err)
|
|
}
|
|
|
|
func TestUnlockDifferentRepos(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
t.Log("unlocking should work for different repos")
|
|
unlockFn1, err1 := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err1)
|
|
newRepo := "owner/newrepo"
|
|
unlockFn2, err2 := locker.TryLock(newRepo, 1, workspace, path)
|
|
Ok(t, err2)
|
|
unlockFn1()
|
|
unlockFn2()
|
|
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
_, err = locker.TryLock(newRepo, 1, workspace, path)
|
|
Ok(t, err)
|
|
}
|
|
|
|
func TestUnlockDifferentPulls(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
t.Log("unlocking should work for different pulls")
|
|
unlockFn1, err1 := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err1)
|
|
newPull := 2
|
|
unlockFn2, err2 := locker.TryLock(repo, newPull, workspace, path)
|
|
Ok(t, err2)
|
|
unlockFn1()
|
|
unlockFn2()
|
|
|
|
_, err := locker.TryLock(repo, 1, workspace, path)
|
|
Ok(t, err)
|
|
_, err = locker.TryLock(repo, newPull, workspace, path)
|
|
Ok(t, err)
|
|
}
|
|
|
|
func TestLockPull(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
unlock, err := locker.TryLockPull("owner/repo", 1)
|
|
Ok(t, err)
|
|
|
|
// Now a lock for the same pull or for a workspace should fail.
|
|
_, err = locker.TryLockPull("owner/repo", 1)
|
|
Assert(t, err != nil, "exp err")
|
|
_, err = locker.TryLock("owner/repo", 1, "workspace", path)
|
|
Assert(t, err != nil, "exp err")
|
|
|
|
// Lock for a different pull and workspace should succeed.
|
|
_, err = locker.TryLockPull("owner/repo", 2)
|
|
Ok(t, err)
|
|
_, err = locker.TryLock("owner/repo", 3, "workspace", path)
|
|
Ok(t, err)
|
|
|
|
// After unlocking, should be able to get a pull lock.
|
|
unlock()
|
|
unlock, err = locker.TryLockPull("owner/repo", 1)
|
|
Ok(t, err)
|
|
|
|
// If we unlock that too, should be able to get the workspace lock.
|
|
unlock()
|
|
_, err = locker.TryLock("owner/repo", 1, "workspace", path)
|
|
Ok(t, err)
|
|
unlock()
|
|
}
|
|
|
|
// If the workspace was locked first, we shouldn't be able to get the pull lock.
|
|
func TestLockPull_WorkspaceFirst(t *testing.T) {
|
|
locker := events.NewDefaultWorkingDirLocker()
|
|
unlock, err := locker.TryLock("owner/repo", 1, "workspace", path)
|
|
Ok(t, err)
|
|
|
|
_, err = locker.TryLockPull("owner/repo", 1)
|
|
Assert(t, err != nil, "exp err")
|
|
|
|
// After unlocking the workspace, should be able to get the lock.
|
|
unlock()
|
|
_, err = locker.TryLockPull("owner/repo", 1)
|
|
Ok(t, err)
|
|
}
|