Skip to content

Commit 877deb3

Browse files
authored
Merge branch 'main' into feature/prevent-destroy
2 parents 9dc81ce + f09257e commit 877deb3

File tree

35 files changed

+1075
-148
lines changed

35 files changed

+1075
-148
lines changed

.codegen/_openapi_sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6701524136501ef070774942ef5d6e01cfaafb88
1+
b95c2c6e21bec9551ec7d7d51ddf2dfe390b4522

NEXT_CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
### Dependency updates
1212
* Upgrade TF provider to 1.88.0 ([#3529](https://github.com/databricks/cli/pull/3529))
13+
* Upgrade Go SDK to 0.82.0
1314

1415
### Bundles
1516
* Update default-python template to make DB Connect work out of the box for unit tests, using uv to install dependencies ([#3254](https://github.com/databricks/cli/pull/3254))

acceptance/acceptance_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,10 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {
411411
return "Disabled via SkipLocal setting in " + configPath
412412
}
413413

414+
if isTruePtr(config.SkipOnDbr) && WorkspaceTmpDir {
415+
return "Disabled via SkipOnDbr setting in " + configPath
416+
}
417+
414418
if Forcerun {
415419
return ""
416420
}

acceptance/bundle/artifacts/test.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
RecordRequests = true
2+
3+
# Workspace file system does not allow initializing python envs on it.
4+
# I suspect something about the default python env on DBR interferes with it.
5+
# We'll likely need a first class venv abstraction in acceptance tests to fix this.
6+
# script:
7+
# uv venv -q .venv
8+
# source .venv/bin/activate
9+
# uv pip install -q setuptools
10+
# error:
11+
# Failed to inspect Python interpreter from active virtual environment at `.venv/bin/python3`
12+
# Caused by: Failed to query Python interpreter
13+
# Caused by: failed to canonicalize path `/Workspace/abcd/.venv/bin/python3`: Invalid cross-device link (os error 18)
14+
SkipOnDbr = true
15+
216
Ignore = [
317
'.venv',
418
'dist',

acceptance/bundle/integration_whl/test.toml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
Local = false
22
CloudSlow = true
33

4+
# Workspace file system does not allow initializing python envs on it.
5+
# I suspect something about the default python env on DBR interferes with it.
6+
# We'll likely need a first class venv abstraction in acceptance tests to fix this.
7+
# script:
8+
# uv venv -q .venv
9+
# source .venv/bin/activate
10+
# uv pip install -q setuptools
11+
# error:
12+
# Failed to inspect Python interpreter from active virtual environment at `.venv/bin/python3`
13+
# Caused by: Failed to query Python interpreter
14+
# Caused by: failed to canonicalize path `/Workspace/abcd/.venv/bin/python3`: Invalid cross-device link (os error 18)
15+
SkipOnDbr = true
16+
417
Ignore = [
518
".databricks",
619
".venv",

acceptance/cmd/workspace/database/update-database-instance/output.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Usage:
77

88
Flags:
99
--capacity string The sku of the instance.
10+
--enable-pg-native-login Whether the instance has PG native password login enabled.
1011
--enable-readable-secondaries Whether to enable secondaries to serve read-only traffic.
1112
-h, --help help for update-database-instance
1213
--json JSON either inline JSON string or @path/to/file.json with request body (default JSON (0 bytes))

acceptance/help/output.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ Additional Commands:
150150
configure Configure authentication
151151
help Help about any command
152152
labs Manage Databricks Labs installations
153+
tag-policies The Tag Policy API allows you to manage tag policies in Databricks.
153154
version Retrieve information about the current version of this CLI
154155

155156
Flags:

acceptance/internal/config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ type TestConfig struct {
131131
// Null means "databricks.yml"
132132
BundleConfigTarget *string
133133

134+
// If true, skip this test when running on DBR / workspace file system.
135+
SkipOnDbr *bool
136+
134137
// To be added:
135138
// BundleConfigMatrix is to BundleConfig what EnvMatrix is to Env
136139
// It creates different tests for each possible configuration update.

bundle/internal/schema/annotations.yml

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -478,89 +478,6 @@ github.com/databricks/cli/bundle/config/resources.DashboardPermission:
478478
"user_name":
479479
"description": |-
480480
PLACEHOLDER
481-
github.com/databricks/cli/bundle/config/resources.DatabaseCatalog:
482-
"create_database_if_not_exists":
483-
"description": |-
484-
PLACEHOLDER
485-
"database_instance_name":
486-
"description": |-
487-
PLACEHOLDER
488-
"database_name":
489-
"description": |-
490-
PLACEHOLDER
491-
"name":
492-
"description": |-
493-
PLACEHOLDER
494-
"permissions":
495-
"description": |-
496-
PLACEHOLDER
497-
"uid":
498-
"description": |-
499-
PLACEHOLDER
500-
github.com/databricks/cli/bundle/config/resources.DatabaseInstance:
501-
"capacity":
502-
"description": |-
503-
PLACEHOLDER
504-
"child_instance_refs":
505-
"description": |-
506-
PLACEHOLDER
507-
"creation_time":
508-
"description": |-
509-
PLACEHOLDER
510-
"creator":
511-
"description": |-
512-
PLACEHOLDER
513-
"effective_enable_readable_secondaries":
514-
"description": |-
515-
PLACEHOLDER
516-
"effective_node_count":
517-
"description": |-
518-
PLACEHOLDER
519-
"effective_retention_window_in_days":
520-
"description": |-
521-
PLACEHOLDER
522-
"effective_stopped":
523-
"description": |-
524-
PLACEHOLDER
525-
"enable_readable_secondaries":
526-
"description": |-
527-
PLACEHOLDER
528-
"name":
529-
"description": |-
530-
PLACEHOLDER
531-
"node_count":
532-
"description": |-
533-
PLACEHOLDER
534-
"parent_instance_ref":
535-
"description": |-
536-
PLACEHOLDER
537-
"permissions":
538-
"description": |-
539-
PLACEHOLDER
540-
"pg_version":
541-
"description": |-
542-
PLACEHOLDER
543-
"purge_on_delete":
544-
"description": |-
545-
PLACEHOLDER
546-
"read_only_dns":
547-
"description": |-
548-
PLACEHOLDER
549-
"read_write_dns":
550-
"description": |-
551-
PLACEHOLDER
552-
"retention_window_in_days":
553-
"description": |-
554-
PLACEHOLDER
555-
"state":
556-
"description": |-
557-
PLACEHOLDER
558-
"stopped":
559-
"description": |-
560-
PLACEHOLDER
561-
"uid":
562-
"description": |-
563-
PLACEHOLDER
564481
github.com/databricks/cli/bundle/config/resources.DatabaseInstancePermission:
565482
"group_name":
566483
"description": |-

0 commit comments

Comments
 (0)