bundle/deploy/lock: own *locker.Locker on the lock object, not on bundle.Bundle

Pre-refactor the locker was stashed on b.Locker so the two mutators
(acquire then release) could share it via the Bundle. After PR #5314
both lifecycle methods live on a single struct, so the cross-method
state-passing through bundle.Bundle is redundant — grep finds zero
external consumers of b.Locker.

Move the *locker.Locker to a field on workspaceFilesystemLock and delete
the now-unused Locker field on bundle.Bundle.

Co-authored-by: Isaac

Author: shreyas-goenka

bundle/bundle.go

@@ -21,7 +21,6 @@ import (
 	"github.com/databricks/cli/libs/auth"
 	"github.com/databricks/cli/libs/cache"
 	"github.com/databricks/cli/libs/fileset"
-	"github.com/databricks/cli/libs/locker"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/logdiag"
 	libsync "github.com/databricks/cli/libs/sync"
@@ -129,9 +128,6 @@ type Bundle struct {
 	// Stores an initialized copy of this bundle's Terraform wrapper.
 	Terraform *tfexec.Terraform
 
-	// Stores the locker responsible for acquiring/releasing a deployment lock.
-	Locker *locker.Locker
-
 	// TerraformPlanPath is the path to the plan from the terraform CLI
 	TerraformPlanPath string
 

bundle/deploy/lock/workspace_filesystem.go

@@ -15,8 +15,11 @@ import (
 // bundle's workspace state path. This preserves the historical behavior of
 // the previous lock.Acquire / lock.Release mutators.
 type workspaceFilesystemLock struct {
-	b    *bundle.Bundle
-	goal Goal
+	// b is retained for the workspace client and the permissions reporter on
+	// the Acquire error path; lock state itself lives on the struct.
+	b      *bundle.Bundle
+	locker *locker.Locker
+	goal   Goal
 }
 
 func newWorkspaceFilesystemLock(b *bundle.Bundle, goal Goal) *workspaceFilesystemLock {
@@ -39,7 +42,7 @@ func (l *workspaceFilesystemLock) Acquire(ctx context.Context) error {
 		return err
 	}
 
-	b.Locker = lk
+	l.locker = lk
 
 	force := b.Config.Bundle.Deployment.Lock.Force
 	log.Infof(ctx, "Acquiring deployment lock (force: %v)", force)
@@ -61,24 +64,22 @@ func (l *workspaceFilesystemLock) Acquire(ctx context.Context) error {
 }
 
 func (l *workspaceFilesystemLock) Release(ctx context.Context, _ DeploymentStatus) error {
-	b := l.b
-
 	// Return early if locking is disabled.
-	if !b.Config.Bundle.Deployment.Lock.IsEnabled() {
+	if !l.b.Config.Bundle.Deployment.Lock.IsEnabled() {
 		log.Infof(ctx, "Skipping; locking is disabled")
 		return nil
 	}
 
 	// Return early if the locker is not set.
 	// It is likely an error occurred prior to initialization of the locker instance.
-	if b.Locker == nil {
+	if l.locker == nil {
 		log.Warnf(ctx, "Unable to release lock if locker is not configured")
 		return nil
 	}
 
 	log.Infof(ctx, "Releasing deployment lock")
 	if l.goal == GoalDestroy {
-		return b.Locker.Unlock(ctx, locker.AllowLockFileNotExist)
+		return l.locker.Unlock(ctx, locker.AllowLockFileNotExist)
 	}
-	return b.Locker.Unlock(ctx)
+	return l.locker.Unlock(ctx)
 }