Skip to content

Commit 0d6be43

Browse files
tanmay-dbtanmay-db
authored
[Internal] Generate terraform to latest OpenAPI spec (#4907)
## Changes <!-- Summary of your changes that are easy to understand --> - Generate terraform to use latest OpenAPI spec - Bump Go SDK from 0.75.0 to [0.79.0](https://github.com/databricks/databricks-sdk-go/releases/tag/v0.79.0) (latest) Since the last release happened 3 weeks ago and Go SDK used was 4 versions older, generation had a lot of issues: - Fixed Quality Monitor resource implementation in SDKV2 - Fixed Quality Monitor resource implementation in plugin framework - Remove output_schema_name from schema customizations in Quality Monitor since it's already set. - Fixed Quality Monitor resource tests - Fixed Private Access Settings resource to use updated structs - Fixed Share Resource syncing effective fields - Fixed Budget Resource tests ## Tests <!-- How is this tested? Please see the checklist below and also describe any other relevant tests --> Existing tests
1 parent a4c9acc commit 0d6be43

File tree

115 files changed

+38763
-11616
lines changed

Some content is hidden

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

115 files changed

+38763
-11616
lines changed

‎.codegen/_openapi_sha‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
90fefb5618fdecf7dfdf6be7d56c2213d24ad944
1+
ff038204ea0f04d1ee43bc4a0221cb6c0a9be5d8

‎.gitattributes‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ docs/data-sources/alert_v2.md linguist-generated=true
1313
docs/data-sources/alerts_v2.md linguist-generated=true
1414
docs/data-sources/budget_policies.md linguist-generated=true
1515
docs/data-sources/budget_policy.md linguist-generated=true
16+
docs/data-sources/clean_room_asset.md linguist-generated=true
17+
docs/data-sources/clean_room_asset_revisions_clean_room_asset.md linguist-generated=true
18+
docs/data-sources/clean_room_asset_revisions_clean_room_assets.md linguist-generated=true
19+
docs/data-sources/clean_room_assets.md linguist-generated=true
20+
docs/data-sources/clean_room_auto_approval_rule.md linguist-generated=true
21+
docs/data-sources/clean_room_auto_approval_rules.md linguist-generated=true
1622
docs/data-sources/clean_rooms_clean_room.md linguist-generated=true
1723
docs/data-sources/clean_rooms_clean_rooms.md linguist-generated=true
1824
docs/data-sources/database_instance.md linguist-generated=true
@@ -31,6 +37,8 @@ docs/data-sources/workspace_network_option.md linguist-generated=true
3137
docs/resources/account_network_policy.md linguist-generated=true
3238
docs/resources/alert_v2.md linguist-generated=true
3339
docs/resources/budget_policy.md linguist-generated=true
40+
docs/resources/clean_room_asset.md linguist-generated=true
41+
docs/resources/clean_room_auto_approval_rule.md linguist-generated=true
3442
docs/resources/clean_rooms_clean_room.md linguist-generated=true
3543
docs/resources/database_instance.md linguist-generated=true
3644
docs/resources/external_metadata.md linguist-generated=true
@@ -59,6 +67,14 @@ internal/providers/pluginfw/products/alert_v2/resource_alert_v2.go linguist-gene
5967
internal/providers/pluginfw/products/budget_policy/data_budget_policies.go linguist-generated=true
6068
internal/providers/pluginfw/products/budget_policy/data_budget_policy.go linguist-generated=true
6169
internal/providers/pluginfw/products/budget_policy/resource_budget_policy.go linguist-generated=true
70+
internal/providers/pluginfw/products/clean_room_asset/data_clean_room_asset.go linguist-generated=true
71+
internal/providers/pluginfw/products/clean_room_asset/data_clean_room_assets.go linguist-generated=true
72+
internal/providers/pluginfw/products/clean_room_asset/resource_clean_room_asset.go linguist-generated=true
73+
internal/providers/pluginfw/products/clean_room_asset_revisions_clean_room_asset/data_clean_room_asset_revisions_clean_room_asset.go linguist-generated=true
74+
internal/providers/pluginfw/products/clean_room_asset_revisions_clean_room_asset/data_clean_room_asset_revisions_clean_room_assets.go linguist-generated=true
75+
internal/providers/pluginfw/products/clean_room_auto_approval_rule/data_clean_room_auto_approval_rule.go linguist-generated=true
76+
internal/providers/pluginfw/products/clean_room_auto_approval_rule/data_clean_room_auto_approval_rules.go linguist-generated=true
77+
internal/providers/pluginfw/products/clean_room_auto_approval_rule/resource_clean_room_auto_approval_rule.go linguist-generated=true
6278
internal/providers/pluginfw/products/clean_rooms_clean_room/data_clean_rooms_clean_room.go linguist-generated=true
6379
internal/providers/pluginfw/products/clean_rooms_clean_room/data_clean_rooms_clean_rooms.go linguist-generated=true
6480
internal/providers/pluginfw/products/clean_rooms_clean_room/resource_clean_rooms_clean_room.go linguist-generated=true
@@ -101,8 +117,8 @@ internal/providers/pluginfw/tfschema/single_nested_attribute.go linguist-generat
101117
internal/providers/pluginfw/tfschema/single_nested_block.go linguist-generated=true
102118
internal/providers/pluginfw/tfschema/string_attribute.go linguist-generated=true
103119
internal/providers/pluginfw/tfschema/struct_to_schema.go linguist-generated=true
104-
internal/service/aibuilder_tf/legacy_model.go linguist-generated=true
105-
internal/service/aibuilder_tf/model.go linguist-generated=true
120+
internal/service/agentbricks_tf/legacy_model.go linguist-generated=true
121+
internal/service/agentbricks_tf/model.go linguist-generated=true
106122
internal/service/apps_tf/legacy_model.go linguist-generated=true
107123
internal/service/apps_tf/model.go linguist-generated=true
108124
internal/service/billing_tf/legacy_model.go linguist-generated=true

‎NEXT_CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Added output attribute `endpoint_url` in `databricks_model_serving` ([#4877](https://github.com/databricks/terraform-provider-databricks/pull/4877)).
1414
* Deprecate `egg` library type in `databricks_cluster`, `databricks_job`, and `databricks_library` ([#4881](https://github.com/databricks/terraform-provider-databricks/pull/4881)).
1515
* Support `databricks_service_principal_secret` on workspace level ([#4896](https://github.com/databricks/terraform-provider-databricks/pull/4896)).
16+
* Added resources and data sources for `databricks_clean_room_asset`, `databricks_clean_room_auto_approval_rule` and `databricks_clean_room_asset_revisions_clean_room_asset` ([#4907](https://github.com/databricks/terraform-provider-databricks/pull/4907)).
17+
1618

1719
### Bug Fixes
1820

@@ -45,3 +47,4 @@
4547
### Internal Changes
4648

4749
* Promote Plugin Framework Share Resource to Production ([#4846](https://github.com/databricks/terraform-provider-databricks/pull/4846)).
50+
* Update Go SDK to v0.79.0 ([#4907](https://github.com/databricks/terraform-provider-databricks/pull/4907)).

‎catalog/resource_quality_monitor.go‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ const qualityMonitorDefaultProvisionTimeout = 15 * time.Minute
1616

1717
func WaitForMonitor(w *databricks.WorkspaceClient, ctx context.Context, monitorName string) error {
1818
return retry.RetryContext(ctx, qualityMonitorDefaultProvisionTimeout, func() *retry.RetryError {
19-
endpoint, err := w.QualityMonitors.GetByTableName(ctx, monitorName)
19+
endpoint, err := w.QualityMonitors.Get(ctx, catalog.GetQualityMonitorRequest{
20+
TableName: monitorName,
21+
})
2022
if err != nil {
2123
return retry.NonRetryableError(err)
2224
}
@@ -85,7 +87,9 @@ func ResourceQualityMonitor() common.Resource {
8587
if err != nil {
8688
return err
8789
}
88-
endpoint, err := w.QualityMonitors.GetByTableName(ctx, d.Id())
90+
endpoint, err := w.QualityMonitors.Get(ctx, catalog.GetQualityMonitorRequest{
91+
TableName: d.Id(),
92+
})
8993
if err != nil {
9094
return err
9195

@@ -125,7 +129,10 @@ func ResourceQualityMonitor() common.Resource {
125129
if err != nil {
126130
return err
127131
}
128-
return w.QualityMonitors.DeleteByTableName(ctx, d.Id())
132+
_, err = w.QualityMonitors.Delete(ctx, catalog.DeleteQualityMonitorRequest{
133+
TableName: d.Id(),
134+
})
135+
return err
129136
},
130137
Schema: monitorSchema,
131138
Timeouts: &schema.ResourceTimeout{

‎catalog/resource_quality_monitor_test.go‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ func TestQualityMonitorCreateTimeseries(t *testing.T) {
3434
Status: catalog.MonitorInfoStatusMonitorStatusPending,
3535
DriftMetricsTableName: "test_table_drift",
3636
}, nil)
37-
e.GetByTableName(mock.Anything, "test_table").Return(&catalog.MonitorInfo{
37+
e.Get(mock.Anything, catalog.GetQualityMonitorRequest{
38+
TableName: "test_table",
39+
}).Return(&catalog.MonitorInfo{
3840
TableName: "test_table",
3941
Status: catalog.MonitorInfoStatusMonitorStatusActive,
4042
AssetsDir: "sample.dir",
@@ -82,7 +84,9 @@ func TestQualityMonitorCreateInference(t *testing.T) {
8284
TableName: "test_table",
8385
Status: catalog.MonitorInfoStatusMonitorStatusActive,
8486
}, nil)
85-
e.GetByTableName(mock.Anything, "test_table").Return(&catalog.MonitorInfo{
87+
e.Get(mock.Anything, catalog.GetQualityMonitorRequest{
88+
TableName: "test_table",
89+
}).Return(&catalog.MonitorInfo{
8690
TableName: "test_table",
8791
Status: catalog.MonitorInfoStatusMonitorStatusActive,
8892
AssetsDir: "sample.dir",
@@ -128,7 +132,9 @@ func TestQualityMonitorCreateSnapshot(t *testing.T) {
128132
TableName: "test_table",
129133
Status: catalog.MonitorInfoStatusMonitorStatusActive,
130134
}, nil)
131-
e.GetByTableName(mock.Anything, "test_table").Return(&catalog.MonitorInfo{
135+
e.Get(mock.Anything, catalog.GetQualityMonitorRequest{
136+
TableName: "test_table",
137+
}).Return(&catalog.MonitorInfo{
132138
TableName: "test_table",
133139
Status: catalog.MonitorInfoStatusMonitorStatusActive,
134140
AssetsDir: "sample.dir",
@@ -151,7 +157,9 @@ func TestQualityMonitorGet(t *testing.T) {
151157
qa.ResourceFixture{
152158
MockWorkspaceClientFunc: func(w *mocks.MockWorkspaceClient) {
153159
e := w.GetMockQualityMonitorsAPI().EXPECT()
154-
e.GetByTableName(mock.Anything, "test_table").Return(&catalog.MonitorInfo{
160+
e.Get(mock.Anything, catalog.GetQualityMonitorRequest{
161+
TableName: "test_table",
162+
}).Return(&catalog.MonitorInfo{
155163
TableName: "test_table",
156164
Status: catalog.MonitorInfoStatusMonitorStatusActive,
157165
AssetsDir: "new_assets.dir",
@@ -197,7 +205,9 @@ func TestQualityMonitorUpdate(t *testing.T) {
197205
},
198206
DriftMetricsTableName: "test_table_drift",
199207
}, nil)
200-
e.GetByTableName(mock.Anything, "test_table").Return(&catalog.MonitorInfo{
208+
e.Get(mock.Anything, catalog.GetQualityMonitorRequest{
209+
TableName: "test_table",
210+
}).Return(&catalog.MonitorInfo{
201211
TableName: "test_table",
202212
Status: catalog.MonitorInfoStatusMonitorStatusActive,
203213
AssetsDir: "new_assets.dir",
@@ -236,7 +246,9 @@ func TestQualityMonitorDelete(t *testing.T) {
236246
qa.ResourceFixture{
237247
MockWorkspaceClientFunc: func(w *mocks.MockWorkspaceClient) {
238248
e := w.GetMockQualityMonitorsAPI().EXPECT()
239-
e.DeleteByTableName(mock.Anything, "test_table").Return(nil)
249+
e.Delete(mock.Anything, catalog.DeleteQualityMonitorRequest{
250+
TableName: "test_table",
251+
}).Return(nil, nil)
240252
},
241253
Resource: ResourceQualityMonitor(),
242254
Delete: true,

‎docs/data-sources/account_network_policies.md‎

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

‎docs/data-sources/account_network_policy.md‎

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

‎docs/data-sources/alert_v2.md‎

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

‎docs/data-sources/alerts_v2.md‎

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

0 commit comments

Comments
 (0)