Skip to content

Commit 7a20cea

Browse files
andrewnesterandrewnester
authored
Upgrade TF provider to 1.85.0 (#3259)
## Changes Upgrade TF provider to 1.85.0 Important changes: * Added support for `database` resource for Apps * Includes a change needed for enabling `allow_policy_default_values` fix #3255 ## Tests Existing tests pass <!-- If your PR needs to be included in the release notes for next release, add a separate entry in NEXT_CHANGELOG.md as part of your PR. -->
1 parent 0629ca9 commit 7a20cea

34 files changed

Lines changed: 682 additions & 138 deletions

‎acceptance/terraform/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
databricks = {
44
source = "databricks/databricks"
5-
version = "1.84.0"
5+
version = "1.85.0"
66
}
77
}
88

‎acceptance/terraform/output.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
Initializing the backend...
55

66
Initializing provider plugins...
7-
- Finding databricks/databricks versions matching "1.84.0"...
8-
- Installing databricks/databricks v1.84.0...
9-
- Installed databricks/databricks v1.84.0 (unauthenticated)
7+
- Finding databricks/databricks versions matching "1.85.0"...
8+
- Installing databricks/databricks v1.85.0...
9+
- Installed databricks/databricks v1.85.0 (unauthenticated)
1010

1111
Terraform has created a lock file .terraform.lock.hcl to record the provider
1212
selections it made above. Include this file in your version control repository

‎bundle/internal/tf/codegen/schema/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package schema
22

3-
const ProviderVersion = "1.84.0"
3+
const ProviderVersion = "1.85.0"

‎bundle/internal/tf/schema/data_source_app.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ type DataSourceAppAppPendingDeployment struct {
5252
UpdateTime string `json:"update_time,omitempty"`
5353
}
5454

