Skip to content

Commit ffae10d

Browse files
pieternpietern
authored
Bump Terraform provider to v1.36.2 (#1215)
## Changes * Update `go.mod` with latest dependencies * Update `go.mod` to require Go 1.21 to match root `go.mod` * Regenerate structs for Terraform provider v1.36.2 ## Tests n/a
1 parent ed00c85 commit ffae10d

26 files changed

+285
-284
lines changed

‎bundle/internal/tf/codegen/go.mod‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
module github.com/databricks/cli/bundle/internal/tf/codegen
22

3-
go 1.18
3+
go 1.21
44

55
require (
66
github.com/hashicorp/go-version v1.6.0
7-
github.com/hashicorp/hc-install v0.5.0
8-
github.com/hashicorp/terraform-exec v0.17.3
9-
github.com/hashicorp/terraform-json v0.15.0
10-
github.com/iancoleman/strcase v0.2.0
11-
github.com/zclconf/go-cty v1.12.1
12-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
7+
github.com/hashicorp/hc-install v0.6.3
8+
github.com/hashicorp/terraform-exec v0.20.0
9+
github.com/hashicorp/terraform-json v0.21.0
10+
github.com/iancoleman/strcase v0.3.0
11+
github.com/zclconf/go-cty v1.14.2
12+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
1313
)
1414

1515
require (
16+
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
17+
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
18+
github.com/cloudflare/circl v1.3.7 // indirect
1619
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
17-
golang.org/x/crypto v0.17.0 // indirect
18-
golang.org/x/mod v0.8.0 // indirect
20+
golang.org/x/crypto v0.19.0 // indirect
21+
golang.org/x/mod v0.15.0 // indirect
22+
golang.org/x/sys v0.17.0 // indirect
1923
golang.org/x/text v0.14.0 // indirect
2024
)

‎bundle/internal/tf/codegen/go.sum‎

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

‎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.31.1"
3+
const ProviderVersion = "1.36.2"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
2+
3+
package schema
4+
5+
type DataSourceAwsUnityCatalogPolicy struct {
6+
AwsAccountId string `json:"aws_account_id"`
7+
BucketName string `json:"bucket_name"`
8+
Id string `json:"id,omitempty"`
9+
Json string `json:"json,omitempty"`
10+
KmsName string `json:"kms_name,omitempty"`
11+
RoleName string `json:"role_name"`
12+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,19 @@ type DataSourceClusterClusterInfoGcpAttributes struct {
9696
}
9797

9898
type DataSourceClusterClusterInfoInitScriptsAbfss struct {
99-
Destination string `json:"destination,omitempty"`
99+
Destination string `json:"destination"`
100100
}
101101

102102
type DataSourceClusterClusterInfoInitScriptsDbfs struct {
103103
Destination string `json:"destination"`
104104
}
105105

106106
type DataSourceClusterClusterInfoInitScriptsFile struct {
107-
Destination string `json:"destination,omitempty"`
107+
Destination string `json:"destination"`
108108
}
109109

110110
type DataSourceClusterClusterInfoInitScriptsGcs struct {
111-
Destination string `json:"destination,omitempty"`
111+
Destination string `json:"destination"`
112112
}
113113

114114
type DataSourceClusterClusterInfoInitScriptsS3 struct {
@@ -126,7 +126,7 @@ type DataSourceClusterClusterInfoInitScriptsVolumes struct {
126126
}
127127

128128
type DataSourceClusterClusterInfoInitScriptsWorkspace struct {
129-
Destination string `json:"destination,omitempty"`
129+
Destination string `json:"destination"`
130130
}
131131

132132
type DataSourceClusterClusterInfoInitScripts struct {

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
2+
3+
package schema
4+
5+
type DataSourceCurrentMetastoreMetastoreInfo struct {
6+
Cloud string `json:"cloud,omitempty"`
7+
CreatedAt int `json:"created_at,omitempty"`
8+
CreatedBy string `json:"created_by,omitempty"`
9+
DefaultDataAccessConfigId string `json:"default_data_access_config_id,omitempty"`
10+
DeltaSharingOrganizationName string `json:"delta_sharing_organization_name,omitempty"`
11+
DeltaSharingRecipientTokenLifetimeInSeconds int `json:"delta_sharing_recipient_token_lifetime_in_seconds,omitempty"`
12+
DeltaSharingScope string `json:"delta_sharing_scope,omitempty"`
13+
GlobalMetastoreId string `json:"global_metastore_id,omitempty"`
14+
MetastoreId string `json:"metastore_id,omitempty"`
15+
Name string `json:"name,omitempty"`
16+
Owner string `json:"owner,omitempty"`
17+
PrivilegeModelVersion string `json:"privilege_model_version,omitempty"`
18+
Region string `json:"region,omitempty"`
19+
StorageRoot string `json:"storage_root,omitempty"`
20+
StorageRootCredentialId string `json:"storage_root_credential_id,omitempty"`
21+
StorageRootCredentialName string `json:"storage_root_credential_name,omitempty"`
22+
UpdatedAt int `json:"updated_at,omitempty"`
23+
UpdatedBy string `json:"updated_by,omitempty"`
24+
}
25+
26+
type DataSourceCurrentMetastore struct {
27+
Id string `json:"id,omitempty"`
28+
MetastoreInfo *DataSourceCurrentMetastoreMetastoreInfo `json:"metastore_info,omitempty"`
29+
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
package schema
44

55
type DataSourceDirectory struct {
6-
Id string `json:"id,omitempty"`
7-
ObjectId int `json:"object_id,omitempty"`
8-
Path string `json:"path"`
6+
Id string `json:"id,omitempty"`
7+
ObjectId int `json:"object_id,omitempty"`
8+
Path string `json:"path"`
9+
WorkspacePath string `json:"workspace_path,omitempty"`
910
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterGcpAttributes struct {
134134
}
135135

136136
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsAbfss struct {
137-
Destination string `json:"destination,omitempty"`
137+
Destination string `json:"destination"`
138138
}
139139

140140
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsDbfs struct {
141141
Destination string `json:"destination"`
142142
}
143143

144144
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsFile struct {
145-
Destination string `json:"destination,omitempty"`
145+
Destination string `json:"destination"`
146146
}
147147

148148
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsGcs struct {
149-
Destination string `json:"destination,omitempty"`
149+
Destination string `json:"destination"`
150150
}
151151

152152
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsS3 struct {
@@ -164,7 +164,7 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsVolumes stru
164164
}
165165

166166
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsWorkspace struct {
167-
Destination string `json:"destination,omitempty"`
167+
Destination string `json:"destination"`
168168
}
169169

170170
type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScripts struct {
@@ -321,19 +321,19 @@ type DataSourceJobJobSettingsSettingsNewClusterGcpAttributes struct {
321321
}
322322

323323
type DataSourceJobJobSettingsSettingsNewClusterInitScriptsAbfss struct {
324-
Destination string `json:"destination,omitempty"`
324+
Destination string `json:"destination"`
325325
}
326326

327327
type DataSourceJobJobSettingsSettingsNewClusterInitScriptsDbfs struct {
328328
Destination string `json:"destination"`
329329
}
330330

331331
type DataSourceJobJobSettingsSettingsNewClusterInitScriptsFile struct {
332-
Destination string `json:"destination,omitempty"`
332+
Destination string `json:"destination"`
333333
}
334334

335335
type DataSourceJobJobSettingsSettingsNewClusterInitScriptsGcs struct {
336-
Destination string `json:"destination,omitempty"`
336+
Destination string `json:"destination"`
337337
}
338338

339339
type DataSourceJobJobSettingsSettingsNewClusterInitScriptsS3 struct {
@@ -351,7 +351,7 @@ type DataSourceJobJobSettingsSettingsNewClusterInitScriptsVolumes struct {
351351
}
352352

353353
type DataSourceJobJobSettingsSettingsNewClusterInitScriptsWorkspace struct {
354-
Destination string `json:"destination,omitempty"`
354+
Destination string `json:"destination"`
355355
}
356356

357357
type DataSourceJobJobSettingsSettingsNewClusterInitScripts struct {
@@ -418,8 +418,8 @@ type DataSourceJobJobSettingsSettingsNotificationSettings struct {
418418
}
419419

420420
type DataSourceJobJobSettingsSettingsParameter struct {
421-
Default string `json:"default,omitempty"`
422-
Name string `json:"name,omitempty"`
421+
Default string `json:"default"`
422+
Name string `json:"name"`
423423
}
424424

425425
type DataSourceJobJobSettingsSettingsPipelineTask struct {
@@ -604,19 +604,19 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterGcpAttributes struct {
604604
}
605605

606606
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsAbfss struct {
607-
Destination string `json:"destination,omitempty"`
607+
Destination string `json:"destination"`
608608
}
609609

610610
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsDbfs struct {
611611
Destination string `json:"destination"`
612612
}
613613

614614
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsFile struct {
615-
Destination string `json:"destination,omitempty"`
615+
Destination string `json:"destination"`
616616
}
617617

618618
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsGcs struct {
619-
Destination string `json:"destination,omitempty"`
619+
Destination string `json:"destination"`
620620
}
621621

622622
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsS3 struct {
@@ -634,7 +634,7 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsVolumes struct {
634634
}
635635

636636
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsWorkspace struct {
637-
Destination string `json:"destination,omitempty"`
637+
Destination string `json:"destination"`
638638
}
639639

640640
type DataSourceJobJobSettingsSettingsTaskNewClusterInitScripts struct {

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

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,34 @@
33
package schema
44

55
type DataSourceSqlWarehouseChannel struct {
6-
Name string `json:"name,omitempty"`
6+
DbsqlVersion string `json:"dbsql_version,omitempty"`
7+
Name string `json:"name,omitempty"`
8+
}
9+
10+
type DataSourceSqlWarehouseHealthFailureReason struct {
11+
Code string `json:"code,omitempty"`
12+
Parameters map[string]string `json:"parameters,omitempty"`
13+
Type string `json:"type,omitempty"`
14+
}
15+
16+
type DataSourceSqlWarehouseHealth struct {
17+
Details string `json:"details,omitempty"`
18+
Message string `json:"message,omitempty"`
19+
Status string `json:"status,omitempty"`
20+
Summary string `json:"summary,omitempty"`
21+
FailureReason *DataSourceSqlWarehouseHealthFailureReason `json:"failure_reason,omitempty"`
722
}
823

924
type DataSourceSqlWarehouseOdbcParams struct {
10-
Host string `json:"host,omitempty"`
1125
Hostname string `json:"hostname,omitempty"`
12-
Path string `json:"path"`
13-
Port int `json:"port"`
14-
Protocol string `json:"protocol"`
26+
Path string `json:"path,omitempty"`
27+
Port int `json:"port,omitempty"`
28+
Protocol string `json:"protocol,omitempty"`
1529
}
1630

1731
type DataSourceSqlWarehouseTagsCustomTags struct {
18-
Key string `json:"key"`
19-
Value string `json:"value"`
32+
Key string `json:"key,omitempty"`
33+
Value string `json:"value,omitempty"`
2034
}
2135

2236
type DataSourceSqlWarehouseTags struct {
@@ -26,6 +40,7 @@ type DataSourceSqlWarehouseTags struct {
2640
type DataSourceSqlWarehouse struct {
2741
AutoStopMins int `json:"auto_stop_mins,omitempty"`
2842
ClusterSize string `json:"cluster_size,omitempty"`
43+
CreatorName string `json:"creator_name,omitempty"`
2944
DataSourceId string `json:"data_source_id,omitempty"`
3045
EnablePhoton bool `json:"enable_photon,omitempty"`
3146
EnableServerlessCompute bool `json:"enable_serverless_compute,omitempty"`
@@ -35,10 +50,13 @@ type DataSourceSqlWarehouse struct {
3550
MaxNumClusters int `json:"max_num_clusters,omitempty"`
3651
MinNumClusters int `json:"min_num_clusters,omitempty"`
3752
Name string `json:"name,omitempty"`
53+
NumActiveSessions int `json:"num_active_sessions,omitempty"`
3854
NumClusters int `json:"num_clusters,omitempty"`
3955
SpotInstancePolicy string `json:"spot_instance_policy,omitempty"`
4056
State string `json:"state,omitempty"`
57+
WarehouseType string `json:"warehouse_type,omitempty"`
4158
Channel *DataSourceSqlWarehouseChannel `json:"channel,omitempty"`
59+
Health *DataSourceSqlWarehouseHealth `json:"health,omitempty"`
4260
OdbcParams *DataSourceSqlWarehouseOdbcParams `json:"odbc_params,omitempty"`
4361
Tags *DataSourceSqlWarehouseTags `json:"tags,omitempty"`
4462
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
2+
3+
package schema
4+
5+
type DataSourceVolumes struct {
6+
CatalogName string `json:"catalog_name"`
7+
Id string `json:"id,omitempty"`
8+
Ids []string `json:"ids,omitempty"`
9+
SchemaName string `json:"schema_name"`
10+
}

0 commit comments

Comments
 (0)