From 22021048294fbf517023c8dd32a1470777ebff38 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 20 Apr 2026 15:26:54 +0200 Subject: [PATCH 1/4] Bump databricks-sdk-go to v0.128.0 Standard SDK bump. Changes are small since the OpenAPI SHA didn't move (v0.127 and v0.128 share 11ae6f9d). Only bundle schema annotations picked up two new fields: VectorSearchEndpoint.usage_policy_id and EndpointType.STORAGE_OPTIMIZED. Co-authored-by: Isaac --- NEXT_CHANGELOG.md | 1 + bundle/internal/schema/annotations_openapi.yml | 9 +++++++-- .../schema/annotations_openapi_overrides.yml | 3 +++ bundle/schema/jsonschema.json | 9 +++++---- bundle/schema/jsonschema_for_docs.json | 16 +++++++++++----- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index 370e2f8bd8..486fce0c6f 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -16,6 +16,7 @@ ### Dependency updates * Bump `github.com/databricks/databricks-sdk-go` from v0.126.0 to v0.127.0 ([#4984](https://github.com/databricks/cli/pull/4984)). +* Bump `github.com/databricks/databricks-sdk-go` from v0.127.0 to v0.128.0. * Bump Go toolchain to 1.25.9 ([#5004](https://github.com/databricks/cli/pull/5004)) ### API Changes diff --git a/bundle/internal/schema/annotations_openapi.yml b/bundle/internal/schema/annotations_openapi.yml index b4e8863dde..84a4b01b54 100644 --- a/bundle/internal/schema/annotations_openapi.yml +++ b/bundle/internal/schema/annotations_openapi.yml @@ -1133,8 +1133,6 @@ github.com/databricks/cli/bundle/config/resources.VectorSearchEndpoint: "budget_policy_id": "description": |- The budget policy id to be applied - "x-databricks-preview": |- - PRIVATE "endpoint_type": "description": |- Type of endpoint @@ -1145,6 +1143,11 @@ github.com/databricks/cli/bundle/config/resources.VectorSearchEndpoint: "name": "description": |- Name of the vector search endpoint + "usage_policy_id": + "description": |- + The usage policy id to be applied once we've migrated to usage policies + "x-databricks-preview": |- + PRIVATE github.com/databricks/cli/bundle/config/resources.Volume: "catalog_name": "description": |- @@ -6225,6 +6228,8 @@ github.com/databricks/databricks-sdk-go/service/vectorsearch.EndpointType: "description": |- Type of endpoint. "enum": + - |- + STORAGE_OPTIMIZED - |- STANDARD github.com/databricks/databricks-sdk-go/service/workspace.AzureKeyVaultSecretScopeMetadata: diff --git a/bundle/internal/schema/annotations_openapi_overrides.yml b/bundle/internal/schema/annotations_openapi_overrides.yml index cace145e30..690e0c852e 100644 --- a/bundle/internal/schema/annotations_openapi_overrides.yml +++ b/bundle/internal/schema/annotations_openapi_overrides.yml @@ -542,6 +542,9 @@ github.com/databricks/cli/bundle/config/resources.VectorSearchEndpoint: "lifecycle": "description": |- PLACEHOLDER + "permissions": + "description": |- + PLACEHOLDER github.com/databricks/cli/bundle/config/resources.Volume: "_": "markdown_description": |- diff --git a/bundle/schema/jsonschema.json b/bundle/schema/jsonschema.json index 6a8d7c6ee9..03654f1f63 100644 --- a/bundle/schema/jsonschema.json +++ b/bundle/schema/jsonschema.json @@ -1940,9 +1940,7 @@ "type": "object", "properties": { "budget_policy_id": { - "$ref": "#/$defs/string", - "x-databricks-preview": "PRIVATE", - "doNotSuggest": true + "$ref": "#/$defs/string" }, "endpoint_type": { "$ref": "#/$defs/github.com/databricks/databricks-sdk-go/service/vectorsearch.EndpointType" @@ -1960,7 +1958,9 @@ "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission" }, "usage_policy_id": { - "$ref": "#/$defs/string" + "$ref": "#/$defs/string", + "x-databricks-preview": "PRIVATE", + "doNotSuggest": true } }, "additionalProperties": false, @@ -11055,6 +11055,7 @@ "type": "string", "description": "Type of endpoint.", "enum": [ + "STORAGE_OPTIMIZED", "STANDARD" ] }, diff --git a/bundle/schema/jsonschema_for_docs.json b/bundle/schema/jsonschema_for_docs.json index 698fe96bed..3c13ff8c13 100644 --- a/bundle/schema/jsonschema_for_docs.json +++ b/bundle/schema/jsonschema_for_docs.json @@ -901,11 +901,13 @@ "properties": { "prevent_destroy": { "description": "Lifecycle setting to prevent the resource from being destroyed.", - "$ref": "#/$defs/bool" + "$ref": "#/$defs/bool", + "x-since-version": "v0.297.0" }, "started": { "description": "Lifecycle setting to deploy the resource in started mode. Only supported for apps, clusters, and sql_warehouses in direct deployment mode.", - "$ref": "#/$defs/bool" + "$ref": "#/$defs/bool", + "x-since-version": "v0.297.0" } }, "additionalProperties": false @@ -1922,9 +1924,7 @@ "type": "object", "properties": { "budget_policy_id": { - "$ref": "#/$defs/string", - "x-databricks-preview": "PRIVATE", - "doNotSuggest": true + "$ref": "#/$defs/string" }, "endpoint_type": { "$ref": "#/$defs/github.com/databricks/databricks-sdk-go/service/vectorsearch.EndpointType" @@ -1940,6 +1940,11 @@ }, "permissions": { "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission" + }, + "usage_policy_id": { + "$ref": "#/$defs/string", + "x-databricks-preview": "PRIVATE", + "doNotSuggest": true } }, "additionalProperties": false, @@ -9229,6 +9234,7 @@ "type": "string", "description": "Type of endpoint.", "enum": [ + "STORAGE_OPTIMIZED", "STANDARD" ] }, diff --git a/go.mod b/go.mod index a11ce1a599..1f529eec0a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/charmbracelet/bubbletea v1.3.10 // MIT github.com/charmbracelet/huh v1.0.0 // MIT github.com/charmbracelet/lipgloss v1.1.0 // MIT - github.com/databricks/databricks-sdk-go v0.127.0 // Apache-2.0 + github.com/databricks/databricks-sdk-go v0.128.0 // Apache-2.0 github.com/fatih/color v1.19.0 // MIT github.com/google/jsonschema-go v0.4.2 // MIT github.com/google/uuid v1.6.0 // BSD-3-Clause diff --git a/go.sum b/go.sum index e2e59ac4b1..295c498cde 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= -github.com/databricks/databricks-sdk-go v0.127.0 h1:PMM9AVqH+YEMYu55MWg7CWjG/o8esP/4WqskAKxngiQ= -github.com/databricks/databricks-sdk-go v0.127.0/go.mod h1:C5LNgGe6hGuRrTwoxFmuup3XtQQEaqtq0e+K8IFDIS4= +github.com/databricks/databricks-sdk-go v0.128.0 h1:4aGI3KkSZHDkxNIgwQL6dn6q6zZKcgyckidcQZNDGGo= +github.com/databricks/databricks-sdk-go v0.128.0/go.mod h1:C5LNgGe6hGuRrTwoxFmuup3XtQQEaqtq0e+K8IFDIS4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 1afd201e4d459dc405a4816903157c175e49e3e7 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 20 Apr 2026 15:55:54 +0200 Subject: [PATCH 2/4] Update user_agent acceptance goldens: v0.128 drops /Me round-trip databricks-sdk-go v0.128.0 short-circuits CurrentWorkspaceID() when Config.WorkspaceID is already set, removing the /api/2.0/preview/scim/v2/Me call that the golden captured. Regenerate both direct and terraform variants. Co-authored-by: Isaac --- .../user_agent/simple/out.requests.summary.direct.json | 9 --------- .../simple/out.requests.summary.terraform.json | 9 --------- 2 files changed, 18 deletions(-) diff --git a/acceptance/bundle/user_agent/simple/out.requests.summary.direct.json b/acceptance/bundle/user_agent/simple/out.requests.summary.direct.json index c3017391f2..3a3e2db9e9 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.summary.direct.json +++ b/acceptance/bundle/user_agent/simple/out.requests.summary.direct.json @@ -33,15 +33,6 @@ "return_export_info": "true" } } -{ - "headers": { - "User-Agent": [ - "cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" - ] - }, - "method": "GET", - "path": "/api/2.0/preview/scim/v2/Me" -} { "headers": { "User-Agent": [ diff --git a/acceptance/bundle/user_agent/simple/out.requests.summary.terraform.json b/acceptance/bundle/user_agent/simple/out.requests.summary.terraform.json index bf160a9744..3a3e2db9e9 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.summary.terraform.json +++ b/acceptance/bundle/user_agent/simple/out.requests.summary.terraform.json @@ -33,15 +33,6 @@ "return_export_info": "true" } } -{ - "headers": { - "User-Agent": [ - "cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat" - ] - }, - "method": "GET", - "path": "/api/2.0/preview/scim/v2/Me" -} { "headers": { "User-Agent": [ From 65700e7b80462d02ab850ad8de592be328921098 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 20 Apr 2026 16:31:21 +0200 Subject: [PATCH 3/4] Update parent user_agent golden: v0.128 drops /Me round-trip Same SDK behavior change as the previous commit, but missed the parent aggregate output.txt. The two 'OK summary.{direct,terraform} /api/2.0/preview/scim/v2/Me' rows are gone now that CurrentWorkspaceID() short-circuits when Config.WorkspaceID is set. Verified via make test-update: only this file drifts. Co-authored-by: Isaac --- acceptance/bundle/user_agent/output.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/acceptance/bundle/user_agent/output.txt b/acceptance/bundle/user_agent/output.txt index 6d686fed3b..bf12862427 100644 --- a/acceptance/bundle/user_agent/output.txt +++ b/acceptance/bundle/user_agent/output.txt @@ -119,12 +119,10 @@ MISS run.terraform /.well-known/databricks-config 'cli/[DEV_VERSION] databricks- MISS summary.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none auth/pat' MISS summary.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none auth/pat' MISS summary.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none auth/pat' -OK summary.direct /api/2.0/preview/scim/v2/Me engine/direct MISS summary.direct /.well-known/databricks-config 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]' MISS summary.terraform /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none auth/pat' MISS summary.terraform /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none auth/pat' MISS summary.terraform /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_summary cmd-exec-id/[UUID] interactive/none auth/pat' -OK summary.terraform /api/2.0/preview/scim/v2/Me engine/terraform MISS summary.terraform /.well-known/databricks-config 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]' MISS validate.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_validate cmd-exec-id/[UUID] interactive/none auth/pat' MISS validate.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_validate cmd-exec-id/[UUID] interactive/none auth/pat' From 9358ab18a83664954ef53b56f2dccbce8a53d975 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 20 Apr 2026 17:19:04 +0200 Subject: [PATCH 4/4] Consolidate SDK bump entries in NEXT_CHANGELOG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge the v0.126→v0.127 and v0.127→v0.128 entries into a single v0.126→v0.128 line that references both PRs. The pending release will ship both bumps together, so two lines are redundant. Co-authored-by: Isaac --- NEXT_CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index 486fce0c6f..ede82f7779 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -15,8 +15,7 @@ ### Dependency updates -* Bump `github.com/databricks/databricks-sdk-go` from v0.126.0 to v0.127.0 ([#4984](https://github.com/databricks/cli/pull/4984)). -* Bump `github.com/databricks/databricks-sdk-go` from v0.127.0 to v0.128.0. +* Bump `github.com/databricks/databricks-sdk-go` from v0.126.0 to v0.128.0 ([#4984](https://github.com/databricks/cli/pull/4984), [#5031](https://github.com/databricks/cli/pull/5031)). * Bump Go toolchain to 1.25.9 ([#5004](https://github.com/databricks/cli/pull/5004)) ### API Changes