55+
type DataSourceAppAppResourcesDatabase struct {
56+
DatabaseName string `json:"database_name"`
57+
InstanceName string `json:"instance_name"`
58+
Permission string `json:"permission"`
59+
}
60+
5561
type DataSourceAppAppResourcesJob struct {
5662
Id string `json:"id"`
5763
Permission string `json:"permission"`
@@ -80,6 +86,7 @@ type DataSourceAppAppResourcesUcSecurable struct {
8086
}
8187

8288
type DataSourceAppAppResources struct {
89+
Database *DataSourceAppAppResourcesDatabase `json:"database,omitempty"`
8390
Description string `json:"description,omitempty"`
8491
Job *DataSourceAppAppResourcesJob `json:"job,omitempty"`
8592
Name string `json:"name"`

‎bundle/internal/tf/schema/data_source_apps.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ type DataSourceAppsAppPendingDeployment struct {
5252
UpdateTime string `json:"update_time,omitempty"`
5353
}
5454

55+
type DataSourceAppsAppResourcesDatabase struct {
56+
DatabaseName string `json:"database_name"`
57+
InstanceName string `json:"instance_name"`
58+
Permission string `json:"permission"`
59+
}
60+
5561
type DataSourceAppsAppResourcesJob struct {
5662
Id string `json:"id"`
5763
Permission string `json:"permission"`
@@ -80,6 +86,7 @@ type DataSourceAppsAppResourcesUcSecurable struct {
8086
}
8187

8288
type DataSourceAppsAppResources struct {
89+
Database *DataSourceAppsAppResourcesDatabase `json:"database,omitempty"`
8390
Description string `json:"description,omitempty"`
8491
Job *DataSourceAppsAppResourcesJob `json:"job,omitempty"`
8592
Name string `json:"name"`

‎bundle/internal/tf/schema/data_source_clean_rooms_clean_room.go‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
2+
3+
package schema
4+
5+
type DataSourceCleanRoomsCleanRoomOutputCatalog struct {
6+
CatalogName string `json:"catalog_name,omitempty"`
7+
Status string `json:"status,omitempty"`
8+
}
9+
10+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoCollaborators struct {
11+
CollaboratorAlias string `json:"collaborator_alias"`
12+
DisplayName string `json:"display_name,omitempty"`
13+
GlobalMetastoreId string `json:"global_metastore_id,omitempty"`
14+
InviteRecipientEmail string `json:"invite_recipient_email,omitempty"`
15+
InviteRecipientWorkspaceId int `json:"invite_recipient_workspace_id,omitempty"`
16+
OrganizationName string `json:"organization_name,omitempty"`
17+
}
18+
19+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoComplianceSecurityProfile struct {
20+
ComplianceStandards []string `json:"compliance_standards,omitempty"`
21+
IsEnabled bool `json:"is_enabled,omitempty"`
22+
}
23+
24+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoCreator struct {
25+
CollaboratorAlias string `json:"collaborator_alias"`
26+
DisplayName string `json:"display_name,omitempty"`
27+
GlobalMetastoreId string `json:"global_metastore_id,omitempty"`
28+
InviteRecipientEmail string `json:"invite_recipient_email,omitempty"`
29+
InviteRecipientWorkspaceId int `json:"invite_recipient_workspace_id,omitempty"`
30+
OrganizationName string `json:"organization_name,omitempty"`
31+
}
32+
33+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedInternetDestinations struct {
34+
Destination string `json:"destination,omitempty"`
35+
Protocol string `json:"protocol,omitempty"`
36+
Type string `json:"type,omitempty"`
37+
}
38+
39+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedStorageDestinations struct {
40+
AllowedPaths []string `json:"allowed_paths,omitempty"`
41+
AzureContainer string `json:"azure_container,omitempty"`
42+
AzureDnsZone string `json:"azure_dns_zone,omitempty"`
43+
AzureStorageAccount string `json:"azure_storage_account,omitempty"`
44+
AzureStorageService string `json:"azure_storage_service,omitempty"`
45+
BucketName string `json:"bucket_name,omitempty"`
46+
Region string `json:"region,omitempty"`
47+
Type string `json:"type,omitempty"`
48+
}
49+
50+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccessLogOnlyMode struct {
51+
LogOnlyModeType string `json:"log_only_mode_type,omitempty"`
52+
Workloads []string `json:"workloads,omitempty"`
53+
}
54+
55+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccess struct {
56+
AllowedInternetDestinations []DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedInternetDestinations `json:"allowed_internet_destinations,omitempty"`
57+
AllowedStorageDestinations []DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedStorageDestinations `json:"allowed_storage_destinations,omitempty"`
58+
LogOnlyMode *DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccessLogOnlyMode `json:"log_only_mode,omitempty"`
59+
RestrictionMode string `json:"restriction_mode,omitempty"`
60+
}
61+
62+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicy struct {
63+
InternetAccess *DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicyInternetAccess `json:"internet_access,omitempty"`
64+
}
65+
66+
type DataSourceCleanRoomsCleanRoomRemoteDetailedInfo struct {
67+
CentralCleanRoomId string `json:"central_clean_room_id,omitempty"`
68+
CloudVendor string `json:"cloud_vendor,omitempty"`
69+
Collaborators []DataSourceCleanRoomsCleanRoomRemoteDetailedInfoCollaborators `json:"collaborators,omitempty"`
70+
ComplianceSecurityProfile *DataSourceCleanRoomsCleanRoomRemoteDetailedInfoComplianceSecurityProfile `json:"compliance_security_profile,omitempty"`
71+
Creator *DataSourceCleanRoomsCleanRoomRemoteDetailedInfoCreator `json:"creator,omitempty"`
72+
EgressNetworkPolicy *DataSourceCleanRoomsCleanRoomRemoteDetailedInfoEgressNetworkPolicy `json:"egress_network_policy,omitempty"`
73+
Region string `json:"region,omitempty"`
74+
}
75+
76+
type DataSourceCleanRoomsCleanRoom struct {
77+
AccessRestricted string `json:"access_restricted,omitempty"`
78+
Comment string `json:"comment,omitempty"`
79+
CreatedAt int `json:"created_at,omitempty"`
80+
LocalCollaboratorAlias string `json:"local_collaborator_alias,omitempty"`
81+
Name string `json:"name,omitempty"`
82+
OutputCatalog *DataSourceCleanRoomsCleanRoomOutputCatalog `json:"output_catalog,omitempty"`
83+
Owner string `json:"owner,omitempty"`
84+
RemoteDetailedInfo *DataSourceCleanRoomsCleanRoomRemoteDetailedInfo `json:"remote_detailed_info,omitempty"`
85+
Status string `json:"status,omitempty"`
86+
UpdatedAt int `json:"updated_at,omitempty"`
87+
}

‎bundle/internal/tf/schema/data_source_clean_rooms_clean_rooms.go‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
2+
3+
package schema
4+
5+
type DataSourceCleanRoomsCleanRoomsCleanRoomsOutputCatalog struct {
6+
CatalogName string `json:"catalog_name,omitempty"`
7+
Status string `json:"status,omitempty"`
8+
}
9+
10+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoCollaborators struct {
11+
CollaboratorAlias string `json:"collaborator_alias"`
12+
DisplayName string `json:"display_name,omitempty"`
13+
GlobalMetastoreId string `json:"global_metastore_id,omitempty"`
14+
InviteRecipientEmail string `json:"invite_recipient_email,omitempty"`
15+
InviteRecipientWorkspaceId int `json:"invite_recipient_workspace_id,omitempty"`
16+
OrganizationName string `json:"organization_name,omitempty"`
17+
}
18+
19+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoComplianceSecurityProfile struct {
20+
ComplianceStandards []string `json:"compliance_standards,omitempty"`
21+
IsEnabled bool `json:"is_enabled,omitempty"`
22+
}
23+
24+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoCreator struct {
25+
CollaboratorAlias string `json:"collaborator_alias"`
26+
DisplayName string `json:"display_name,omitempty"`
27+
GlobalMetastoreId string `json:"global_metastore_id,omitempty"`
28+
InviteRecipientEmail string `json:"invite_recipient_email,omitempty"`
29+
InviteRecipientWorkspaceId int `json:"invite_recipient_workspace_id,omitempty"`
30+
OrganizationName string `json:"organization_name,omitempty"`
31+
}
32+
33+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedInternetDestinations struct {
34+
Destination string `json:"destination,omitempty"`
35+
Protocol string `json:"protocol,omitempty"`
36+
Type string `json:"type,omitempty"`
37+
}
38+
39+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedStorageDestinations struct {
40+
AllowedPaths []string `json:"allowed_paths,omitempty"`
41+
AzureContainer string `json:"azure_container,omitempty"`
42+
AzureDnsZone string `json:"azure_dns_zone,omitempty"`
43+
AzureStorageAccount string `json:"azure_storage_account,omitempty"`
44+
AzureStorageService string `json:"azure_storage_service,omitempty"`
45+
BucketName string `json:"bucket_name,omitempty"`
46+
Region string `json:"region,omitempty"`
47+
Type string `json:"type,omitempty"`
48+
}
49+
50+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccessLogOnlyMode struct {
51+
LogOnlyModeType string `json:"log_only_mode_type,omitempty"`
52+
Workloads []string `json:"workloads,omitempty"`
53+
}
54+
55+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccess struct {
56+
AllowedInternetDestinations []DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedInternetDestinations `json:"allowed_internet_destinations,omitempty"`
57+
AllowedStorageDestinations []DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccessAllowedStorageDestinations `json:"allowed_storage_destinations,omitempty"`
58+
LogOnlyMode *DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccessLogOnlyMode `json:"log_only_mode,omitempty"`
59+
RestrictionMode string `json:"restriction_mode,omitempty"`
60+
}
61+
62+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicy struct {
63+
InternetAccess *DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicyInternetAccess `json:"internet_access,omitempty"`
64+
}
65+
66+
type DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfo struct {
67+
CentralCleanRoomId string `json:"central_clean_room_id,omitempty"`
68+
CloudVendor string `json:"cloud_vendor,omitempty"`
69+
Collaborators []DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoCollaborators `json:"collaborators,omitempty"`
70+
ComplianceSecurityProfile *DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoComplianceSecurityProfile `json:"compliance_security_profile,omitempty"`
71+
Creator *DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoCreator `json:"creator,omitempty"`
72+
EgressNetworkPolicy *DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfoEgressNetworkPolicy `json:"egress_network_policy,omitempty"`
73+
Region string `json:"region,omitempty"`
74+
}
75+
76+
type DataSourceCleanRoomsCleanRoomsCleanRooms struct {
77+
AccessRestricted string `json:"access_restricted,omitempty"`
78+
Comment string `json:"comment,omitempty"`
79+
CreatedAt int `json:"created_at,omitempty"`
80+
LocalCollaboratorAlias string `json:"local_collaborator_alias,omitempty"`
81+
Name string `json:"name,omitempty"`
82+
OutputCatalog *DataSourceCleanRoomsCleanRoomsCleanRoomsOutputCatalog `json:"output_catalog,omitempty"`
83+
Owner string `json:"owner,omitempty"`
84+
RemoteDetailedInfo *DataSourceCleanRoomsCleanRoomsCleanRoomsRemoteDetailedInfo `json:"remote_detailed_info,omitempty"`
85+
Status string `json:"status,omitempty"`
86+
UpdatedAt int `json:"updated_at,omitempty"`
87+
}
88+
89+
type DataSourceCleanRoomsCleanRooms struct {
90+
CleanRooms []DataSourceCleanRoomsCleanRoomsCleanRooms `json:"clean_rooms,omitempty"`
91+
}

‎bundle/internal/tf/schema/data_source_database_instance.go‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,40 @@
22

33
package schema
44

5+
type DataSourceDatabaseInstanceChildInstanceRefs struct {
6+
BranchTime string `json:"branch_time,omitempty"`
7+
EffectiveLsn string `json:"effective_lsn,omitempty"`
8+
Lsn string `json:"lsn,omitempty"`
9+
Name string `json:"name,omitempty"`
10+
Uid string `json:"uid,omitempty"`
11+
}
12+
13+
type DataSourceDatabaseInstanceParentInstanceRef struct {
14+
BranchTime string `json:"branch_time,omitempty"`
15+
EffectiveLsn string `json:"effective_lsn,omitempty"`
16+
Lsn string `json:"lsn,omitempty"`
17+
Name string `json:"name,omitempty"`
18+
Uid string `json:"uid,omitempty"`
19+
}
20+
521
type DataSourceDatabaseInstance struct {
6-
Capacity string `json:"capacity,omitempty"`
7-
CreationTime string `json:"creation_time,omitempty"`
8-
Creator string `json:"creator,omitempty"`
9-
EffectiveStopped bool `json:"effective_stopped,omitempty"`
10-
Name string `json:"name"`
11-
PgVersion string `json:"pg_version,omitempty"`
12-
ReadWriteDns string `json:"read_write_dns,omitempty"`
13-
State string `json:"state,omitempty"`
14-
Stopped bool `json:"stopped,omitempty"`
15-
Uid string `json:"uid,omitempty"`
22+
Capacity string `json:"capacity,omitempty"`
23+
ChildInstanceRefs []DataSourceDatabaseInstanceChildInstanceRefs `json:"child_instance_refs,omitempty"`
24+
CreationTime string `json:"creation_time,omitempty"`
25+
Creator string `json:"creator,omitempty"`
26+
EffectiveEnableReadableSecondaries bool `json:"effective_enable_readable_secondaries,omitempty"`
27+
EffectiveNodeCount int `json:"effective_node_count,omitempty"`
28+
EffectiveRetentionWindowInDays int `json:"effective_retention_window_in_days,omitempty"`
29+
EffectiveStopped bool `json:"effective_stopped,omitempty"`
30+
EnableReadableSecondaries bool `json:"enable_readable_secondaries,omitempty"`
31+
Name string `json:"name"`
32+
NodeCount int `json:"node_count,omitempty"`
33+
ParentInstanceRef *DataSourceDatabaseInstanceParentInstanceRef `json:"parent_instance_ref,omitempty"`
34+
PgVersion string `json:"pg_version,omitempty"`
35+
ReadOnlyDns string `json:"read_only_dns,omitempty"`
36+
ReadWriteDns string `json:"read_write_dns,omitempty"`
37+
RetentionWindowInDays int `json:"retention_window_in_days,omitempty"`
38+
State string `json:"state,omitempty"`
39+
Stopped bool `json:"stopped,omitempty"`
40+
Uid string `json:"uid,omitempty"`
1641
}

0 commit comments

Comments
 (0)