steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce $DATABRICKS_URL replacement in tests (#2158) 

## Changes
It covers both https://$DATABRICKS_HOST and http://$DATABRICKS_HOST so
the test output does not change between local and the cloud.

## Tests
Existing tests using golden files (acceptance and integration) catch
this and were updated.
This commit is contained in:
Denis Bilenko 2025-01-15 17:24:12 +01:00 committed by GitHub
parent 20179457b9
commit d53a78e926
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acceptance/bundle/init/dbt-sql/output.txt
View File

@ -4,7 +4,7 @@
Welcome to the dbt template for Databricks Asset Bundles! Welcome to the dbt template for Databricks Asset Bundles!
A workspace was selected based on your current profile. For information about how to change this, see https://docs.databricks.com/dev-tools/cli/profiles.html. A workspace was selected based on your current profile. For information about how to change this, see https://docs.databricks.com/dev-tools/cli/profiles.html.
workspace_host: http://$DATABRICKS_HOST workspace_host: $DATABRICKS_URL
📊 Your new project has been created in the 'my_dbt_sql' directory! 📊 Your new project has been created in the 'my_dbt_sql' directory!
If you already have dbt installed, just type 'cd my_dbt_sql; dbt init' to get started. If you already have dbt installed, just type 'cd my_dbt_sql; dbt init' to get started.
@ -15,7 +15,7 @@ Refer to the README.md file for full "getting started" guide and production setu
Name: my_dbt_sql Name: my_dbt_sql
Target: dev Target: dev
Workspace: Workspace:
Host: http://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/my_dbt_sql/dev Path: /Workspace/Users/$USERNAME/.bundle/my_dbt_sql/dev
@ -25,7 +25,7 @@ Validation OK!
Name: my_dbt_sql Name: my_dbt_sql
Target: prod Target: prod
Workspace: Workspace:
Host: http://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/my_dbt_sql/prod Path: /Workspace/Users/$USERNAME/.bundle/my_dbt_sql/prod

6
acceptance/bundle/init/default-python/output.txt
View File

@ -2,7 +2,7 @@
>>> $CLI bundle init default-python --config-file ./input.json >>> $CLI bundle init default-python --config-file ./input.json
Welcome to the default Python template for Databricks Asset Bundles! Welcome to the default Python template for Databricks Asset Bundles!
Workspace to use (auto-detected, edit in 'my_default_python/databricks.yml'): http://$DATABRICKS_HOST Workspace to use (auto-detected, edit in 'my_default_python/databricks.yml'): $DATABRICKS_URL
✨ Your new project has been created in the 'my_default_python' directory! ✨ Your new project has been created in the 'my_default_python' directory!
@ -13,7 +13,7 @@ See also the documentation at https://docs.databricks.com/dev-tools/bundles/inde
Name: my_default_python Name: my_default_python
Target: dev Target: dev
Workspace: Workspace:
Host: http://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/my_default_python/dev Path: /Workspace/Users/$USERNAME/.bundle/my_default_python/dev
@ -23,7 +23,7 @@ Validation OK!
Name: my_default_python Name: my_default_python
Target: prod Target: prod
Workspace: Workspace:
Host: http://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/my_default_python/prod Path: /Workspace/Users/$USERNAME/.bundle/my_default_python/prod

6
acceptance/bundle/init/default-sql/output.txt
View File

@ -4,7 +4,7 @@
Welcome to the default SQL template for Databricks Asset Bundles! Welcome to the default SQL template for Databricks Asset Bundles!
A workspace was selected based on your current profile. For information about how to change this, see https://docs.databricks.com/dev-tools/cli/profiles.html. A workspace was selected based on your current profile. For information about how to change this, see https://docs.databricks.com/dev-tools/cli/profiles.html.
workspace_host: http://$DATABRICKS_HOST workspace_host: $DATABRICKS_URL
✨ Your new project has been created in the 'my_default_sql' directory! ✨ Your new project has been created in the 'my_default_sql' directory!
@ -15,7 +15,7 @@ See also the documentation at https://docs.databricks.com/dev-tools/bundles/inde
Name: my_default_sql Name: my_default_sql
Target: dev Target: dev
Workspace: Workspace:
Host: http://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/my_default_sql/dev Path: /Workspace/Users/$USERNAME/.bundle/my_default_sql/dev
@ -25,7 +25,7 @@ Validation OK!
Name: my_default_sql Name: my_default_sql
Target: prod Target: prod
Workspace: Workspace:
Host: http://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/my_default_sql/prod Path: /Workspace/Users/$USERNAME/.bundle/my_default_sql/prod

2
integration/bundle/testdata/default_python/bundle_init.txt vendored
View File

@ -1,6 +1,6 @@
Welcome to the default Python template for Databricks Asset Bundles! Welcome to the default Python template for Databricks Asset Bundles!
Workspace to use (auto-detected, edit in 'project_name_$UNIQUE_PRJ/databricks.yml'): https://$DATABRICKS_HOST Workspace to use (auto-detected, edit in 'project_name_$UNIQUE_PRJ/databricks.yml'): $DATABRICKS_URL
✨ Your new project has been created in the 'project_name_$UNIQUE_PRJ' directory! ✨ Your new project has been created in the 'project_name_$UNIQUE_PRJ' directory!

6
integration/bundle/testdata/default_python/bundle_summary.txt vendored
View File

@ -23,7 +23,7 @@
"resources/project_name_$UNIQUE_PRJ.pipeline.yml" "resources/project_name_$UNIQUE_PRJ.pipeline.yml"
], ],
"workspace": { "workspace": {
"host": "https://$DATABRICKS_HOST", "host": "$DATABRICKS_URL",
"current_user": { "current_user": {
"active": true, "active": true,
"displayName": "$USERNAME", "displayName": "$USERNAME",
@ -141,7 +141,7 @@
"unit": "DAYS" "unit": "DAYS"
} }
}, },
"url": "https://$DATABRICKS_HOST/jobs/<NUMID>?o=<NUMID>" "url": "$DATABRICKS_URL/jobs/<NUMID>?o=<NUMID>"
} }
}, },
"pipelines": { "pipelines": {
@ -165,7 +165,7 @@
], ],
"name": "[dev $USERNAME] project_name_$UNIQUE_PRJ_pipeline", "name": "[dev $USERNAME] project_name_$UNIQUE_PRJ_pipeline",
"target": "project_name_$UNIQUE_PRJ_dev", "target": "project_name_$UNIQUE_PRJ_dev",
"url": "https://$DATABRICKS_HOST/pipelines/<UUID>?o=<NUMID>" "url": "$DATABRICKS_URL/pipelines/<UUID>?o=<NUMID>"
} }
} }
}, },

