steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade TF provider to 1.42.0 (#1418) 

## Changes
Upgrade TF provider to 1.42.0

Also fixes #1258
This commit is contained in:
Andrew Nester 2024-05-06 13:41:37 +02:00 committed by GitHub
parent 4724ecb324
commit a393c87ed9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 150 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundle/internal/tf/codegen/schema/version.go
View File

@ -1,3 +1,3 @@
package schema package schema
const ProviderVersion = "1.40.0" const ProviderVersion = "1.42.0"

39
bundle/internal/tf/schema/data_source_job.go
View File

@ -243,12 +243,13 @@ type DataSourceJobJobSettingsSettingsLibraryPypi struct {
} }
type DataSourceJobJobSettingsSettingsLibrary struct { type DataSourceJobJobSettingsSettingsLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *DataSourceJobJobSettingsSettingsLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *DataSourceJobJobSettingsSettingsLibraryMaven `json:"maven,omitempty"` Cran *DataSourceJobJobSettingsSettingsLibraryCran `json:"cran,omitempty"`
Pypi *DataSourceJobJobSettingsSettingsLibraryPypi `json:"pypi,omitempty"` Maven *DataSourceJobJobSettingsSettingsLibraryMaven `json:"maven,omitempty"`
Pypi *DataSourceJobJobSettingsSettingsLibraryPypi `json:"pypi,omitempty"`
} }
type DataSourceJobJobSettingsSettingsNewClusterAutoscale struct { type DataSourceJobJobSettingsSettingsNewClusterAutoscale struct {
@ -558,12 +559,13 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryPypi struct {
} }
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibrary struct { type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryMaven `json:"maven,omitempty"` Cran *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryCran `json:"cran,omitempty"`
Pypi *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryPypi `json:"pypi,omitempty"` Maven *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryMaven `json:"maven,omitempty"`
Pypi *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskLibraryPypi `json:"pypi,omitempty"`
} }
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNewClusterAutoscale struct { type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNewClusterAutoscale struct {
@ -896,12 +898,13 @@ type DataSourceJobJobSettingsSettingsTaskLibraryPypi struct {
} }
type DataSourceJobJobSettingsSettingsTaskLibrary struct { type DataSourceJobJobSettingsSettingsTaskLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *DataSourceJobJobSettingsSettingsTaskLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *DataSourceJobJobSettingsSettingsTaskLibraryMaven `json:"maven,omitempty"` Cran *DataSourceJobJobSettingsSettingsTaskLibraryCran `json:"cran,omitempty"`
Pypi *DataSourceJobJobSettingsSettingsTaskLibraryPypi `json:"pypi,omitempty"` Maven *DataSourceJobJobSettingsSettingsTaskLibraryMaven `json:"maven,omitempty"`
Pypi *DataSourceJobJobSettingsSettingsTaskLibraryPypi `json:"pypi,omitempty"`
} }
type DataSourceJobJobSettingsSettingsTaskNewClusterAutoscale struct { type DataSourceJobJobSettingsSettingsTaskNewClusterAutoscale struct {

13
bundle/internal/tf/schema/resource_cluster.go
View File

@ -146,12 +146,13 @@ type ResourceClusterLibraryPypi struct {
} }
type ResourceClusterLibrary struct { type ResourceClusterLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *ResourceClusterLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *ResourceClusterLibraryMaven `json:"maven,omitempty"` Cran *ResourceClusterLibraryCran `json:"cran,omitempty"`
Pypi *ResourceClusterLibraryPypi `json:"pypi,omitempty"` Maven *ResourceClusterLibraryMaven `json:"maven,omitempty"`
Pypi *ResourceClusterLibraryPypi `json:"pypi,omitempty"`
} }
type ResourceClusterWorkloadTypeClients struct { type ResourceClusterWorkloadTypeClients struct {

13
bundle/internal/tf/schema/resource_cluster_policy.go
View File

@ -19,12 +19,13 @@ type ResourceClusterPolicyLibrariesPypi struct {
} }
type ResourceClusterPolicyLibraries struct { type ResourceClusterPolicyLibraries struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *ResourceClusterPolicyLibrariesCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *ResourceClusterPolicyLibrariesMaven `json:"maven,omitempty"` Cran *ResourceClusterPolicyLibrariesCran `json:"cran,omitempty"`
Pypi *ResourceClusterPolicyLibrariesPypi `json:"pypi,omitempty"` Maven *ResourceClusterPolicyLibrariesMaven `json:"maven,omitempty"`
Pypi *ResourceClusterPolicyLibrariesPypi `json:"pypi,omitempty"`
} }
type ResourceClusterPolicy struct { type ResourceClusterPolicy struct {

39
bundle/internal/tf/schema/resource_job.go
View File

@ -243,12 +243,13 @@ type ResourceJobLibraryPypi struct {
} }
type ResourceJobLibrary struct { type ResourceJobLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *ResourceJobLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *ResourceJobLibraryMaven `json:"maven,omitempty"` Cran *ResourceJobLibraryCran `json:"cran,omitempty"`
Pypi *ResourceJobLibraryPypi `json:"pypi,omitempty"` Maven *ResourceJobLibraryMaven `json:"maven,omitempty"`
Pypi *ResourceJobLibraryPypi `json:"pypi,omitempty"`
} }
type ResourceJobNewClusterAutoscale struct { type ResourceJobNewClusterAutoscale struct {
@ -558,12 +559,13 @@ type ResourceJobTaskForEachTaskTaskLibraryPypi struct {
} }
type ResourceJobTaskForEachTaskTaskLibrary struct { type ResourceJobTaskForEachTaskTaskLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *ResourceJobTaskForEachTaskTaskLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *ResourceJobTaskForEachTaskTaskLibraryMaven `json:"maven,omitempty"` Cran *ResourceJobTaskForEachTaskTaskLibraryCran `json:"cran,omitempty"`
Pypi *ResourceJobTaskForEachTaskTaskLibraryPypi `json:"pypi,omitempty"` Maven *ResourceJobTaskForEachTaskTaskLibraryMaven `json:"maven,omitempty"`
Pypi *ResourceJobTaskForEachTaskTaskLibraryPypi `json:"pypi,omitempty"`
} }
type ResourceJobTaskForEachTaskTaskNewClusterAutoscale struct { type ResourceJobTaskForEachTaskTaskNewClusterAutoscale struct {
@ -896,12 +898,13 @@ type ResourceJobTaskLibraryPypi struct {
} }
type ResourceJobTaskLibrary struct { type ResourceJobTaskLibrary struct {
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *ResourceJobTaskLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *ResourceJobTaskLibraryMaven `json:"maven,omitempty"` Cran *ResourceJobTaskLibraryCran `json:"cran,omitempty"`
Pypi *ResourceJobTaskLibraryPypi `json:"pypi,omitempty"` Maven *ResourceJobTaskLibraryMaven `json:"maven,omitempty"`
Pypi *ResourceJobTaskLibraryPypi `json:"pypi,omitempty"`
} }
type ResourceJobTaskNewClusterAutoscale struct { type ResourceJobTaskNewClusterAutoscale struct {

17
bundle/internal/tf/schema/resource_library.go
View File

@ -19,12 +19,13 @@ type ResourceLibraryPypi struct {
} }
type ResourceLibrary struct { type ResourceLibrary struct {
ClusterId string `json:"cluster_id"` ClusterId string `json:"cluster_id"`
Egg string `json:"egg,omitempty"` Egg string `json:"egg,omitempty"`
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
Jar string `json:"jar,omitempty"` Jar string `json:"jar,omitempty"`
Whl string `json:"whl,omitempty"` Requirements string `json:"requirements,omitempty"`
Cran *ResourceLibraryCran `json:"cran,omitempty"` Whl string `json:"whl,omitempty"`
Maven *ResourceLibraryMaven `json:"maven,omitempty"` Cran *ResourceLibraryCran `json:"cran,omitempty"`
Pypi *ResourceLibraryPypi `json:"pypi,omitempty"` Maven *ResourceLibraryMaven `json:"maven,omitempty"`
Pypi *ResourceLibraryPypi `json:"pypi,omitempty"`
} }

9
bundle/internal/tf/schema/resource_mws_ncc_binding.go Normal file
View File

@ -0,0 +1,9 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
package schema
type ResourceMwsNccBinding struct {
Id string `json:"id,omitempty"`
NetworkConnectivityConfigId string `json:"network_connectivity_config_id"`
WorkspaceId int `json:"workspace_id"`
}

17
bundle/internal/tf/schema/resource_mws_ncc_private_endpoint_rule.go Normal file
View File

@ -0,0 +1,17 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
package schema
type ResourceMwsNccPrivateEndpointRule struct {
ConnectionState string `json:"connection_state,omitempty"`
CreationTime int `json:"creation_time,omitempty"`
Deactivated bool `json:"deactivated,omitempty"`
DeactivatedAt int `json:"deactivated_at,omitempty"`
EndpointName string `json:"endpoint_name,omitempty"`
GroupId string `json:"group_id"`
Id string `json:"id,omitempty"`
NetworkConnectivityConfigId string `json:"network_connectivity_config_id"`
ResourceId string `json:"resource_id"`
RuleId string `json:"rule_id,omitempty"`
UpdatedTime int `json:"updated_time,omitempty"`
}

51
bundle/internal/tf/schema/resource_mws_network_connectivity_config.go Normal file
View File

@ -0,0 +1,51 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
package schema
type ResourceMwsNetworkConnectivityConfigEgressConfigDefaultRulesAwsStableIpRule struct {
CidrBlocks []string `json:"cidr_blocks,omitempty"`
}
type ResourceMwsNetworkConnectivityConfigEgressConfigDefaultRulesAzureServiceEndpointRule struct {
Subnets []string `json:"subnets,omitempty"`
TargetRegion string `json:"target_region,omitempty"`
TargetServices []string `json:"target_services,omitempty"`
}
type ResourceMwsNetworkConnectivityConfigEgressConfigDefaultRules struct {
AwsStableIpRule *ResourceMwsNetworkConnectivityConfigEgressConfigDefaultRulesAwsStableIpRule `json:"aws_stable_ip_rule,omitempty"`
AzureServiceEndpointRule *ResourceMwsNetworkConnectivityConfigEgressConfigDefaultRulesAzureServiceEndpointRule `json:"azure_service_endpoint_rule,omitempty"`
}
type ResourceMwsNetworkConnectivityConfigEgressConfigTargetRulesAzurePrivateEndpointRules struct {
ConnectionState string `json:"connection_state,omitempty"`
CreationTime int `json:"creation_time,omitempty"`
Deactivated bool `json:"deactivated,omitempty"`
DeactivatedAt int `json:"deactivated_at,omitempty"`
EndpointName string `json:"endpoint_name,omitempty"`
GroupId string `json:"group_id,omitempty"`
NetworkConnectivityConfigId string `json:"network_connectivity_config_id,omitempty"`
ResourceId string `json:"resource_id,omitempty"`
RuleId string `json:"rule_id,omitempty"`
UpdatedTime int `json:"updated_time,omitempty"`
}
type ResourceMwsNetworkConnectivityConfigEgressConfigTargetRules struct {
AzurePrivateEndpointRules []ResourceMwsNetworkConnectivityConfigEgressConfigTargetRulesAzurePrivateEndpointRules `json:"azure_private_endpoint_rules,omitempty"`
}
type ResourceMwsNetworkConnectivityConfigEgressConfig struct {
DefaultRules *ResourceMwsNetworkConnectivityConfigEgressConfigDefaultRules `json:"default_rules,omitempty"`
TargetRules *ResourceMwsNetworkConnectivityConfigEgressConfigTargetRules `json:"target_rules,omitempty"`
}
type ResourceMwsNetworkConnectivityConfig struct {
AccountId string `json:"account_id,omitempty"`
CreationTime int `json:"creation_time,omitempty"`
Id string `json:"id,omitempty"`
Name string `json:"name"`
NetworkConnectivityConfigId string `json:"network_connectivity_config_id,omitempty"`
Region string `json:"region"`
UpdatedTime int `json:"updated_time,omitempty"`
EgressConfig *ResourceMwsNetworkConnectivityConfigEgressConfig `json:"egress_config,omitempty"`
}

6
bundle/internal/tf/schema/resources.go
View File

@ -45,6 +45,9 @@ type Resources struct {
MwsCredentials map[string]any `json:"databricks_mws_credentials,omitempty"` MwsCredentials map[string]any `json:"databricks_mws_credentials,omitempty"`
MwsCustomerManagedKeys map[string]any `json:"databricks_mws_customer_managed_keys,omitempty"` MwsCustomerManagedKeys map[string]any `json:"databricks_mws_customer_managed_keys,omitempty"`
MwsLogDelivery map[string]any `json:"databricks_mws_log_delivery,omitempty"` MwsLogDelivery map[string]any `json:"databricks_mws_log_delivery,omitempty"`
MwsNccBinding map[string]any `json:"databricks_mws_ncc_binding,omitempty"`
MwsNccPrivateEndpointRule map[string]any `json:"databricks_mws_ncc_private_endpoint_rule,omitempty"`
MwsNetworkConnectivityConfig map[string]any `json:"databricks_mws_network_connectivity_config,omitempty"`
MwsNetworks map[string]any `json:"databricks_mws_networks,omitempty"` MwsNetworks map[string]any `json:"databricks_mws_networks,omitempty"`
MwsPermissionAssignment map[string]any `json:"databricks_mws_permission_assignment,omitempty"` MwsPermissionAssignment map[string]any `json:"databricks_mws_permission_assignment,omitempty"`
MwsPrivateAccessSettings map[string]any `json:"databricks_mws_private_access_settings,omitempty"` MwsPrivateAccessSettings map[string]any `json:"databricks_mws_private_access_settings,omitempty"`
@ -137,6 +140,9 @@ func NewResources() *Resources {
MwsCredentials: make(map[string]any), MwsCredentials: make(map[string]any),
MwsCustomerManagedKeys: make(map[string]any), MwsCustomerManagedKeys: make(map[string]any),
MwsLogDelivery: make(map[string]any), MwsLogDelivery: make(map[string]any),
MwsNccBinding: make(map[string]any),
MwsNccPrivateEndpointRule: make(map[string]any),
MwsNetworkConnectivityConfig: make(map[string]any),
MwsNetworks: make(map[string]any), MwsNetworks: make(map[string]any),
MwsPermissionAssignment: make(map[string]any), MwsPermissionAssignment: make(map[string]any),
MwsPrivateAccessSettings: make(map[string]any), MwsPrivateAccessSettings: make(map[string]any),

2
bundle/internal/tf/schema/root.go
View File

@ -21,7 +21,7 @@ type Root struct {
const ProviderHost = "registry.terraform.io" const ProviderHost = "registry.terraform.io"
const ProviderSource = "databricks/databricks" const ProviderSource = "databricks/databricks"
const ProviderVersion = "1.40.0" const ProviderVersion = "1.42.0"
func NewRoot() *Root { func NewRoot() *Root {
return &Root{ return &Root{