From 618b93c234372e438197cc24f21535dc5b5ee5c1 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 10 Feb 2025 11:38:34 +0100 Subject: [PATCH 1/2] Enable standard templates on cloud --- acceptance/bundle/templates/test.toml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/acceptance/bundle/templates/test.toml b/acceptance/bundle/templates/test.toml index 90539263d..70f1cc580 100644 --- a/acceptance/bundle/templates/test.toml +++ b/acceptance/bundle/templates/test.toml @@ -1,2 +1,20 @@ -# At the moment, there are many differences across different envs w.r.t to catalog use, node type and so on. -LocalOnly = true +[[Repls]] +Old = 'service_principal_name:' +New = '$$USER_NAME_KEY:' + +[[Repls]] +Old = 'user_name:' +New = '$$USER_NAME_KEY:' + +[[Repls]] +Old = ''' + email_notifications: + on_failure: + - \$USERNAME + +''' +New = '' + +[[Repls]] +Old = '\bnode_type_id: [0-9a-zA-Z_.-]+\b' +New = 'node_type_id: (redacted)' From b66dfa3fa2c8d9dd3b073a0b0218f9bbfa48718e Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 10 Feb 2025 12:45:46 +0100 Subject: [PATCH 2/2] go test -update --- .../bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml | 4 ++-- .../dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml | 2 +- .../default-python/output/my_default_python/databricks.yml | 4 ++-- .../my_default_python/resources/my_default_python.job.yml | 2 +- .../default-sql/output/my_default_sql/databricks.yml | 4 ++-- .../output/my_jobs_as_code/databricks.yml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) 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 3651ef12d..0c2485684 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 @@ -28,7 +28,7 @@ targets: # We explicitly specify /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] + - $USER_NAME_KEY: [USERNAME] level: CAN_MANAGE run_as: - user_name: [USERNAME] + $USER_NAME_KEY: [USERNAME] diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml index b522931f9..69dadb589 100644 --- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml +++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml @@ -33,7 +33,7 @@ resources: new_cluster: spark_version: 15.4.x-scala2.12 - node_type_id: i3.xlarge + node_type_id: (redacted) data_security_mode: SINGLE_USER num_workers: 0 spark_conf: 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 6df75c209..8f517aacc 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 @@ -25,7 +25,7 @@ targets: # We explicitly specify /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] + - $USER_NAME_KEY: [USERNAME] level: CAN_MANAGE run_as: - user_name: [USERNAME] + $USER_NAME_KEY: [USERNAME] diff --git a/acceptance/bundle/templates/default-python/output/my_default_python/resources/my_default_python.job.yml b/acceptance/bundle/templates/default-python/output/my_default_python/resources/my_default_python.job.yml index d9e31691a..0dc3b8122 100644 --- a/acceptance/bundle/templates/default-python/output/my_default_python/resources/my_default_python.job.yml +++ b/acceptance/bundle/templates/default-python/output/my_default_python/resources/my_default_python.job.yml @@ -43,7 +43,7 @@ resources: - job_cluster_key: job_cluster new_cluster: spark_version: 15.4.x-scala2.12 - node_type_id: i3.xlarge + node_type_id: (redacted) autoscale: min_workers: 1 max_workers: 4 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 6ef09cf3b..3b32709b4 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 @@ -42,7 +42,7 @@ targets: catalog: main schema: default permissions: - - user_name: [USERNAME] + - $USER_NAME_KEY: [USERNAME] level: CAN_MANAGE run_as: - user_name: [USERNAME] + $USER_NAME_KEY: [USERNAME] diff --git a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml index 9299c96e8..58a55fd55 100644 --- a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml +++ b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml @@ -43,7 +43,7 @@ targets: # We explicitly specify /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] + - $USER_NAME_KEY: [USERNAME] level: CAN_MANAGE run_as: - user_name: [USERNAME] + $USER_NAME_KEY: [USERNAME]