Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@

* Bump Go toolchain to 1.25.10 ([#5213](https://github.com/databricks/cli/pull/5213)).
* Bump `github.com/databricks/databricks-sdk-go` from v0.128.0 to v0.132.0.
* Bump Terraform provider to v1.115.0.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
"md5": null,
"parent_path": "/Users/[USERNAME]",
"path": "/Users/[USERNAME]/test dashboard [UNIQUE_NAME].lvdash.json",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"serialized_dashboard": "{\"pages\":[{\"displayName\":\"Untitled page\",\"name\":\"02724bf2\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}",
"update_time": "[TIMESTAMP]",
"warehouse_id": "[TEST_DEFAULT_WAREHOUSE_ID]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ Terraform will perform the following actions:
- include = "/Workspace/Users/foo@databricks.com/another/**" -> null
}
}

- provider_config {
- workspace_id = "[NUMID]" -> null
}
}

Plan: 1 to add, 0 to change, 1 to destroy.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ Terraform will perform the following actions:
- include = "/Workspace/Users/foo@databricks.com/another/**" -> null
}
}

# (1 unchanged block hidden)
}

Plan: 0 to add, 1 to change, 0 to destroy.
Expand Down
18 changes: 15 additions & 3 deletions acceptance/bundle/migrate/basic/out.original_state.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@
"parameter": [],
"performance_target": null,
"pipeline_task": [],
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Schema-driven change from v1.115 (technically already in v1.114): provider_config is no longer an empty list for jobs and pipelines — it now contains { workspace_id: ... }. Appears across many state fixtures in this PR (all acceptance/bundle/migrate/* state files, bundle/resources/jobs/update/out.state.terraform.json, and the deployment/bind/* outputs).

Not a CLI behavior change; the provider is just emitting the field now. Flagging so you don't have to chase down where it came from.

}
],
"python_wheel_task": [],
"queue": [
{
Expand Down Expand Up @@ -208,7 +212,11 @@
"name": "Test Migration Pipeline",
"notification": [],
"photon": false,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"restart_window": [],
"root_path": null,
"run_as": [],
Expand Down Expand Up @@ -254,7 +262,11 @@
"id": "mycat.myschema.myvol",
"name": "myvol",
"owner": "[USERNAME]",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"schema_name": "myschema",
"storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]",
"volume_path": "/Volumes/mycat/myschema/myvol",
Expand Down
6 changes: 5 additions & 1 deletion acceptance/bundle/migrate/dashboards/out.original_state.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
"md5": "b4ab6aee48485b0b5e980761d3efe936",
"parent_path": "/Users/[USERNAME]",
"path": "/Users/[USERNAME]/my dashboard.lvdash.json",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"serialized_dashboard": "{\"pages\":[{\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"name\":\"02724bf2\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}\n",
"update_time": "[TIMESTAMP]",
"warehouse_id": "123456"
Expand Down
12 changes: 10 additions & 2 deletions acceptance/bundle/migrate/default-python/out.state_original.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@
],
"performance_target": null,
"pipeline_task": [],
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"python_wheel_task": [],
"queue": [
{
Expand Down Expand Up @@ -441,7 +445,11 @@
"name": "[dev [USERNAME]] my_default_python_etl",
"notification": [],
"photon": false,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"restart_window": [],
"root_path": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/files/src/my_default_python_etl",
"run_as": [],
Expand Down
36 changes: 30 additions & 6 deletions acceptance/bundle/migrate/grants/out.original_state.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
"metastore": null,
"model": null,
"pipeline": null,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"recipient": null,
"schema": null,
"share": null,
Expand Down Expand Up @@ -75,7 +79,11 @@
"metastore": null,
"model": null,
"pipeline": null,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"recipient": null,
"schema": "main.schema_grants",
"share": null,
Expand Down Expand Up @@ -118,7 +126,11 @@
"metastore": null,
"model": null,
"pipeline": null,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"recipient": null,
"schema": null,
"share": null,
Expand Down Expand Up @@ -155,7 +167,11 @@
"metastore_id": "[UUID]",
"name": "mymodel",
"owner": "[USERNAME]",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"schema_name": "schema_grants",
"storage_location": null,
"updated_at": [UNIX_TIME_MILLIS][0],
Expand Down Expand Up @@ -187,7 +203,11 @@
"name": "schema_grants",
"owner": "[USERNAME]",
"properties": null,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"schema_id": "[UUID]",
"storage_root": null
},
Expand All @@ -210,7 +230,11 @@
"id": "main.schema_grants.volume_name",
"name": "volume_name",
"owner": "[USERNAME]",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"schema_name": "schema_grants",
"storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]",
"volume_path": "/Volumes/main/schema_grants/volume_name",
Expand Down
24 changes: 20 additions & 4 deletions acceptance/bundle/migrate/permissions/out.original_state.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@
"parameter": [],
"performance_target": null,
"pipeline_task": [],
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"python_wheel_task": [],
"queue": [
{
Expand Down Expand Up @@ -195,7 +199,11 @@
"notebook_path": null,
"object_type": "job",
"pipeline_id": null,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"registered_model_id": null,
"repo_id": null,
"repo_path": null,
Expand Down Expand Up @@ -257,7 +265,11 @@
"notebook_path": null,
"object_type": "pipelines",
"pipeline_id": "[UUID]",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"registered_model_id": null,
"repo_id": null,
"repo_path": null,
Expand Down Expand Up @@ -332,7 +344,11 @@
"name": "Test Migration Pipeline",
"notification": [],
"photon": false,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"restart_window": [],
"root_path": null,
"run_as": [],
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/migrate/runas/out.create_requests.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"headers": {
"User-Agent": [
"databricks-tf-provider/1.113.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/pipeline auth/pat"
"databricks-tf-provider/1.115.0 databricks-sdk-go/[SDK_VERSION] go/1.25.8 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/pipeline auth/pat"
]
},
"method": "POST",
Expand Down Expand Up @@ -32,7 +32,7 @@
{
"headers": {
"User-Agent": [
"databricks-tf-provider/1.113.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/permissions auth/pat"
"databricks-tf-provider/1.115.0 databricks-sdk-go/[SDK_VERSION] go/1.25.8 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/permissions auth/pat"
]
},
"method": "PUT",
Expand Down
12 changes: 10 additions & 2 deletions acceptance/bundle/migrate/runas/out.old_state.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@
"notebook_path": null,
"object_type": "pipelines",
"pipeline_id": "[UUID]",
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"registered_model_id": null,
"repo_id": null,
"repo_path": null,
Expand Down Expand Up @@ -121,7 +125,11 @@
"name": "DABs Revenue Pipeline",
"notification": [],
"photon": false,
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"restart_window": [],
"root_path": null,
"run_as": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@
"parameter": [],
"performance_target": null,
"pipeline_task": [],
"provider_config": [],
"provider_config": [
{
"workspace_id": "[NUMID]"
}
],
"python_wheel_task": [],
"queue": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"method": "PATCH",
"path": "/api/2.0/postgres/[MY_PROJECT_ID]",
"q": {
"update_mask": "spec"
"update_mask": "initial_endpoint_spec,spec"
},
"body": {
"name": "[MY_PROJECT_ID]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"method": "PATCH",
"path": "/api/2.0/postgres/[MY_PROJECT_ID]",
"q": {
"update_mask": "spec"
"update_mask": "initial_endpoint_spec,spec"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Schema-driven change: v1.115 sends update_mask: "initial_endpoint_spec,spec" for databricks_postgres_project PATCH instead of just "spec". New provider behavior — worth confirming the backend accepts the expanded mask on a display_name-only update (this test only changes the display name; initial_endpoint_spec is unchanged but now included in the mask).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed this is not an issue.

},
"body": {
"name": "[MY_PROJECT_ID]",
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/state/state_present/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Updating deployment state...
Deployment complete!

>>> print_requests.py //api/2.1/unity-catalog/schemas
"databricks-tf-provider/1.113.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
"databricks-tf-provider/1.115.0 databricks-sdk-go/[SDK_VERSION] go/1.25.8 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"

>>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
Expand All @@ -17,7 +17,7 @@ Updating deployment state...
Deployment complete!

>>> print_requests.py --get //api/2.1/unity-catalog/schemas
"databricks-tf-provider/1.113.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
"databricks-tf-provider/1.115.0 databricks-sdk-go/[SDK_VERSION] go/1.25.8 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"

=== Adding resources.json with lower serial does not change anything
>>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan
Expand Down
Loading
Loading