From f12bb0cffbff87aa3253e9008f7d61a4ff54c9d5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 22 Dec 2024 11:02:00 +0100 Subject: [PATCH 1/3] Remove run-as from the built-in templates --- .../dbt-sql/template/{{.project_name}}/databricks.yml.tmpl | 6 ++---- .../template/{{.project_name}}/databricks.yml.tmpl | 4 +--- .../template/{{.project_name}}/databricks.yml.tmpl | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl index 5594749a906..f459a1cfb19 100644 --- a/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl +++ b/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl @@ -11,12 +11,12 @@ include: # The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml targets: dev: - default: true # 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: {{workspace_host}} @@ -24,10 +24,8 @@ targets: mode: production workspace: host: {{workspace_host}} - # We explicitly specify /Workspace/Users/{{user_name}} to make sure we only have a single copy. + # We explicitly deploy to /Workspace/Users/{{user_name}} to make sure we only have a single copy. root_path: /Workspace/Users/{{user_name}}/.bundle/${bundle.name}/${bundle.target} permissions: - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}} level: CAN_MANAGE - run_as: - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}} diff --git a/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl index c42b822a8d6..5e79c5459d8 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl +++ b/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl @@ -21,10 +21,8 @@ targets: mode: production workspace: host: {{workspace_host}} - # We explicitly specify /Workspace/Users/{{user_name}} to make sure we only have a single copy. + # We explicitly deploy to /Workspace/Users/{{user_name}} to make sure we only have a single copy. root_path: /Workspace/Users/{{user_name}}/.bundle/${bundle.name}/${bundle.target} permissions: - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}} level: CAN_MANAGE - run_as: - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}} diff --git a/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl index 51d03e99afe..5993c123cfe 100644 --- a/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl +++ b/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl @@ -41,7 +41,7 @@ targets: mode: production workspace: host: {{workspace_host}} - # We explicitly specify /Workspace/Users/{{user_name}} to make sure we only have a single copy. + # We explicitly deploy to /Workspace/Users/{{user_name}} to make sure we only have a single copy. root_path: /Workspace/Users/{{user_name}}/.bundle/${bundle.name}/${bundle.target} variables: warehouse_id: {{index ((regexp "[^/]+$").FindStringSubmatch .http_path) 0}} @@ -50,5 +50,3 @@ targets: permissions: - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}} level: CAN_MANAGE - run_as: - {{if is_service_principal}}service_principal{{else}}user{{end}}_name: {{user_name}} From d133ea8bdd18cd0ab2c7c7e099bc5e1e664345cc Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Mon, 27 Jan 2025 10:49:23 +0100 Subject: [PATCH 2/3] Update acceptance tests --- .../templates/dbt-sql/output/my_dbt_sql/.gitignore | 14 +++++++++++++- .../dbt-sql/output/my_dbt_sql/databricks.yml | 6 ++---- .../output/my_default_python/databricks.yml | 4 +--- .../default-sql/output/my_default_sql/.gitignore | 10 ++++++++-- .../output/my_default_sql/databricks.yml | 4 +--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore index de811f118b1..cced6581bd6 100644 --- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore +++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore @@ -1,2 +1,14 @@ +# DABs +.databricks/ +build/ +dist/ +__pycache__/ +*.egg-info +.venv/ +scratch/** +!scratch/README.md -.databricks +# dbt +target/ +dbt_packages/ +logs/ 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 index 1962bc54314..1542cdf8d0a 100644 --- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml +++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml @@ -12,12 +12,12 @@ include: # The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml targets: dev: - default: true # 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 @@ -25,10 +25,8 @@ targets: mode: production workspace: host: $DATABRICKS_URL - # We explicitly specify /Workspace/Users/$USERNAME to make sure we only have a single copy. + # 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 - run_as: - user_name: $USERNAME diff --git a/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml b/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml index 9deca9cf5d8..96b73c71c97 100644 --- a/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml +++ b/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml @@ -22,10 +22,8 @@ targets: mode: production workspace: host: $DATABRICKS_URL - # We explicitly specify /Workspace/Users/$USERNAME to make sure we only have a single copy. + # 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 - run_as: - user_name: $USERNAME diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore b/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore index de811f118b1..0dab7f4995f 100644 --- a/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore +++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore @@ -1,2 +1,8 @@ - -.databricks +.databricks/ +build/ +dist/ +__pycache__/ +*.egg-info +.venv/ +scratch/** +!scratch/README.md 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 index ab857287e6f..9eba27a717b 100644 --- a/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml +++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml @@ -35,7 +35,7 @@ targets: mode: production workspace: host: $DATABRICKS_URL - # We explicitly specify /Workspace/Users/$USERNAME to make sure we only have a single copy. + # 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 @@ -44,5 +44,3 @@ targets: permissions: - user_name: $USERNAME level: CAN_MANAGE - run_as: - user_name: $USERNAME From a58e224de256aaed9490c4cbe3016eddb419993a Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 23 Feb 2025 14:24:58 +0100 Subject: [PATCH 3/3] Restore out.gitignore --- .../dbt-sql/output/my_dbt_sql/out.gitignore | 14 +------------- .../output/my_default_sql/out.gitignore | 10 ++-------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/out.gitignore b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/out.gitignore index cced6581bd6..de811f118b1 100644 --- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/out.gitignore +++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/out.gitignore @@ -1,14 +1,2 @@ -# DABs -.databricks/ -build/ -dist/ -__pycache__/ -*.egg-info -.venv/ -scratch/** -!scratch/README.md -# dbt -target/ -dbt_packages/ -logs/ +.databricks diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/out.gitignore b/acceptance/bundle/templates/default-sql/output/my_default_sql/out.gitignore index 0dab7f4995f..de811f118b1 100644 --- a/acceptance/bundle/templates/default-sql/output/my_default_sql/out.gitignore +++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/out.gitignore @@ -1,8 +1,2 @@ -.databricks/ -build/ -dist/ -__pycache__/ -*.egg-info -.venv/ -scratch/** -!scratch/README.md + +.databricks