2
integration/bundle/testdata/default_python/bundle_validate.txt vendored
View File

@ -1,7 +1,7 @@
Name: project_name_$UNIQUE_PRJ Name: project_name_$UNIQUE_PRJ
Target: dev Target: dev
Workspace: Workspace:
Host: https://$DATABRICKS_HOST Host: $DATABRICKS_URL
User: $USERNAME User: $USERNAME
Path: /Workspace/Users/$USERNAME/.bundle/project_name_$UNIQUE_PRJ/dev Path: /Workspace/Users/$USERNAME/.bundle/project_name_$UNIQUE_PRJ/dev

2
libs/testdiff/replacement.go
View File

@ -80,6 +80,8 @@ func PrepareReplacementsWorkspaceClient(t testutil.TestingT, r *ReplacementsCont
t.Helper() t.Helper()
// in some clouds (gcp) w.Config.Host includes "https://" prefix in others it's really just a host (azure) // in some clouds (gcp) w.Config.Host includes "https://" prefix in others it's really just a host (azure)
host := strings.TrimPrefix(strings.TrimPrefix(w.Config.Host, "http://"), "https://") host := strings.TrimPrefix(strings.TrimPrefix(w.Config.Host, "http://"), "https://")
r.Set("https://"+host, "$DATABRICKS_URL")
r.Set("http://"+host, "$DATABRICKS_URL")
r.Set(host, "$DATABRICKS_HOST") r.Set(host, "$DATABRICKS_HOST")
r.Set(w.Config.ClusterID, "$DATABRICKS_CLUSTER_ID") r.Set(w.Config.ClusterID, "$DATABRICKS_CLUSTER_ID")
r.Set(w.Config.WarehouseID, "$DATABRICKS_WAREHOUSE_ID") r.Set(w.Config.WarehouseID, "$DATABRICKS_WAREHOUSE_ID")