Cleanup

bundle/config/mutator/apply_presets.go

@@ -430,7 +430,7 @@ func recommendCatalogSchemaUsage(b *bundle.Bundle, ctx context.Context, key stri
 		var fix string
 		if t.NotebookTask != nil {
 			relPath = t.NotebookTask.NotebookPath
-			expected = `"  dbutils.widgets.text(['"]schema|` +
+			expected = `dbutils.widgets.text\(['"]schema|` +
 				`USE[^)]+schema`
 			fix = "  dbutils.widgets.text('catalog')\n" +
 				"  dbutils.widgets.text('schema')\n" +
@@ -462,16 +462,11 @@ func recommendCatalogSchemaUsage(b *bundle.Bundle, ctx context.Context, key stri
 		}
 
 		localPath, _, err := GetLocalPath(ctx, b, sourceDir, relPath)
-		if err != nil {
+		if err != nil || localPath == "" {
-			// Any path errors are reported by another mutator
+			// We ignore errors (they're reported by another mutator)
+			// and ignore empty local paths (which means we'd have to download the file)
 			continue
 		}
-		if localPath == "" {
-			// If there is no local copy we don't want to download it and skip this check
-			continue
-		}
-
-		log.Warnf(ctx, "LocalPath: %s, relPath: %s, sourceDir: %s", localPath, relPath, sourceDir)
 
 		if !fileIncludesPattern(ctx, localPath, expected) {
 			diags = diags.Extend(diag.Diagnostics{{

libs/template/templates/dbt-sql/databricks_template_schema.json

@@ -45,7 +45,7 @@
             "default": "default",
             "pattern": "^\\w+$",
             "pattern_match_failure_message": "Invalid schema name.",
-            "description": "\nPlease provide an initial schema during development.\ndefault_schema",
+            "description": "\nPlease provide a default schema during development.\ndefault_schema",
             "order": 5
         }
     },

libs/template/templates/default-python/databricks_template_schema.json

@@ -59,7 +59,7 @@
             "default": "default",
             "pattern": "^\\w+$",
             "pattern_match_failure_message": "Invalid schema name.",
-            "description": "\nPlease provide an initial schema during development.\ndefault_schema",
+            "description": "\nPlease provide default schema during development.\ndefault_schema",
             "order": 7
         }
     },

libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl

@@ -33,11 +33,9 @@ targets:
       host: {{workspace_host}}
       # We explicitly specify /Workspace/Users/{{user_name}} to make sure we only have a single copy.
       root_path: /Workspace/Users/{{user_name}}/.bundle/${bundle.name}/${bundle.target}
-    presets:
-      catalog: {{.default_catalog}}
-      schema: {{$prod_schema}}
     permissions:
       - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}}
         level: CAN_MANAGE
-    run_as:
+    presets:
-      {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}}
+      catalog: {{.default_catalog}}
+      schema: {{$prod_schema}}

libs/template/templates/default-sql/databricks_template_schema.json

@@ -45,7 +45,7 @@
             "default": "default",
             "pattern": "^\\w+$",
             "pattern_match_failure_message": "Invalid schema name.",
-            "description": "\nPlease provide an initial schema during development.\ndefault_schema",
+            "description": "\nPlease provide a default schema during development.\ndefault_schema",
             "order": 5
         }
     },