push

Author: denik

acceptance/bundle/deployment/migrate/basic/databricks.yml

@@ -9,16 +9,16 @@ resources:
         - task_key: "main"
           notebook_task:
             notebook_path: "./notebook.py"
-      #permissions:
-      #  - level: CAN_VIEW
-      #    user_name: [email protected]
+            #permissions:
+            #  - level: CAN_VIEW
+            #    user_name: [email protected]
 
   pipelines:
     test_pipeline:
       name: "Test Migration Pipeline"
       libraries:
         - notebook:
             path: "./pipeline.py"
-      #permissions:
-      #  - level: CAN_MANAGE
-      #    user_name: [email protected]
+            #permissions:
+            #  - level: CAN_MANAGE
+            #    user_name: [email protected]

acceptance/bundle/deployment/migrate/basic/notebook.py

@@ -1,2 +1,2 @@
 # Databricks notebook source
-print("Hello from test migration job")
+print("Hello from test migration job")

acceptance/bundle/deployment/migrate/basic/pipeline.py

@@ -1,2 +1,2 @@
 # Databricks notebook source
-# This is a test pipeline notebook
+# This is a test pipeline notebook

acceptance/bundle/help/bundle-deployment-migrate/output.txt

@@ -26,9 +26,7 @@ Usage:
   databricks bundle deployment migrate [flags]
 
 Flags:
-      --auto-approve   Automatically approve the migration
-      --force-lock     Force acquisition of deployment lock.
-  -h, --help           help for migrate
+  -h, --help   help for migrate
 
 Global Flags:
       --debug            enable debug logging

acceptance/bundle/help/bundle-deployment/output.txt

@@ -21,6 +21,7 @@ Usage:
 
 Available Commands:
   bind        Bind bundle-defined resources to existing resources
+  migrate     Migrate from Terraform to Direct deployment
   unbind      Unbind bundle-defined resources from its managed remote resource
 
 Flags:

cmd/bundle/deployment/migrate.go

@@ -1,13 +1,9 @@
 package deployment
 
 import (
-	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
 
-	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/deploy/terraform"
 	"github.com/databricks/cli/bundle/direct"
 	"github.com/databricks/cli/bundle/direct/dstate"
@@ -19,13 +15,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// terraformState represents the minimal terraform state structure we need
-type terraformState struct {
-	Version int    `json:"version"`
-	Serial  int64  `json:"serial"`
-	Lineage string `json:"lineage"`
-}
-
 func newMigrateCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "migrate",
@@ -177,37 +166,13 @@ proper state management as it may cause resource conflicts.`,
 			Path: localDirectPath,
 			Data: directDB,
 		}
-		deploymentState.Finalize()
+		err = deploymentState.Finalize()
+		if err != nil {
+			return err
+		}
 		cmdio.LogString(ctx, fmt.Sprintf("Migrated %d resources to direct engine state file: %s", len(directDB.State), localDirectPath))
 		return nil
 	}
 
 	return cmd
 }
-
-func readTerraformState(ctx context.Context, b *bundle.Bundle) (terraform.ExportedResourcesMap, *terraformState, error) {
-	// Read terraform state file to get resources
-	terraformResources, err := terraform.ParseResourcesState(ctx, b)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to parse terraform state: %w", err)
-	}
-
-	// Read raw terraform state file to get lineage and serial
-	_, localTerraformPath := b.StateFilenameTerraform(ctx)
-	stateData, err := os.ReadFile(localTerraformPath)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to read terraform state file: %w", err)
-	}
-
-	var tfState terraformState
-	err = json.Unmarshal(stateData, &tfState)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to parse terraform state file: %w", err)
-	}
-
-	if tfState.Lineage == "" {
-		return nil, nil, fmt.Errorf("terraform state file missing lineage")
-	}
-
-	return terraformResources, &tfState, nil
-}