From f3a8b15ae014822733685ce1d919b8ff7c31d4cd Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 30 Jan 2026 10:03:55 +0100 Subject: [PATCH 1/3] Standardize personal_schemas enum across templates Use consistent enum values for the personal_schemas property across all bundle templates, matching the lakeflow-pipelines style: - "yes" - "no (advanced: I will customize the schema configuration later in databricks.yml)" Co-Authored-By: Claude Opus 4.5 --- .../bundle/templates/dbt-sql/input.json | 2 +- .../dbt-sql/output/my_dbt_sql/databricks.yml | 33 ------------ .../bundle/templates/default-scala/input.json | 2 +- .../output/my_default_scala/databricks.yml | 53 ------------------- .../bundle/templates/default-sql/input.json | 2 +- .../output/my_default_sql/databricks.yml | 47 ---------------- .../templates/telemetry/dbt-sql/input.json | 2 +- .../telemetry/dbt-sql/out.requests.txt | 2 +- .../templates/telemetry/dbt-sql/output.txt | 2 +- .../telemetry/default-sql/input.json | 2 +- .../telemetry/default-sql/out.requests.txt | 2 +- .../telemetry/default-sql/output.txt | 2 +- .../dbt-sql/databricks_template_schema.json | 9 ++-- .../databricks_template_schema.json | 4 +- .../databricks_template_schema.json | 4 +- .../databricks_template_schema.json | 9 ++-- .../databricks_template_schema.json | 9 ++-- .../pydabs/databricks_template_schema.json | 4 +- 18 files changed, 30 insertions(+), 160 deletions(-) delete mode 100644 acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml delete mode 100644 acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml delete mode 100644 acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml diff --git a/acceptance/bundle/templates/dbt-sql/input.json b/acceptance/bundle/templates/dbt-sql/input.json index 201ac9667e..ca84320e6d 100644 --- a/acceptance/bundle/templates/dbt-sql/input.json +++ b/acceptance/bundle/templates/dbt-sql/input.json @@ -2,5 +2,5 @@ "project_name": "my_dbt_sql", "http_path": "/sql/2.0/warehouses/f00dcafe", "default_catalog": "main", - "personal_schemas": "yes, use a schema based on the current user name during development" + "personal_schemas": "yes" } diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml deleted file mode 100644 index 8b4eec8057..0000000000 --- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml +++ /dev/null @@ -1,33 +0,0 @@ -# This file defines the structure of this project and how it is deployed -# to production using Databricks Asset Bundles. -# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation. -bundle: - name: my_dbt_sql - uuid: [UUID] - -include: - - resources/*.yml - - resources/*/*.yml - -# Deployment targets. -# The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml -targets: - dev: - # The default target uses 'mode: development' to create a development copy. - # - Deployed resources get prefixed with '[dev my_user_name]' - # - Any job schedules and triggers are paused by default. - # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html. - mode: development - default: true - workspace: - host: [DATABRICKS_URL] - - prod: - mode: production - workspace: - host: [DATABRICKS_URL] - # We explicitly deploy to /Workspace/Users/[USERNAME] to make sure we only have a single copy. - root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} - permissions: - - user_name: [USERNAME] - level: CAN_MANAGE diff --git a/acceptance/bundle/templates/default-scala/input.json b/acceptance/bundle/templates/default-scala/input.json index eebf9a5c8a..f2c27809bb 100644 --- a/acceptance/bundle/templates/default-scala/input.json +++ b/acceptance/bundle/templates/default-scala/input.json @@ -3,5 +3,5 @@ "compute_type": "serverless", "artifacts_dest_path": "/Volumes/test-folder", "default_catalog": "main", - "personal_schemas": "yes, use a schema based on the current user name during development" + "personal_schemas": "yes" } diff --git a/acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml b/acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml deleted file mode 100644 index fa88835b65..0000000000 --- a/acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml +++ /dev/null @@ -1,53 +0,0 @@ -# This is a Databricks asset bundle definition for my_default_scala. -# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation. -bundle: - name: my_default_scala - uuid: [UUID] - -include: - - resources/*.yml - -variables: - catalog: - description: The catalog to use - schema: - description: The schema to use - -workspace: - host: [DATABRICKS_URL] - artifact_path: /Volumes/test-folder/${bundle.name}/${bundle.target}/${workspace.current_user.short_name} - -artifacts: - default: - type: jar - build: sbt package && sbt assembly - path: . - files: - - source: ./target/scala-2.13/my_default_scala-assembly-0.1.jar - -targets: - dev: - # The default target uses 'mode: development' to create a development copy. - # - Deployed resources get prefixed with '[dev my_user_name]' - # - Any job schedules and triggers are paused by default. - # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html. - mode: development - default: true - workspace: - host: [DATABRICKS_URL] - variables: - catalog: main - schema: ${workspace.current_user.short_name} - - prod: - mode: production - workspace: - host: [DATABRICKS_URL] - # We explicitly deploy to /Workspace/Users/[USERNAME] to make sure we only have a single copy. - root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} - permissions: - - user_name: [USERNAME] - level: CAN_MANAGE - variables: - catalog: main - schema: default diff --git a/acceptance/bundle/templates/default-sql/input.json b/acceptance/bundle/templates/default-sql/input.json index c728d25de1..84cc856316 100644 --- a/acceptance/bundle/templates/default-sql/input.json +++ b/acceptance/bundle/templates/default-sql/input.json @@ -2,5 +2,5 @@ "project_name": "my_default_sql", "http_path": "/sql/2.0/warehouses/f00dcafe", "default_catalog": "main", - "personal_schemas": "yes, automatically use a schema based on the current user name during development" + "personal_schemas": "yes" } diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml b/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml deleted file mode 100644 index e9d9093a96..0000000000 --- a/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml +++ /dev/null @@ -1,47 +0,0 @@ -# This is a Databricks asset bundle definition for my_default_sql. -# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation. -bundle: - name: my_default_sql - uuid: [UUID] - -include: - - resources/*.yml - - resources/*/*.yml - -# Variable declarations. These variables are assigned in the dev/prod targets below. -variables: - warehouse_id: - description: The warehouse to use - catalog: - description: The catalog to use - schema: - description: The schema to use - -targets: - dev: - # The default target uses 'mode: development' to create a development copy. - # - Deployed resources get prefixed with '[dev my_user_name]' - # - Any job schedules and triggers are paused by default. - # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html. - mode: development - default: true - workspace: - host: [DATABRICKS_URL] - variables: - warehouse_id: f00dcafe - catalog: main - schema: ${workspace.current_user.short_name} - - prod: - mode: production - workspace: - host: [DATABRICKS_URL] - # We explicitly deploy to /Workspace/Users/[USERNAME] to make sure we only have a single copy. - root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} - variables: - warehouse_id: f00dcafe - catalog: main - schema: default - permissions: - - user_name: [USERNAME] - level: CAN_MANAGE diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/input.json b/acceptance/bundle/templates/telemetry/dbt-sql/input.json index 201ac9667e..ca84320e6d 100644 --- a/acceptance/bundle/templates/telemetry/dbt-sql/input.json +++ b/acceptance/bundle/templates/telemetry/dbt-sql/input.json @@ -2,5 +2,5 @@ "project_name": "my_dbt_sql", "http_path": "/sql/2.0/warehouses/f00dcafe", "default_catalog": "main", - "personal_schemas": "yes, use a schema based on the current user name during development" + "personal_schemas": "yes" } diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt b/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt index 74dcc3bb40..f4ebdc07a4 100644 --- a/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt +++ b/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt @@ -28,7 +28,7 @@ "uploadTime": [UNIX_TIME_MILLIS], "items": [], "protoLogs": [ - "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"dbt-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes, use a schema based on the current user name during development\"},{\"key\":\"serverless\",\"value\":\"yes\"}]}}}}" + "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"dbt-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes\"},{\"key\":\"serverless\",\"value\":\"yes\"}]}}}}" ] } } diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/output.txt b/acceptance/bundle/templates/telemetry/dbt-sql/output.txt index 2455fe4442..92ae6504ab 100644 --- a/acceptance/bundle/templates/telemetry/dbt-sql/output.txt +++ b/acceptance/bundle/templates/telemetry/dbt-sql/output.txt @@ -28,7 +28,7 @@ Refer to the README.md file for full "getting started" guide and production setu "template_enum_args": [ { "key": "personal_schemas", - "value": "yes, use a schema based on the current user name during development" + "value": "yes" }, { "key": "serverless", diff --git a/acceptance/bundle/templates/telemetry/default-sql/input.json b/acceptance/bundle/templates/telemetry/default-sql/input.json index c728d25de1..84cc856316 100644 --- a/acceptance/bundle/templates/telemetry/default-sql/input.json +++ b/acceptance/bundle/templates/telemetry/default-sql/input.json @@ -2,5 +2,5 @@ "project_name": "my_default_sql", "http_path": "/sql/2.0/warehouses/f00dcafe", "default_catalog": "main", - "personal_schemas": "yes, automatically use a schema based on the current user name during development" + "personal_schemas": "yes" } diff --git a/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt b/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt index 314abb60d2..6ad822606b 100644 --- a/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt +++ b/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt @@ -19,7 +19,7 @@ "uploadTime": [UNIX_TIME_MILLIS], "items": [], "protoLogs": [ - "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"default-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes, automatically use a schema based on the current user name during development\"}]}}}}" + "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"default-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes\"}]}}}}" ] } } diff --git a/acceptance/bundle/templates/telemetry/default-sql/output.txt b/acceptance/bundle/templates/telemetry/default-sql/output.txt index f01f351701..ba77a00690 100644 --- a/acceptance/bundle/templates/telemetry/default-sql/output.txt +++ b/acceptance/bundle/templates/telemetry/default-sql/output.txt @@ -28,7 +28,7 @@ See also the documentation at https://docs.databricks.com/dev-tools/bundles/inde "template_enum_args": [ { "key": "personal_schemas", - "value": "yes, automatically use a schema based on the current user name during development" + "value": "yes" } ] } diff --git a/libs/template/templates/dbt-sql/databricks_template_schema.json b/libs/template/templates/dbt-sql/databricks_template_schema.json index 34d2874f86..79ebcd5ca9 100644 --- a/libs/template/templates/dbt-sql/databricks_template_schema.json +++ b/libs/template/templates/dbt-sql/databricks_template_schema.json @@ -25,10 +25,11 @@ }, "personal_schemas": { "type": "string", - "description": "\nWould you like to use a personal schema for each user working on this project? (e.g., 'catalog.{{short_name}}')\npersonal_schemas", + "description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')", + "default": "yes", "enum": [ - "yes, use a schema based on the current user name during development", - "no, use a shared schema during development" + "yes", + "no (advanced: I will customize the schema configuration later in databricks.yml)" ], "order": 4 }, @@ -36,7 +37,7 @@ "skip_prompt_if": { "properties": { "personal_schemas": { - "const": "yes, use a schema based on the current user name during development" + "const": "yes" } } }, diff --git a/libs/template/templates/default-minimal/databricks_template_schema.json b/libs/template/templates/default-minimal/databricks_template_schema.json index 180eaa74df..ff53fa6f7e 100644 --- a/libs/template/templates/default-minimal/databricks_template_schema.json +++ b/libs/template/templates/default-minimal/databricks_template_schema.json @@ -64,11 +64,11 @@ }, "personal_schemas": { "type": "string", - "description": "Use a personal schema for each user working on this project.\n(This is recommended. Your personal schema will be '{{.default_catalog}}.{{short_name}}'.)", + "description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')", "default": "yes", "enum": [ "yes", - "no, I will customize the schema configuration later in databricks.yml" + "no (advanced: I will customize the schema configuration later in databricks.yml)" ], "order": 7 }, diff --git a/libs/template/templates/default-python/databricks_template_schema.json b/libs/template/templates/default-python/databricks_template_schema.json index 98769e297a..3126ee6d8b 100644 --- a/libs/template/templates/default-python/databricks_template_schema.json +++ b/libs/template/templates/default-python/databricks_template_schema.json @@ -56,11 +56,11 @@ }, "personal_schemas": { "type": "string", - "description": "Use a personal schema for each user working on this project.\n(This is recommended. Your personal schema will be '{{.default_catalog}}.{{short_name}}'.)", + "description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')", "default": "yes", "enum": [ "yes", - "no, I will customize the schema configuration later in databricks.yml" + "no (advanced: I will customize the schema configuration later in databricks.yml)" ], "order": 7 }, diff --git a/libs/template/templates/default-scala/databricks_template_schema.json b/libs/template/templates/default-scala/databricks_template_schema.json index 9d23976821..a1a589e7f6 100644 --- a/libs/template/templates/default-scala/databricks_template_schema.json +++ b/libs/template/templates/default-scala/databricks_template_schema.json @@ -32,10 +32,11 @@ }, "personal_schemas": { "type": "string", - "description": "\nWould you like to use a personal schema for each user working on this project? (e.g., 'catalog.{{short_name}}')\npersonal_schemas", + "description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')", + "default": "yes", "enum": [ - "yes, use a schema based on the current user name during development", - "no, use a shared schema during development" + "yes", + "no (advanced: I will customize the schema configuration later in databricks.yml)" ], "order": 5 }, @@ -43,7 +44,7 @@ "skip_prompt_if": { "properties": { "personal_schemas": { - "const": "yes, use a schema based on the current user name during development" + "const": "yes" } } }, diff --git a/libs/template/templates/default-sql/databricks_template_schema.json b/libs/template/templates/default-sql/databricks_template_schema.json index cb73006001..1e04781f2f 100644 --- a/libs/template/templates/default-sql/databricks_template_schema.json +++ b/libs/template/templates/default-sql/databricks_template_schema.json @@ -25,10 +25,11 @@ }, "personal_schemas": { "type": "string", - "description": "\nWould you like to use a personal schema for each user working on this project? (e.g., 'catalog.{{short_name}}')\npersonal_schemas", + "description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')", + "default": "yes", "enum": [ - "yes, automatically use a schema based on the current user name during development", - "no, use a single schema for all users during development" + "yes", + "no (advanced: I will customize the schema configuration later in databricks.yml)" ], "order": 4 }, @@ -36,7 +37,7 @@ "skip_prompt_if": { "properties": { "personal_schemas": { - "const": "yes, automatically use a schema based on the current user name during development" + "const": "yes" } } }, diff --git a/libs/template/templates/pydabs/databricks_template_schema.json b/libs/template/templates/pydabs/databricks_template_schema.json index 1541e9358a..59d98e985f 100644 --- a/libs/template/templates/pydabs/databricks_template_schema.json +++ b/libs/template/templates/pydabs/databricks_template_schema.json @@ -56,11 +56,11 @@ }, "personal_schemas": { "type": "string", - "description": "Use a personal schema for each user working on this project.\n(This is recommended. Your personal schema will be '{{.default_catalog}}.{{short_name}}'.)", + "description": "Use a personal schema for each user working on this project\n(this is recommended, your personal schema will be '{{.default_catalog}}.{{short_name}}')", "default": "yes", "enum": [ "yes", - "no, I will customize the schema configuration later in databricks.yml" + "no (advanced: I will customize the schema configuration later in databricks.yml)" ], "order": 7 }, From 2ee1dd14253db6fb5659c5da3d840a78995d4f8c Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 30 Jan 2026 10:12:12 +0100 Subject: [PATCH 2/3] Fix: restore databricks.yml files and simplify enum text - Restore accidentally deleted acceptance test output files - Use simpler enum text: "no, I will customize..." instead of "no (advanced: I will customize..." Co-Authored-By: Claude Opus 4.5 --- .../dbt-sql/output/my_dbt_sql/databricks.yml | 33 ++++++++++++ .../output/my_default_scala/databricks.yml | 53 +++++++++++++++++++ .../output/my_default_sql/databricks.yml | 47 ++++++++++++++++ .../dbt-sql/databricks_template_schema.json | 2 +- .../databricks_template_schema.json | 2 +- .../databricks_template_schema.json | 2 +- .../databricks_template_schema.json | 2 +- .../databricks_template_schema.json | 2 +- .../databricks_template_schema.json | 2 +- .../pydabs/databricks_template_schema.json | 2 +- 10 files changed, 140 insertions(+), 7 deletions(-) create mode 100644 acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml create mode 100644 acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml create mode 100644 acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml new file mode 100644 index 0000000000..8b4eec8057 --- /dev/null +++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml @@ -0,0 +1,33 @@ +# This file defines the structure of this project and how it is deployed +# to production using Databricks Asset Bundles. +# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation. +bundle: + name: my_dbt_sql + uuid: [UUID] + +include: + - resources/*.yml + - resources/*/*.yml + +# Deployment targets. +# The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml +targets: + dev: + # The default target uses 'mode: development' to create a development copy. + # - Deployed resources get prefixed with '[dev my_user_name]' + # - Any job schedules and triggers are paused by default. + # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html. + mode: development + default: true + workspace: + host: [DATABRICKS_URL] + + prod: + mode: production + workspace: + host: [DATABRICKS_URL] + # We explicitly deploy to /Workspace/Users/[USERNAME] to make sure we only have a single copy. + root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} + permissions: + - user_name: [USERNAME] + level: CAN_MANAGE diff --git a/acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml b/acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml new file mode 100644 index 0000000000..fa88835b65 --- /dev/null +++ b/acceptance/bundle/templates/default-scala/output/my_default_scala/databricks.yml @@ -0,0 +1,53 @@ +# This is a Databricks asset bundle definition for my_default_scala. +# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation. +bundle: + name: my_default_scala + uuid: [UUID] + +include: + - resources/*.yml + +variables: + catalog: + description: The catalog to use + schema: + description: The schema to use + +workspace: + host: [DATABRICKS_URL] + artifact_path: /Volumes/test-folder/${bundle.name}/${bundle.target}/${workspace.current_user.short_name} + +artifacts: + default: + type: jar + build: sbt package && sbt assembly + path: . + files: + - source: ./target/scala-2.13/my_default_scala-assembly-0.1.jar + +targets: + dev: + # The default target uses 'mode: development' to create a development copy. + # - Deployed resources get prefixed with '[dev my_user_name]' + # - Any job schedules and triggers are paused by default. + # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html. + mode: development + default: true + workspace: + host: [DATABRICKS_URL] + variables: + catalog: main + schema: ${workspace.current_user.short_name} + + prod: + mode: production + workspace: + host: [DATABRICKS_URL] + # We explicitly deploy to /Workspace/Users/[USERNAME] to make sure we only have a single copy. + root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} + permissions: + - user_name: [USERNAME] + level: CAN_MANAGE + variables: + catalog: main + schema: default diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml b/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml new file mode 100644 index 0000000000..e9d9093a96 --- /dev/null +++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml @@ -0,0 +1,47 @@ +# This is a Databricks asset bundle definition for my_default_sql. +# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation. +bundle: + name: my_default_sql + uuid: [UUID] + +include: + - resources/*.yml + - resources/*/*.yml + +# Variable declarations. These variables are assigned in the dev/prod targets below. +variables: + warehouse_id: + description: The warehouse to use + catalog: + description: The catalog to use + schema: + description: The schema to use + +targets: + dev: + # The default target uses 'mode: development' to create a development copy. + # - Deployed resources get prefixed with '[dev my_user_name]' + # - Any job schedules and triggers are paused by default. + # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html. + mode: development + default: true + workspace: + host: [DATABRICKS_URL] + variables: + warehouse_id: f00dcafe + catalog: main + schema: ${workspace.current_user.short_name} + + prod: + mode: production + workspace: + host: [DATABRICKS_URL] + # We explicitly deploy to /Workspace/Users/[USERNAME] to make sure we only have a single copy. + root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} + variables: + warehouse_id: f00dcafe + catalog: main + schema: default + permissions: + - user_name: [USERNAME] + level: CAN_MANAGE diff --git a/libs/template/templates/dbt-sql/databricks_template_schema.json b/libs/template/templates/dbt-sql/databricks_template_schema.json index 79ebcd5ca9..a4b2cd879e 100644 --- a/libs/template/templates/dbt-sql/databricks_template_schema.json +++ b/libs/template/templates/dbt-sql/databricks_template_schema.json @@ -29,7 +29,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 4 }, diff --git a/libs/template/templates/default-minimal/databricks_template_schema.json b/libs/template/templates/default-minimal/databricks_template_schema.json index ff53fa6f7e..c6f5badc23 100644 --- a/libs/template/templates/default-minimal/databricks_template_schema.json +++ b/libs/template/templates/default-minimal/databricks_template_schema.json @@ -68,7 +68,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 7 }, diff --git a/libs/template/templates/default-python/databricks_template_schema.json b/libs/template/templates/default-python/databricks_template_schema.json index 3126ee6d8b..d1c716ea24 100644 --- a/libs/template/templates/default-python/databricks_template_schema.json +++ b/libs/template/templates/default-python/databricks_template_schema.json @@ -60,7 +60,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 7 }, diff --git a/libs/template/templates/default-scala/databricks_template_schema.json b/libs/template/templates/default-scala/databricks_template_schema.json index a1a589e7f6..b3817f3a73 100644 --- a/libs/template/templates/default-scala/databricks_template_schema.json +++ b/libs/template/templates/default-scala/databricks_template_schema.json @@ -36,7 +36,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 5 }, diff --git a/libs/template/templates/default-sql/databricks_template_schema.json b/libs/template/templates/default-sql/databricks_template_schema.json index 1e04781f2f..b1a797b6c6 100644 --- a/libs/template/templates/default-sql/databricks_template_schema.json +++ b/libs/template/templates/default-sql/databricks_template_schema.json @@ -29,7 +29,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 4 }, diff --git a/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json b/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json index 6d910e388f..9ec27cd16d 100644 --- a/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json +++ b/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json @@ -85,7 +85,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 8 }, diff --git a/libs/template/templates/pydabs/databricks_template_schema.json b/libs/template/templates/pydabs/databricks_template_schema.json index 59d98e985f..21260ef958 100644 --- a/libs/template/templates/pydabs/databricks_template_schema.json +++ b/libs/template/templates/pydabs/databricks_template_schema.json @@ -60,7 +60,7 @@ "default": "yes", "enum": [ "yes", - "no (advanced: I will customize the schema configuration later in databricks.yml)" + "no, I will customize the schema configuration later in databricks.yml" ], "order": 7 }, From 114876efa2bb63e03eaa928d3f0b9618d88aae0e Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 30 Jan 2026 10:15:41 +0100 Subject: [PATCH 3/3] Add changelog entry Co-Authored-By: Claude Opus 4.5 --- NEXT_CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index b61bfda055..d21f1eefa6 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -8,6 +8,7 @@ ### Bundles +* Standardize `personal_schemas` enum across bundle templates ([#4401](https://github.com/databricks/cli/pull/4401)) * Add missing values to SchemaGrantPrivilege enum ([#4380](https://github.com/databricks/cli/pull/4380)) ### Dependency updates