Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acceptance/bundle/bundle_tag/id/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Resources:
Jobs:
foo:
Name: Untitled
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]

>>> [CLI] bundle destroy --auto-approve
The following resources will be deleted:
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/bundle_tag/url/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Resources:
Jobs:
foo:
Name: Untitled
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]

>>> [CLI] bundle destroy --auto-approve
The following resources will be deleted:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resources:
Jobs:
bar:
Name: Untitled
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]
foo:
Name: Untitled
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]
4 changes: 2 additions & 2 deletions acceptance/bundle/deploy/wal/chain-3-jobs/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ Resources:
Jobs:
job_01:
Name: job-01
URL: [DATABRICKS_URL]/jobs/[JOB_01_ID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[JOB_01_ID]?w=[NUMID]
job_02:
Name: job-02
URL: [DATABRICKS_URL]/jobs/[JOB_02_ID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[JOB_02_ID]?w=[NUMID]
job_03:
Name: job-03
URL: (not deployed)
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Resources:
Jobs:
another_valid:
Name: another-valid
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]
valid_job:
Name: valid-job
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]

>>> cat .databricks/bundle/default/resources.json.wal.corrupted
{"k":"resources.jobs.partial_write","v":{"__id__":"33","state":{"name":"partial-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Resources:
Database instances:
database_instance1:
Name: test-instance-02
URL: [DATABRICKS_URL]/compute/database-instances/test-instance-02?o=[NUMID]
URL: [DATABRICKS_URL]/compute/database-instances/test-instance-02?w=[NUMID]

>>> [CLI] bundle deployment unbind database_instance1
Updating deployment state...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"name": "test-pipeline-[UNIQUE_NAME]",
"storage": "/Shared/new_storage",
"url": "[DATABRICKS_URL]/pipelines/[NEW_PIPELINE_ID]?o=[NUMID]"
"url": "[DATABRICKS_URL]/pipelines/[NEW_PIPELINE_ID]?w=[NUMID]"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
],
"name": "test-pipeline",
"url": "[DATABRICKS_URL]/pipelines/[NEW_PIPELINE_ID]?o=[NUMID]"
"url": "[DATABRICKS_URL]/pipelines/[NEW_PIPELINE_ID]?w=[NUMID]"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/deployment/bind/sql_warehouse/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Resources:
SQL Warehouses:
sql_warehouse1:
Name: DEFAULT Test SQL Warehouse
URL: [DATABRICKS_URL]/sql/warehouses/[SQL-WAREHOUSE-ID]?o=[NUMID]
URL: [DATABRICKS_URL]/sql/warehouses/[SQL-WAREHOUSE-ID]?w=[NUMID]

>>> [CLI] bundle deployment unbind sql_warehouse1
Updating deployment state...
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/open/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Deployment complete!
=== Use a fake browser that just prints the URL it would have opened
=== open after deployment
>>> [CLI] bundle open foo
Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
[DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]
[DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]

=== test auto-completion handler
>>> [CLI] __complete bundle open ,
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/resource_deps/create_error/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Resources:
URL: (not deployed)
independent:
Name: independent
URL: [DATABRICKS_URL]/jobs/[INDEPENDENT_ID]?o=[NUMID]
URL: [DATABRICKS_URL]/jobs/[INDEPENDENT_ID]?w=[NUMID]

=== Plan should still contain foo and bar
>>> [CLI] bundle plan
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/alerts/with_file/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Ignore = [".databricks"]
# See: https://github.com/databricks/cli/issues/4221
TimeoutCloud = "5m"

# redact ?o=[NUMID]. Different clouds can have different URL serialization, like [DATABRICKS_URL]/sql/alerts-v2/[ALERT_ID] vs [DATABRICKS_URL]/sql/alerts-v2/[ALERT_ID]?o=[NUMID].
# redact ?[ow]=[NUMID]. Different clouds can have different URL serialization, like [DATABRICKS_URL]/sql/alerts-v2/[ALERT_ID] vs [DATABRICKS_URL]/sql/alerts-v2/[ALERT_ID]?o=[NUMID].
[[Repls]]
Old = '\?o=\d+'
Old = '\?[ow]=\d+'
New = ''
Order = 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Old = "[0-9a-z]{16,}"
New = "[ALPHANUMID]"

[[Repls]]
# clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Ignore = [
]

[[Repls]]
# clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/jobs/check-metadata/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Ignore = [
MSYS_NO_PATHCONV = "1"

[[Repls]]
# clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[NUMID\]'
# clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[NUMID\]'
New = ''
Order = 1000
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/postgres_branches/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Ignore = [
]

[[Repls]]
# Clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# Clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/postgres_catalogs/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Ignore = [
]

