Skip to content
Closed
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 .codegen/_openapi_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a499dda0f7802e37868d3f3076f62639165475d8
0555d6a59265799ed8ea12f355eee662e739430d
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ cmd/workspace/apps-settings/apps-settings.go linguist-generated=true
cmd/workspace/apps/apps.go linguist-generated=true
cmd/workspace/artifact-allowlists/artifact-allowlists.go linguist-generated=true
cmd/workspace/automatic-cluster-update/automatic-cluster-update.go linguist-generated=true
cmd/workspace/bundle/bundle.go linguist-generated=true
cmd/workspace/catalogs/catalogs.go linguist-generated=true
cmd/workspace/clean-room-asset-revisions/clean-room-asset-revisions.go linguist-generated=true
cmd/workspace/clean-room-assets/clean-room-assets.go linguist-generated=true
Expand Down
2 changes: 2 additions & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@
* The error reported when a direct-only resource (catalogs, external locations, vector search endpoints) is used with the terraform engine now also suggests setting `bundle.engine: direct` in `databricks.yml`, in addition to the `DATABRICKS_BUNDLE_ENGINE` environment variable ([#5295](https://github.com/databricks/cli/pull/5295)).

### Dependency updates

* Bump Go toolchain to 1.26.3 ([#5302](https://github.com/databricks/cli/pull/5302)).
* Bump `github.com/databricks/databricks-sdk-go` from v0.132.0 to v0.136.0.
94 changes: 94 additions & 0 deletions acceptance/bundle/refschema/out.fields.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion acceptance/cmd/account/account-help/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Settings
Provisioning
credentials These APIs manage credential configurations for this workspace.
encryption-keys These APIs manage encryption key configurations for this workspace (optional).
endpoints *Beta* These APIs manage endpoint configurations for this account.
endpoints *Public Preview* These APIs manage endpoint configurations for this account.
networks These APIs manage network configurations for customer-managed VPCs (optional).
private-access These APIs manage private access settings for this account.
storage These APIs manage storage configurations for this workspace.
Expand Down
7 changes: 4 additions & 3 deletions acceptance/dbr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/databricks/cli/libs/filer"
"github.com/databricks/databricks-sdk-go"
"github.com/databricks/databricks-sdk-go/service/compute"
"github.com/databricks/databricks-sdk-go/service/iam"
"github.com/databricks/databricks-sdk-go/service/jobs"
"github.com/databricks/databricks-sdk-go/service/workspace"
"github.com/google/uuid"
Expand All @@ -27,7 +28,7 @@ func workspaceTmpDir(ctx context.Context, t *testing.T) string {
w, err := databricks.NewWorkspaceClient()
require.NoError(t, err)

currentUser, err := w.CurrentUser.Me(ctx)
currentUser, err := w.CurrentUser.Me(ctx, iam.MeRequest{})
require.NoError(t, err)

timestamp := time.Now().Format("2006-01-02T15:04:05Z")
Expand Down Expand Up @@ -79,7 +80,7 @@ func setupDbrTestDir(ctx context.Context, t *testing.T, uniqueID string) (*datab
w, err := databricks.NewWorkspaceClient()
require.NoError(t, err)

currentUser, err := w.CurrentUser.Me(ctx)
currentUser, err := w.CurrentUser.Me(ctx, iam.MeRequest{})
require.NoError(t, err)

// API path (without /Workspace prefix) for workspace API calls.
Expand Down Expand Up @@ -180,7 +181,7 @@ func runDbrTests(ctx context.Context, t *testing.T, w *databricks.WorkspaceClien
t.Fatal("CLOUD_ENV is not set. Please run DBR tests from a CI environment with deco env run.")
}

currentUser, err := w.CurrentUser.Me(ctx)
currentUser, err := w.CurrentUser.Me(ctx, iam.MeRequest{})
require.NoError(t, err)

// Create debug logs directory
Expand Down
3 changes: 2 additions & 1 deletion acceptance/help/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Apps
apps Apps run directly on a customer's Databricks instance, integrate with their data, use and extend Databricks services, and enable users to interact through single sign-on.

Vector Search
vector-search-endpoints **Endpoint**: Represents the compute resources to host vector search indexes.
vector-search-endpoints **Endpoint**: Represents the compute resources to host AI Search indexes.
vector-search-indexes **Index**: An efficient representation of your embedding vectors that supports real-time and efficient approximate nearest neighbor (ANN) search queries.

Identity and Access Management
Expand Down Expand Up @@ -92,6 +92,7 @@ Unity Catalog
tables A table resides in the third layer of Unity Catalog’s three-level namespace.
temporary-path-credentials *Public Preview* Temporary Path Credentials refer to short-lived, downscoped credentials used to access external cloud storage locations registered in Databricks.
temporary-table-credentials *Public Preview* Temporary Table Credentials refer to short-lived, downscoped credentials used to access cloud storage locations where table data is stored in Databricks.
temporary-volume-credentials *Public Preview* Temporary Volume Credentials refer to short-lived, downscoped credentials used to access cloud storage locations where volume data is stored in Databricks.
volumes Volumes are a Unity Catalog (UC) capability for accessing, storing, governing, organizing and processing files.
workspace-bindings A securable in Databricks can be configured as __OPEN__ or __ISOLATED__.

Expand Down
2 changes: 1 addition & 1 deletion acceptance/internal/prepare_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func PrepareServerAndClient(t *testing.T, config TestConfig, logRequests bool, o
w, err := databricks.NewWorkspaceClient()
require.NoError(t, err)

user, err := w.CurrentUser.Me(t.Context())
user, err := w.CurrentUser.Me(t.Context(), iam.MeRequest{})
require.NoError(t, err, "Failed to get current user")

cfg := w.Config
Expand Down
2 changes: 1 addition & 1 deletion bundle/config/mutator/populate_current_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (m *populateCurrentUser) Apply(ctx context.Context, b *bundle.Bundle) diag.

fingerprint := b.GetUserFingerprint(ctx)
me, err := cache.GetOrCompute(ctx, b.Cache, fingerprint, func(ctx context.Context) (*iam.User, error) {
return w.CurrentUser.Me(ctx)
return w.CurrentUser.Me(ctx, iam.MeRequest{})
})
if err != nil {
return diag.FromErr(err)
Expand Down
7 changes: 4 additions & 3 deletions bundle/direct/dresources/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@ func (r *ResourceJob) DoRead(ctx context.Context, id string) (*JobRemote, error)
// GetByJobId only fetches the first page (100 tasks). Jobs.Get handles
// pagination and returns the complete job with all tasks merged.
job, err := r.client.Jobs.Get(ctx, jobs.GetJobRequest{
JobId: idInt,
PageToken: "",
ForceSendFields: nil,
JobId: idInt,
PageToken: "",
IncludeTriggerState: false,
ForceSendFields: nil,
})
if err != nil {
return nil, err
Expand Down
4 changes: 3 additions & 1 deletion bundle/direct/dresources/postgres_branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ func (r *ResourcePostgresBranch) DoUpdate(ctx context.Context, id string, config

func (r *ResourcePostgresBranch) DoDelete(ctx context.Context, id string) error {
waiter, err := r.client.Postgres.DeleteBranch(ctx, postgres.DeleteBranchRequest{
Name: id,
Name: id,
Purge: false,
ForceSendFields: nil,
})
if err != nil {
return err
Expand Down
Loading
Loading