Skip to content

Commit 6eb8f6f

Browse files
alyssa-dbalyssa-db
authored
Merge branch 'main' into cluster-id-config-1897
2 parents 102b1c2 + 55b7e88 commit 6eb8f6f

131 files changed

Lines changed: 2675 additions & 2118 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.codegen/_openapi_sha‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2cee201b2e8d656f7306b2f9ec98edfa721e9829
1+
a8f547d3728fba835fbdda301e846829c5cbbef5

‎.codegen/service.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func new{{.PascalName}}() *cobra.Command {
412412
{{- if $optionalIfJsonIsUsed }}
413413
if !cmd.Flags().Changed("json") {
414414
{{- end }}
415-
{{if and (not $field.Entity.IsString) (not $field.Entity.IsFieldMask) (not $field.Entity.IsTimestamp) (not $field.Entity.IsDuration) -}} {{/* TODO: add support for well known types */}}
415+
{{if and (not $field.Entity.IsString) (not $field.Entity.IsFieldMask) (not $field.Entity.IsTimestamp) (not $field.Entity.IsDuration) -}} {{/* TODO: add support for well known types */ -}}
416416
_, err = fmt.Sscan(args[{{$arg}}], &{{- template "request-body-obj" (dict "Method" $method "Field" $field)}})
417417
if err != nil {
418418
return fmt.Errorf("invalid {{$field.ConstantName}}: %s", args[{{$arg}}])

‎.gitattributes‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ cmd/workspace/consumer-providers/consumer-providers.go linguist-generated=true
6363
cmd/workspace/credentials-manager/credentials-manager.go linguist-generated=true
6464
cmd/workspace/credentials/credentials.go linguist-generated=true
6565
cmd/workspace/current-user/current-user.go linguist-generated=true
66+
cmd/workspace/custom-llms/custom-llms.go linguist-generated=true
67+
cmd/workspace/dashboard-email-subscriptions/dashboard-email-subscriptions.go linguist-generated=true
6668
cmd/workspace/dashboard-widgets/dashboard-widgets.go linguist-generated=true
6769
cmd/workspace/dashboards/dashboards.go linguist-generated=true
6870
cmd/workspace/data-sources/data-sources.go linguist-generated=true
69-
cmd/workspace/database-instances/database-instances.go linguist-generated=true
71+
cmd/workspace/database/database.go linguist-generated=true
7072
cmd/workspace/default-namespace/default-namespace.go linguist-generated=true
7173
cmd/workspace/disable-legacy-access/disable-legacy-access.go linguist-generated=true
7274
cmd/workspace/disable-legacy-dbfs/disable-legacy-dbfs.go linguist-generated=true
@@ -110,10 +112,10 @@ cmd/workspace/provider-personalization-requests/provider-personalization-request
110112
cmd/workspace/provider-provider-analytics-dashboards/provider-provider-analytics-dashboards.go linguist-generated=true
111113
cmd/workspace/provider-providers/provider-providers.go linguist-generated=true
112114
cmd/workspace/providers/providers.go linguist-generated=true
115+
cmd/workspace/quality-monitor-v2/quality-monitor-v2.go linguist-generated=true
113116
cmd/workspace/quality-monitors/quality-monitors.go linguist-generated=true
114117
cmd/workspace/queries-legacy/queries-legacy.go linguist-generated=true
115118
cmd/workspace/queries/queries.go linguist-generated=true
116-
cmd/workspace/query-execution/query-execution.go linguist-generated=true
117119
cmd/workspace/query-history/query-history.go linguist-generated=true
118120
cmd/workspace/query-visualizations-legacy/query-visualizations-legacy.go linguist-generated=true
119121
cmd/workspace/query-visualizations/query-visualizations.go linguist-generated=true
@@ -131,6 +133,7 @@ cmd/workspace/service-principals/service-principals.go linguist-generated=true
131133
cmd/workspace/serving-endpoints/serving-endpoints.go linguist-generated=true
132134
cmd/workspace/settings/settings.go linguist-generated=true
133135
cmd/workspace/shares/shares.go linguist-generated=true
136+
cmd/workspace/sql-results-download/sql-results-download.go linguist-generated=true
134137
cmd/workspace/storage-credentials/storage-credentials.go linguist-generated=true
135138
cmd/workspace/system-schemas/system-schemas.go linguist-generated=true
136139
cmd/workspace/table-constraints/table-constraints.go linguist-generated=true

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ __pycache__
2929

3030
# Test results from 'make test'
3131
test-output.json
32+
33+
# Built by make for 'make fmt' and yamlcheck.py in acceptance tests
34+
tools/yamlfmt
35+
tools/yamlfmt.exe

‎NEXT_CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
* Fix reading dashboard contents when the sync root is different than the bundle root ([#3006](https://github.com/databricks/cli/pull/3006))
1414
* When glob for wheels is used, like "\*.whl", it will filter out different version of the same package and will only take the most recent version. ([#2982](https://github.com/databricks/cli/pull/2982))
1515
* When building Python artifacts as part of "bundle deploy" we no longer delete `dist`, `build`, `*egg-info` and `__pycache__` directories. ([#2982](https://github.com/databricks/cli/pull/2982))
16+
* Fix variable resolution for lookup variables with other references ([#3054](https://github.com/databricks/cli/pull/3054))
1617

1718
### API Changes

‎acceptance/bundle/debug/out.stderr.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
10:07:59 Debug: Apply pid=12345 mutator=ProcessStaticResources
4545
10:07:59 Debug: Apply pid=12345 mutator=ProcessStaticResources mutator=ResolveVariableReferences(resources)
4646
10:07:59 Debug: Apply pid=12345 mutator=ProcessStaticResources mutator=NormalizePaths
47-
10:07:59 Debug: Apply pid=12345 mutator=ProcessStaticResources mutator=TranslatePaths
47+
10:07:59 Debug: Apply pid=12345 mutator=ProcessStaticResources mutator=TranslatePathsDashboards
4848
10:07:59 Debug: Apply pid=12345 mutator=PythonMutator(load)
4949
10:07:59 Debug: Apply pid=12345 mutator=PythonMutator(init)
5050
10:07:59 Debug: Apply pid=12345 mutator=PythonMutator(load_resources)

‎acceptance/bundle/deploy/dashboard/nested-folders/output.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ Deployment complete!
1010
"lifecycle_state": "ACTIVE",
1111
"parent_path": "/Users/[USERNAME]",
1212
"path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json",
13-
"serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}"
13+
"serialized_dashboard": {
14+
"pages": [
15+
{
16+
"name": "02724bf2",
17+
"displayName": "Dashboard test bundle-deploy-dashboard",
18+
"pageType": "PAGE_TYPE_CANVAS"
19+
}
20+
]
21+
}
1422
}
1523

1624
>>> [CLI] bundle destroy --auto-approve

‎acceptance/bundle/deploy/dashboard/nested-folders/script‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard $(uuid)"
22
if [ -z "$CLOUD_ENV" ]; then
3-
DASHBOARD_DISPLAY_NAME="test bundle/deploy/ 6260d50f-e8ff-4905-8f28-812345678903" # use hard-coded uuid when running locally
43
export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234"
54
fi
65

@@ -15,4 +14,4 @@ trap cleanup EXIT
1514

1615
trace $CLI bundle deploy
1716
DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id')
18-
trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard}'
17+
trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard: (.serialized_dashboard | fromjson | {pages: (.pages | map({name, displayName, pageType}))})}'

‎acceptance/bundle/deploy/dashboard/nested-folders/test.toml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,3 @@ New = "[DASHBOARD_ID]"
1616
# Windows:
1717
Old = 'The system cannot find the file specified.'
1818
New = 'no such file or directory'
19-
20-
[[Server]]
21-
Pattern = "POST /api/2.0/lakeview/dashboards"
22-
Response.Body = '''
23-
{
24-
"dashboard_id":"1234567890abcdef1234567890abcdef"
25-
}
26-
'''
27-
28-
[[Server]]
29-
Pattern = "POST /api/2.0/lakeview/dashboards/{dashboard_id}/published"
30-
31-
[[Server]]
32-
Pattern = "GET /api/2.0/lakeview/dashboards/{dashboard_id}"
33-
Response.Body = '''
34-
{
35-
"dashboard_id":"1234567890abcdef1234567890abcdef",
36-
"display_name": "test dashboard 6260d50f-e8ff-4905-8f28-812345678903",
37-
"lifecycle_state": "ACTIVE",
38-
"path": "/Users/[USERNAME]/test bundle-deploy-dashboard 6260d50f-e8ff-4905-8f28-812345678903.lvdash.json",
39-
"parent_path": "/Users/tester@databricks.com",
40-
"serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}"
41-
}
42-
'''

‎acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/output.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ Deployment complete!
1010
"lifecycle_state": "ACTIVE",
1111
"parent_path": "/Users/[USERNAME]",
1212
"path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json",
13-
"serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}"
13+
"serialized_dashboard": {
14+
"pages": [
15+
{
16+
"name": "02724bf2",
17+
"displayName": "Dashboard test bundle-deploy-dashboard",
18+
"pageType": "PAGE_TYPE_CANVAS"
19+
}
20+
]
21+
}
1422
}
1523

1624
>>> [CLI] bundle destroy --auto-approve

0 commit comments

Comments
 (0)