[[Repls]]
# Clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# Clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/postgres_endpoints/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Ignore = [
]

[[Repls]]
# Clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# Clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/postgres_projects/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Ignore = [
]

[[Repls]]
# Clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# Clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/postgres_synced_tables/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Ignore = [
]

[[Repls]]
# Clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# Clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/resources/schemas/recreate/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Deployment complete!
"comment": "COMMENT1",
"id": "main.myschema",
"name": "myschema",
"url": "[DATABRICKS_URL]/explore/data/main/myschema?o=[NUMID]"
"url": "[DATABRICKS_URL]/explore/data/main/myschema?w=[NUMID]"
}
}

Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/sql_warehouses/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Resources:
SQL Warehouses:
test_sql_warehouse:
Name: sql_warehouse_name
URL: [DATABRICKS_URL]/sql/warehouses/[UUID]?o=[NUMID]
URL: [DATABRICKS_URL]/sql/warehouses/[UUID]?w=[NUMID]

=== Update the warehouse name
>>> update_file.py databricks.yml sql_warehouse_name sql_warehouse_name_2
Expand Down Expand Up @@ -105,7 +105,7 @@ Resources:
SQL Warehouses:
test_sql_warehouse:
Name: sql_warehouse_name_2
URL: [DATABRICKS_URL]/sql/warehouses/[UUID]?o=[NUMID]
URL: [DATABRICKS_URL]/sql/warehouses/[UUID]?w=[NUMID]

=== Destroy the warehouse
>>> [CLI] bundle destroy --auto-approve
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ RecordRequests = false
RunsOnDbr = false

[[Repls]]
# clean up ?o=<num> suffix after URL since not all workspaces have that
Old = '\?o=\[(NUMID|ALPHANUMID)\]'
# clean up ?[ow]=<num> suffix after URL since not all workspaces have that
Old = '\?[ow]=\[(NUMID|ALPHANUMID)\]'
New = ''
Order = 1000

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Resources:
Vector Search Endpoints:
my_endpoint:
Name: vs-endpoint-[UNIQUE_NAME]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?o=[NUMID]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?w=[NUMID]

>>> [CLI] bundle deploy
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-endpoint-[UNIQUE_NAME]/default/files...
Expand All @@ -42,7 +42,7 @@ Resources:
Vector Search Endpoints:
my_endpoint:
Name: vs-endpoint-[UNIQUE_NAME]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?o=[NUMID]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?w=[NUMID]

>>> print_requests.py //vector-search/endpoints

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Resources:
Vector Search Endpoints:
my_endpoint:
Name: vs-endpoint-[UNIQUE_NAME]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?o=[NUMID]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?w=[NUMID]
Vector Search Indexes:
my_index:
Name: vs-index-[UNIQUE_NAME]
Expand Down Expand Up @@ -48,7 +48,7 @@ Resources:
Vector Search Endpoints:
my_endpoint:
Name: vs-endpoint-[UNIQUE_NAME]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?o=[NUMID]
URL: [DATABRICKS_URL]/compute/vector-search/vs-endpoint-[UNIQUE_NAME]?w=[NUMID]
Vector Search Indexes:
my_index:
Name: vs-index-[UNIQUE_NAME]
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/volumes/change-comment/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Deployment complete!

=== Summary should now show id and url
"main.myschema.myvolume"
"[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?o=[NUMID]"
"[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?w=[NUMID]"

=== Verify deployment
>>> [CLI] volumes read main.myschema.myvolume
Expand Down Expand Up @@ -64,7 +64,7 @@ Deployment complete!
"id": "main.myschema.myvolume",
"name": "myvolume",
"schema_name": "myschema",
"url": "[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?o=[NUMID]",
"url": "[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?w=[NUMID]",
"volume_type": "MANAGED"
}

Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/resources/volumes/change-name/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Deployment complete!
"id": "main.myschema.myvolume",
"name": "myvolume",
"schema_name": "myschema",
"url": "[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?o=[NUMID]",
"url": "[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?w=[NUMID]",
"volume_type": "MANAGED"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Deployment complete!
"id": "main.myschema.myvolume",
"name": "myvolume",
"schema_name": "myschema",
"url": "[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?o=[NUMID]",
"url": "[DATABRICKS_URL]/explore/data/volumes/main/myschema/myvolume?w=[NUMID]",
"volume_type": "MANAGED"
}
}
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/state/force_pull_commands/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ Deployment complete!
=== bundle open without --force-pull: no remote state read

>>> [CLI] bundle open foo
Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]

=== bundle open --force-pull: remote state read

>>> [CLI] bundle open foo --force-pull
Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
Opening browser at [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID]
{
"method": "GET",
"path": "/api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/force-pull-commands/default/state/STATE_FILENAME"
Expand Down
Loading
Loading