Skip to content

Commit 2a7c365

Browse files
carmennavarretehjamengual
carmennavarreteh
and
jamengual
committed
fix: Add project name to command locking (runatlantis#6086)
Signed-off-by: Carmen Navarrete Hernandez <carmennavarreteh@gmail.com> Co-authored-by: PePe Amengual <2208324+jamengual@users.noreply.github.com> Signed-off-by: Carmen Navarrete Hernandez <carmennavarreteh@gmail.com>
1 parent 5aa57b7 commit 2a7c365

11 files changed

+126
-90
lines changed

‎server/controllers/api_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func (a *APIController) apiSetup(ctx *command.Context, cmdName command.Name) err
219219
baseRepo := ctx.Pull.BaseRepo
220220
headRepo := ctx.HeadRepo
221221

222-
unlockFn, err := a.WorkingDirLocker.TryLock(baseRepo.FullName, pull.Num, events.DefaultWorkspace, events.DefaultRepoRelDir, cmdName)
222+
unlockFn, err := a.WorkingDirLocker.TryLock(baseRepo.FullName, pull.Num, events.DefaultWorkspace, events.DefaultRepoRelDir, "", cmdName)
223223
if err != nil {
224224
return err
225225
}

‎server/controllers/api_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func setup(t *testing.T) (controllers.APIController, *MockProjectCommandBuilder,
271271
Ok(t, err)
272272

273273
workingDirLocker := NewMockWorkingDirLocker()
274-
When(workingDirLocker.TryLock(Any[string](), Any[int](), Eq(events.DefaultWorkspace), Eq(events.DefaultRepoRelDir), Any[command.Name]())).
274+
When(workingDirLocker.TryLock(Any[string](), Any[int](), Eq(events.DefaultWorkspace), Eq(events.DefaultRepoRelDir), Eq(""), Any[command.Name]())).
275275
ThenReturn(func() {}, nil)
276276

277277
projectCommandBuilder := NewMockProjectCommandBuilder()

‎server/events/mocks/mock_working_dir_locker.go‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/post_workflow_hooks_command_runner.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (w *DefaultPostWorkflowHooksCommandRunner) RunPostHooks(ctx *command.Contex
5555

5656
ctx.Log.Info("Post-workflow hooks configured, running...")
5757

58-
unlockFn, err := w.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, DefaultWorkspace, DefaultRepoRelDir, cmd.Name)
58+
unlockFn, err := w.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, DefaultWorkspace, DefaultRepoRelDir, "", cmd.Name)
5959
if err != nil {
6060
return err
6161
}

‎server/events/post_workflow_hooks_command_runner_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
169169
postWh.GlobalCfg = globalCfg
170170

171171
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
172-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
172+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
173173
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
174174
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
175175
When(whPostWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand), Any[string](),
@@ -210,7 +210,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
210210
expectedCtx.HookDescription = "Post workflow hook #0"
211211

212212
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
213-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
213+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
214214
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
215215
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
216216
When(whPostWorkflowHookRunner.Run(
@@ -280,7 +280,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
280280
postWh.GlobalCfg = globalCfg
281281

282282
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
283-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(func() {}, errors.New("some error"))
283+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(func() {}, errors.New("some error"))
284284

285285
err := postWh.RunPostHooks(ctx, planCmd)
286286

@@ -313,7 +313,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
313313
postWh.GlobalCfg = globalCfg
314314

315315
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
316-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
316+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
317317
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
318318
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, errors.New("some error"))
319319

@@ -348,7 +348,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
348348
postWh.GlobalCfg = globalCfg
349349

350350
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
351-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
351+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
352352
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
353353
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
354354
When(whPostWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand),
@@ -390,7 +390,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
390390
postWh.GlobalCfg = globalCfg
391391

392392
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
393-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
393+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
394394
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
395395
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
396396
When(whPostWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand),
@@ -426,7 +426,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
426426
postWh.GlobalCfg = globalCfg
427427

428428
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
429-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
429+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
430430
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
431431
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
432432
When(whPostWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithShell.RunCommand),
@@ -462,7 +462,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
462462
postWh.GlobalCfg = globalCfg
463463

464464
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
465-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
465+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
466466
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
467467
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
468468
When(whPostWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand),
@@ -498,7 +498,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
498498
postWh.GlobalCfg = globalCfg
499499

500500
When(postWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
501-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
501+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
502502
When(postWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
503503
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
504504
When(whPostWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithShellandShellArgs.RunCommand),
@@ -535,7 +535,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
535535
preWh.GlobalCfg = globalCfg
536536

537537
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
538-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
538+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
539539
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
540540
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
541541
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](),
@@ -571,7 +571,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
571571
preWh.GlobalCfg = globalCfg
572572

573573
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
574-
events.DefaultRepoRelDir, command.Apply)).ThenReturn(unlockFn, nil)
574+
events.DefaultRepoRelDir, "", command.Apply)).ThenReturn(unlockFn, nil)
575575
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
576576
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
577577
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithPlanCommand.RunCommand),
@@ -607,7 +607,7 @@ func TestRunPostHooks_Clone(t *testing.T) {
607607
preWh.GlobalCfg = globalCfg
608608

609609
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
610-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
610+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
611611
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
612612
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
613613
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithPlanApplyCommands.RunCommand),

