@@ -65,13 +65,16 @@ func (b *DeploymentBundle) Bind(ctx context.Context, client *databricks.Workspac
6565 // Check if the resource is already managed (bound to a different ID)
6666 // Bind imports file state without creating a deployment history version.
6767 var checkStateDB dstate.DeploymentState
68- if err := checkStateDB .Open (ctx , statePath , dstate .ReadingFile , dstate . WithRecovery (true ), dstate. OpenDmsArgs {} ); err != nil {
68+ if err := checkStateDB .Open (ctx , statePath , dstate .WithRecovery (true )); err != nil {
6969 // State that cannot be read is not the same as state without a binding:
7070 // the resource may well be managed already, and binding on top of it
7171 // would take over a resource whose ownership was never checked. A state
7272 // file that does not exist yet opens successfully as an empty one.
7373 return nil , fmt .Errorf ("cannot check whether %s is already bound: %w" , resourceKey , err )
7474 }
75+ if checkStateDB .IsDeploymentMetadataService () {
76+ return nil , errors .New ("bind is not supported for a bundle target that records deployment history" )
77+ }
7578 existingID := checkStateDB .GetResourceID (resourceKey )
7679 if _ , err := checkStateDB .Finalize (ctx ); err != nil {
7780 log .Warnf (ctx , "failed to finalize state: %v" , err )
@@ -94,7 +97,10 @@ func (b *DeploymentBundle) Bind(ctx context.Context, client *databricks.Workspac
9497 }
9598
9699 // Open temp state
97- err := b .StateDB .Open (ctx , tmpStatePath , dstate .WritingFile , dstate .WithRecovery (false ), dstate.OpenDmsArgs {})
100+ err := b .StateDB .Open (ctx , tmpStatePath , dstate .WithRecovery (false ))
101+ if err == nil {
102+ err = b .StateDB .UpgradeToWrite ()
103+ }
98104 if err != nil {
99105 os .Remove (tmpStatePath )
100106 return nil , err
@@ -117,7 +123,7 @@ func (b *DeploymentBundle) Bind(ctx context.Context, client *databricks.Workspac
117123 log .Infof (ctx , "Bound %s to id=%s (in temp state)" , resourceKey , resourceID )
118124
119125 // First plan + update: populate state with resolved config
120- err = b .StateDB .Open (ctx , tmpStatePath , dstate .ReadingFile , dstate . WithRecovery (true ), dstate. OpenDmsArgs {} )
126+ err = b .StateDB .Open (ctx , tmpStatePath , dstate .WithRecovery (true ))
121127 if err != nil {
122128 os .Remove (tmpStatePath )
123129 return nil , err
@@ -166,7 +172,10 @@ func (b *DeploymentBundle) Bind(ctx context.Context, client *databricks.Workspac
166172 return nil , fmt .Errorf ("compacting state: %w" , err )
167173 }
168174
169- err = b .StateDB .Open (ctx , tmpStatePath , dstate .WritingFile , dstate .WithRecovery (true ), dstate.OpenDmsArgs {})
175+ err = b .StateDB .Open (ctx , tmpStatePath , dstate .WithRecovery (true ))
176+ if err == nil {
177+ err = b .StateDB .UpgradeToWrite ()
178+ }
170179 if err != nil {
171180 os .Remove (tmpStatePath )
172181 return nil , err
@@ -186,7 +195,7 @@ func (b *DeploymentBundle) Bind(ctx context.Context, client *databricks.Workspac
186195 }
187196
188197 // Second plan: this is the plan to present to the user (change between remote resource and config)
189- err = b .StateDB .Open (ctx , tmpStatePath , dstate .ReadingFile , dstate . WithRecovery (true ), dstate. OpenDmsArgs {} )
198+ err = b .StateDB .Open (ctx , tmpStatePath , dstate .WithRecovery (true ))
190199 if err != nil {
191200 os .Remove (tmpStatePath )
192201 return nil , err
@@ -236,16 +245,18 @@ func (result *BindResult) Cancel() {
236245// Unbind removes a resource from direct engine state without deleting
237246// the workspace resource. Also removes associated permissions/grants entries.
238247func (b * DeploymentBundle ) Unbind (ctx context.Context , statePath , resourceKey string ) error {
239- err := b .StateDB .Open (ctx , statePath , dstate .WritingFile , dstate .WithRecovery (true ), dstate.OpenDmsArgs {})
240- if err != nil {
241- if errors .Is (err , dstate .ErrUnsettingRecording ) {
242- return errors .New ("unbind is not supported for a bundle target that records deployment history" )
243- }
248+ if err := b .StateDB .Open (ctx , statePath , dstate .WithRecovery (true )); err != nil {
249+ return err
250+ }
251+ if b .StateDB .IsDeploymentMetadataService () {
252+ return errors .New ("unbind is not supported for a bundle target that records deployment history" )
253+ }
254+ if err := b .StateDB .UpgradeToWrite (); err != nil {
244255 return err
245256 }
246257
247258 // Delete the main resource
248- err = b .StateDB .DeleteState (ctx , resourceKey , false )
259+ err : = b .StateDB .DeleteState (ctx , resourceKey , false )
249260 if err != nil {
250261 return err
251262 }
0 commit comments