Skip to content

Commit c465f89

Browse files
respond to feedback + failing tests
1 parent c1d4050 commit c465f89

File tree

5 files changed

+17
-0
lines changed

5 files changed

+17
-0
lines changed

acceptance/bundle/resources/dashboards/dataset-catalog-schema/test.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Cloud = true
33
RequiresWarehouse = true
44
RecordRequests = true
55

6+
# TODO: test terraform once commit had been released (https://github.com/databricks/terraform-provider-databricks/pull/5259)
67
[EnvMatrix]
78
DATABRICKS_BUNDLE_ENGINE = ["direct"]
89

bundle/config/resources/dashboard.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ type DashboardConfig struct {
5959

6060
// DatasetCatalog sets the default catalog for all datasets in this dashboard.
6161
// When set, this overrides the catalog specified in individual dataset definitions.
62+
// These are request only parameters and not returned by the GET API.
6263
DatasetCatalog string `json:"dataset_catalog,omitempty"`
6364

6465
// DatasetSchema sets the default schema for all datasets in this dashboard.
6566
// When set, this overrides the schema specified in individual dataset definitions.
67+
// These are request only parameters and not returned by the GET API.
6668
DatasetSchema string `json:"dataset_schema,omitempty"`
6769
}
6870

bundle/direct/dresources/dashboard.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ func (r *ResourceDashboard) DoRead(ctx context.Context, id string) (*resources.D
123123
WarehouseId: dashboard.WarehouseId,
124124
SerializedDashboard: dashboard.SerializedDashboard,
125125
ParentPath: ensureWorkspacePrefix(dashboard.ParentPath),
126+
// diffs are detected via etags, which will change if dataset_catalog/dataset_schema is updated.
126127
DatasetCatalog: "",
127128
DatasetSchema: "",
128129

bundle/internal/schema/annotations.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,13 @@ github.com/databricks/cli/bundle/config/resources.ClusterPermission:
527527
"user_name":
528528
"description": |-
529529
PLACEHOLDER
530+
github.com/databricks/cli/bundle/config/resources.Dashboard:
531+
"dataset_catalog":
532+
"description": |-
533+
Sets the default catalog for all datasets in this dashboard. When set, this overrides the catalog specified in individual dataset definitions.
534+
"dataset_schema":
535+
"description": |-
536+
Sets the default schema for all datasets in this dashboard. When set, this overrides the schema specified in individual dataset definitions.
530537
github.com/databricks/cli/bundle/config/resources.DashboardPermission:
531538
"group_name":
532539
"description": |-

bundle/schema/jsonschema.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)