Improve auto-migration template (#1200)

Should help avoid confusion on why this file was created and how to avoid it if neccessary
databricks · Apr 24, 2024 · 370e0f5 · 370e0f5
1 parent 132044e
commit 370e0f5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/packages/databricks-vscode/package.json b/packages/databricks-vscode/package.json
@@ -373,13 +373,13 @@
             },
             {
                 "view": "configurationView",
-                "contents": "[Create a new Databricks Project](command:databricks.bundle.initNewProject)",
-                "when": "workspaceFolderCount > 0 && databricks.context.initialized"
+                "contents": "Migrate current workspace to a Databricks Project: \n[Migrate to a Databricks Project](command:databricks.bundle.startManualMigration)",
+                "when": "workspaceFolderCount > 0 && databricks.context.initialized && databricks.context.pendingManualMigration"
             },
             {
                 "view": "configurationView",
-                "contents": "Migrate current workspace to a Databricks Project: \n[Migrate to Databricks Project](command:databricks.bundle.startManualMigration)",
-                "when": "workspaceFolderCount > 0 && databricks.context.initialized && databricks.context.pendingManualMigration"
+                "contents": "[Create a new Databricks Project](command:databricks.bundle.initNewProject)",
+                "when": "workspaceFolderCount > 0 && databricks.context.initialized"
             },
             {
                 "view": "configurationView",

diff --git a/packages/databricks-vscode/resources/migration-template/databricks_template_schema.json b/packages/databricks-vscode/resources/migration-template/databricks_template_schema.json
@@ -1,5 +1,10 @@
 {
     "properties": {
+        "auto_migration": {
+            "type": "boolean",
+            "description": "Auto migration",
+            "order": 1
+        },
         "project_name": {
             "type": "string",
             "description": "Project name",

diff --git a/packages/databricks-vscode/resources/migration-template/template/databricks.yml.tmpl b/packages/databricks-vscode/resources/migration-template/template/databricks.yml.tmpl
@@ -1,5 +1,11 @@
 # This is a Databricks asset bundle definition for {{.project_name}}.
+{{- if .auto_migration}}
+# The file was generated automatically by the Databricks extension. 
+# It's based on the configuration located in `.databricks/project.json`.
+# If you don't want this file to be created automatically, remove the `.databricks/project.json`.
+{{- else}}
 # The Databricks extension requires databricks.yml configuration file.
+{{- end}}
 # See https://docs.databricks.com/dev-tools/bundles/index.html for documentation.
 
 bundle:

diff --git a/packages/databricks-vscode/src/bundle/BundleProjectManager.ts b/packages/databricks-vscode/src/bundle/BundleProjectManager.ts
@@ -223,7 +223,8 @@ export class BundleProjectManager {
         }
         await this.migrateProjectJsonToBundle(
             authProvider as ProfileAuthProvider,
-            legacyProjectConfig
+            legacyProjectConfig,
+            true
         );
         recordEvent({success: true});
     }
@@ -260,11 +261,13 @@ export class BundleProjectManager {
 
     private async migrateProjectJsonToBundle(
         authProvider: ProfileAuthProvider,
-        legacyProjectConfig?: ProjectConfigFile
+        legacyProjectConfig?: ProjectConfigFile,
+        autoMigration: boolean = false
     ) {
         const configVars = {
             /* eslint-disable @typescript-eslint/naming-convention */
             project_name: path.basename(this.workspaceUri.fsPath),
+            auto_migration: autoMigration,
             compute_id: legacyProjectConfig?.clusterId,
             root_path: legacyProjectConfig?.workspacePath?.path,
             /* eslint-enable @typescript-eslint/naming-convention */