update

Author: denik

bundle/deploy/terraform/import.go

@@ -28,24 +28,17 @@ type importResource struct {
 
 // Apply implements bundle.Mutator.
 func (m *importResource) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
-	if *b.DirectDeployment {
-		return diag.Errorf("import is not implemented for DATABRICKS_BUNDLE_ENGINE=direct")
-	}
-
 	dir, err := Dir(ctx, b)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	tf := b.Terraform
-	if tf == nil {
-		return diag.Errorf("terraform not initialized")
+	diags := Initialize(ctx, b)
+	if diags.HasError() {
+		return diags
 	}
 
-	err = tf.Init(ctx, tfexec.Upgrade(true))
-	if err != nil {
-		return diag.Errorf("terraform init: %v", err)
-	}
+	tf := b.Terraform
 	tmpDir, err := os.MkdirTemp("", "state-*")
 	if err != nil {
 		return diag.Errorf("terraform init: %v", err)
@@ -109,7 +102,7 @@ func (m *importResource) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
 		return diag.FromErr(err)
 	}
 
-	return nil
+	return diags
 }
 
 // Name implements bundle.Mutator.

bundle/deploy/terraform/init.go

@@ -23,13 +23,7 @@ import (
 	"golang.org/x/exp/maps"
 )
 
-type initialize struct{}
-
-func (m *initialize) Name() string {
-	return "terraform.Initialize"
-}
-
-func (m *initialize) findExecPath(ctx context.Context, b *bundle.Bundle, tf *config.Terraform, installer Installer) (string, error) {
+func findExecPath(ctx context.Context, b *bundle.Bundle, tf *config.Terraform, installer Installer) (string, error) {
 	// If set, pass it through [exec.LookPath] to resolve its absolute path.
 	if tf.ExecPath != "" {
 		execPath, err := exec.LookPath(tf.ExecPath)
@@ -303,14 +297,14 @@ func getTerraformExec(ctx context.Context, b *bundle.Bundle, execPath string) (*
 	return tfexec.NewTerraform(workingDir, execPath)
 }
 
-func (m *initialize) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
+func Initialize(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	tfConfig := b.Config.Bundle.Terraform
 	if tfConfig == nil {
 		tfConfig = &config.Terraform{}
 		b.Config.Bundle.Terraform = tfConfig
 	}
 
-	execPath, err := m.findExecPath(ctx, b, tfConfig, tfInstaller{})
+	execPath, err := findExecPath(ctx, b, tfConfig, tfInstaller{})
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -354,10 +348,12 @@ func (m *initialize) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnosti
 		return diag.FromErr(err)
 	}
 
+	err = tfe.Init(ctx, tfexec.Upgrade(true))
+	if err != nil {
+		return diag.Errorf("terraform init: %v", err)
+	}
+
 	b.Terraform = tfe
-	return nil
-}
 
-func Initialize() bundle.Mutator {
-	return &initialize{}
+	return nil
 }

bundle/deploy/terraform/plan.go

@@ -25,17 +25,27 @@ func (p *plan) Name() string {
 	return "terraform.Plan"
 }
 
-func (p *plan) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
-	tf := b.Terraform
-	if tf == nil {
-		return diag.Errorf("terraform not initialized")
+func initTF(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
+	diags := Initialize(ctx, b)
+	if diags.HasError() {
+		return diags
 	}
 
+	tf := b.Terraform
 	err := tf.Init(ctx, tfexec.Upgrade(true))
 	if err != nil {
 		return diag.Errorf("terraform init: %v", err)
 	}
 
+	return nil
+}
+
+func (p *plan) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
+	diags := Initialize(ctx, b)
+	if diags.HasError() {
+		return diags
+	}
+
 	// Persist computed plan
 	tfDir, err := Dir(ctx, b)
 	if err != nil {
@@ -44,7 +54,7 @@ func (p *plan) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	planPath := filepath.Join(tfDir, "plan")
 	destroy := p.goal == PlanDestroy
 
-	notEmpty, err := tf.Plan(ctx, tfexec.Destroy(destroy), tfexec.Out(planPath))
+	notEmpty, err := b.Terraform.Plan(ctx, tfexec.Destroy(destroy), tfexec.Out(planPath))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -54,7 +64,7 @@ func (p *plan) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	b.TerraformPlanIsEmpty = !notEmpty
 
 	log.Debugf(ctx, "Planning complete and persisted at %s\n", planPath)
-	return nil
+	return diags
 }
 
 // Plan returns a [bundle.Mutator] that runs the equivalent of `terraform plan -out ./plan`

bundle/deploy/terraform/unbind.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/libs/diag"
-	"github.com/hashicorp/terraform-exec/tfexec"
 )
 
 type unbind struct {
@@ -16,17 +15,13 @@ type unbind struct {
 }
 
 func (m *unbind) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
-	tf := b.Terraform
-	if tf == nil {
-		return diag.Errorf("terraform not initialized")
-	}
-
-	err := tf.Init(ctx, tfexec.Upgrade(true))
-	if err != nil {
-		return diag.Errorf("terraform init: %v", err)
+	diags := Initialize(ctx, b)
+	if diags.HasError() {
+		return diags
 	}
+	tf := b.Terraform
 
-	err = tf.StateRm(ctx, fmt.Sprintf("%s.%s", m.tfResourceType, m.resourceKey))
+	err := tf.StateRm(ctx, fmt.Sprintf("%s.%s", m.tfResourceType, m.resourceKey))
 	if err != nil {
 		return diag.Errorf("terraform state rm: %v", err)
 	}

bundle/statemgmt/state_load.go

@@ -46,11 +46,6 @@ func (l *load) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 			return diag.FromErr(err)
 		}
 	} else {
-		tf := b.Terraform
-		if tf == nil {
-			return diag.Errorf("terraform not initialized")
-		}
-
 		var err error
 		state, err = terraform.ParseResourcesState(ctx, b)
 		if err != nil {

bundle/statemgmt/state_pull.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/deploy"
-	"github.com/databricks/cli/bundle/deploy/terraform"
 	"github.com/databricks/cli/libs/env"
 	"github.com/databricks/cli/libs/filer"
 	"github.com/databricks/cli/libs/log"
@@ -131,8 +130,6 @@ func PullResourcesState(ctx context.Context, b *bundle.Bundle) context.Context {
 
 	if !*b.DirectDeployment {
 		engine = "terraform"
-		// XXX move this close to tf.Init()
-		bundle.ApplyContext(ctx, b, terraform.Initialize())
 	}
 
 	// Set the engine in the user agent