‎server/events/pre_workflow_hooks_command_runner.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (w *DefaultPreWorkflowHooksCommandRunner) RunPreHooks(ctx *command.Context,
5555

5656
ctx.Log.Info("Pre-workflow hooks configured, running...")
5757

58-
unlockFn, err := w.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, DefaultWorkspace, DefaultRepoRelDir, cmd.Name)
58+
unlockFn, err := w.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, DefaultWorkspace, DefaultRepoRelDir, "", cmd.Name)
5959
if err != nil {
6060
return err
6161
}

‎server/events/pre_workflow_hooks_command_runner_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
146146
preWh.GlobalCfg = globalCfg
147147

148148
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
149-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
149+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
150150
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
151151
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
152152
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand),
@@ -209,7 +209,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
209209
preWh.GlobalCfg = globalCfg
210210

211211
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
212-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(func() {}, errors.New("some error"))
212+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(func() {}, errors.New("some error"))
213213

214214
err := preWh.RunPreHooks(ctx, planCmd)
215215

@@ -242,7 +242,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
242242
preWh.GlobalCfg = globalCfg
243243

244244
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
245-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
245+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
246246
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
247247
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, errors.New("some error"))
248248

@@ -277,7 +277,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
277277
preWh.GlobalCfg = globalCfg
278278

279279
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
280-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
280+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
281281
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
282282
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
283283
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand),
@@ -319,7 +319,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
319319
preWh.GlobalCfg = globalCfg
320320

321321
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
322-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
322+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
323323
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
324324
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
325325
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand), Any[string](),
@@ -355,7 +355,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
355355
preWh.GlobalCfg = globalCfg
356356

357357
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
358-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
358+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
359359
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
360360
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
361361
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithShell.RunCommand),
@@ -391,7 +391,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
391391
preWh.GlobalCfg = globalCfg
392392

393393
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
394-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
394+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
395395
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
396396
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
397397
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHook.RunCommand),
@@ -427,7 +427,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
427427
preWh.GlobalCfg = globalCfg
428428

429429
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
430-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
430+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
431431
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
432432
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
433433
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithShellandShellArgs.RunCommand),
@@ -464,7 +464,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
464464
preWh.GlobalCfg = globalCfg
465465

466466
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
467-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
467+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
468468
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
469469
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
470470
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithPlanCommand.RunCommand),
@@ -500,7 +500,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
500500
preWh.GlobalCfg = globalCfg
501501

502502
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
503-
events.DefaultRepoRelDir, command.Apply)).ThenReturn(unlockFn, nil)
503+
events.DefaultRepoRelDir, "", command.Apply)).ThenReturn(unlockFn, nil)
504504
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
505505
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
506506
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithPlanCommand.RunCommand),
@@ -536,7 +536,7 @@ func TestRunPreHooks_Clone(t *testing.T) {
536536
preWh.GlobalCfg = globalCfg
537537

538538
When(preWhWorkingDirLocker.TryLock(testdata.GithubRepo.FullName, newPull.Num, events.DefaultWorkspace,
539-
events.DefaultRepoRelDir, command.Plan)).ThenReturn(unlockFn, nil)
539+
events.DefaultRepoRelDir, "", command.Plan)).ThenReturn(unlockFn, nil)
540540
When(preWhWorkingDir.Clone(Any[logging.SimpleLogging](), Eq(testdata.GithubRepo), Eq(newPull),
541541
Eq(events.DefaultWorkspace))).ThenReturn(repoDir, nil)
542542
When(whPreWorkflowHookRunner.Run(Any[models.WorkflowHookCommandContext](), Eq(testHookWithPlanApplyCommands.RunCommand),

‎server/events/project_command_builder.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ func (p *DefaultProjectCommandBuilder) buildAllCommandsByCfg(ctx *command.Contex
487487
// Need to lock the workspace we're about to clone to.
488488
workspace := DefaultWorkspace
489489

490-
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir, cmdName)
490+
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir, "", cmdName)
491491
if err != nil {
492492
ctx.Log.Warn("workspace was locked")
493493
return nil, err
@@ -613,7 +613,7 @@ func (p *DefaultProjectCommandBuilder) buildProjectPlanCommand(ctx *command.Cont
613613
var pcc []command.ProjectContext
614614

615615
ctx.Log.Debug("building plan command")
616-
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir, cmd.Name)
616+
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir, cmd.ProjectName, cmd.Name)
617617
if err != nil {
618618
return pcc, err
619619
}
@@ -815,7 +815,7 @@ func (p *DefaultProjectCommandBuilder) buildAllProjectCommandsByPlan(ctx *comman
815815
var cmds []command.ProjectContext
816816
for _, plan := range plans {
817817
// Lock all the directories we need to run the command in
818-
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, plan.Workspace, plan.RepoRelDir, commentCmd.Name)
818+
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, plan.Workspace, plan.RepoRelDir, plan.ProjectName, commentCmd.Name)
819819
if err != nil {
820820
return nil, err
821821
}
@@ -843,7 +843,7 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommand(ctx *command.Context,
843843
}
844844

845845
var projCtx []command.ProjectContext
846-
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir, cmd.Name)
846+
unlockFn, err := p.WorkingDirLocker.TryLock(ctx.Pull.BaseRepo.FullName, ctx.Pull.Num, workspace, DefaultRepoRelDir, cmd.ProjectName, cmd.Name)
847847
if err != nil {
848848
return projCtx, err
849849
}

0 commit comments

Comments
 (0)