Skip to content

Commit 3ee69c8

Browse files
andrewnesterandrewnester
authored
Upgrade TF provider to 1.75.0 (#2775)
## Changes Upgrade TF provider to 1.75.0 Includes databricks/terraform-provider-databricks#4643 which fixes #2755
1 parent 9112c95 commit 3ee69c8

File tree

9 files changed

+102
-21
lines changed

9 files changed

+102
-21
lines changed

‎NEXT_CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Added inline script execution support to bundle run. You can now run scripts in the same authentication context as a DAB using the databricks bundle run command. ([#2413](https://github.com/databricks/cli/pull/2413))
77

88
### Dependency updates
9+
* Upgrade TF provider to 1.75.0 ([#2775](https://github.com/databricks/cli/pull/2775))
910

1011
### CLI
1112

‎acceptance/terraform/main.tf

+1-1
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.73.0"
5+
version = "1.75.0"
66
}
77
}
88

‎acceptance/terraform/output.txt

+3-3
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.73.0"...
8-
- Installing databricks/databricks v1.73.0...
9-
- Installed databricks/databricks v1.73.0 (unauthenticated)
7+
- Finding databricks/databricks versions matching "1.75.0"...
8+
- Installing databricks/databricks v1.75.0...
9+
- Installed databricks/databricks v1.75.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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package schema
22

3-
const ProviderVersion = "1.73.0"
3+
const ProviderVersion = "1.75.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ type DataSourceClusterClusterInfoSpec struct {
336336
SingleUserName string `json:"single_user_name,omitempty"`
337337
SparkConf map[string]string `json:"spark_conf,omitempty"`
338338
SparkEnvVars map[string]string `json:"spark_env_vars,omitempty"`
339-
SparkVersion string `json:"spark_version"`
339+
SparkVersion string `json:"spark_version,omitempty"`
340340
SshPublicKeys []string `json:"ssh_public_keys,omitempty"`
341341
UseMlRuntime bool `json:"use_ml_runtime,omitempty"`
342342
Autoscale *DataSourceClusterClusterInfoSpecAutoscale `json:"autoscale,omitempty"`

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

+88-4
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ type DataSourceJobJobSettingsSettingsJobClusterNewCluster struct {
210210
SingleUserName string `json:"single_user_name,omitempty"`
211211
SparkConf map[string]string `json:"spark_conf,omitempty"`
212212
SparkEnvVars map[string]string `json:"spark_env_vars,omitempty"`
213-
SparkVersion string `json:"spark_version"`
213+
SparkVersion string `json:"spark_version,omitempty"`
214214
SshPublicKeys []string `json:"ssh_public_keys,omitempty"`
215215
Autoscale *DataSourceJobJobSettingsSettingsJobClusterNewClusterAutoscale `json:"autoscale,omitempty"`
216216
AwsAttributes *DataSourceJobJobSettingsSettingsJobClusterNewClusterAwsAttributes `json:"aws_attributes,omitempty"`
@@ -398,7 +398,7 @@ type DataSourceJobJobSettingsSettingsNewCluster struct {
398398
SingleUserName string `json:"single_user_name,omitempty"`
399399
SparkConf map[string]string `json:"spark_conf,omitempty"`
400400
SparkEnvVars map[string]string `json:"spark_env_vars,omitempty"`
401-
SparkVersion string `json:"spark_version"`
401+
SparkVersion string `json:"spark_version,omitempty"`
402402
SshPublicKeys []string `json:"ssh_public_keys,omitempty"`
403403
Autoscale *DataSourceJobJobSettingsSettingsNewClusterAutoscale `json:"autoscale,omitempty"`
404404
AwsAttributes *DataSourceJobJobSettingsSettingsNewClusterAwsAttributes `json:"aws_attributes,omitempty"`
@@ -482,6 +482,23 @@ type DataSourceJobJobSettingsSettingsTaskConditionTask struct {
482482
Right string `json:"right"`
483483
}
484484

485+
type DataSourceJobJobSettingsSettingsTaskDashboardTaskSubscriptionSubscribers struct {
486+
DestinationId string `json:"destination_id,omitempty"`
487+
UserName string `json:"user_name,omitempty"`
488+
}
489+
490+
type DataSourceJobJobSettingsSettingsTaskDashboardTaskSubscription struct {
491+
CustomSubject string `json:"custom_subject,omitempty"`
492+
Paused bool `json:"paused,omitempty"`
493+
Subscribers []DataSourceJobJobSettingsSettingsTaskDashboardTaskSubscriptionSubscribers `json:"subscribers,omitempty"`
494+
}
495+
496+
type DataSourceJobJobSettingsSettingsTaskDashboardTask struct {
497+
DashboardId string `json:"dashboard_id,omitempty"`
498+
WarehouseId string `json:"warehouse_id,omitempty"`
499+
Subscription *DataSourceJobJobSettingsSettingsTaskDashboardTaskSubscription `json:"subscription,omitempty"`
500+
}
501+
485502
type DataSourceJobJobSettingsSettingsTaskDbtTask struct {
486503
Catalog string `json:"catalog,omitempty"`
487504
Commands []string `json:"commands"`
@@ -512,6 +529,23 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskConditionTask struct {
512529
Right string `json:"right"`
513530
}
514531

532+
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDashboardTaskSubscriptionSubscribers struct {
533+
DestinationId string `json:"destination_id,omitempty"`
534+
UserName string `json:"user_name,omitempty"`
535+
}
536+
537+
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDashboardTaskSubscription struct {
538+
CustomSubject string `json:"custom_subject,omitempty"`
539+
Paused bool `json:"paused,omitempty"`
540+
Subscribers []DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDashboardTaskSubscriptionSubscribers `json:"subscribers,omitempty"`
541+
}
542+
543+
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDashboardTask struct {
544+
DashboardId string `json:"dashboard_id,omitempty"`
545+
WarehouseId string `json:"warehouse_id,omitempty"`
546+
Subscription *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDashboardTaskSubscription `json:"subscription,omitempty"`
547+
}
548+
515549
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDbtTask struct {
516550
Catalog string `json:"catalog,omitempty"`
517551
Commands []string `json:"commands"`
@@ -716,7 +750,7 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNewCluster struct {
716750
SingleUserName string `json:"single_user_name,omitempty"`
717751
SparkConf map[string]string `json:"spark_conf,omitempty"`
718752
SparkEnvVars map[string]string `json:"spark_env_vars,omitempty"`
719-
SparkVersion string `json:"spark_version"`
753+
SparkVersion string `json:"spark_version,omitempty"`
720754
SshPublicKeys []string `json:"ssh_public_keys,omitempty"`
721755
Autoscale *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNewClusterAutoscale `json:"autoscale,omitempty"`
722756
AwsAttributes *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNewClusterAwsAttributes `json:"aws_attributes,omitempty"`
@@ -747,6 +781,29 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPipelineTask struct {
747781
PipelineId string `json:"pipeline_id"`
748782
}
749783

784+
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPowerBiTaskPowerBiModel struct {
785+
AuthenticationMethod string `json:"authentication_method,omitempty"`
786+
ModelName string `json:"model_name,omitempty"`
787+
OverwriteExisting bool `json:"overwrite_existing,omitempty"`
788+
StorageMode string `json:"storage_mode,omitempty"`
789+
WorkspaceName string `json:"workspace_name,omitempty"`
790+
}
791+
792+
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPowerBiTaskTables struct {
793+
Catalog string `json:"catalog,omitempty"`
794+
Name string `json:"name,omitempty"`
795+
Schema string `json:"schema,omitempty"`
796+
StorageMode string `json:"storage_mode,omitempty"`
797+
}
798+
799+
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPowerBiTask struct {
800+
ConnectionResourceName string `json:"connection_resource_name,omitempty"`
801+
RefreshAfterUpdate bool `json:"refresh_after_update,omitempty"`
802+
WarehouseId string `json:"warehouse_id,omitempty"`
803+
PowerBiModel *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPowerBiTaskPowerBiModel `json:"power_bi_model,omitempty"`
804+
Tables []DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPowerBiTaskTables `json:"tables,omitempty"`
805+
}
806+
750807
type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPythonWheelTask struct {
751808
EntryPoint string `json:"entry_point,omitempty"`
752809
NamedParameters map[string]string `json:"named_parameters,omitempty"`
@@ -856,6 +913,7 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTask struct {
856913
TaskKey string `json:"task_key"`
857914
TimeoutSeconds int `json:"timeout_seconds,omitempty"`
858915
ConditionTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskConditionTask `json:"condition_task,omitempty"`
916+
DashboardTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDashboardTask `json:"dashboard_task,omitempty"`
859917
DbtTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDbtTask `json:"dbt_task,omitempty"`
860918
DependsOn []DataSourceJobJobSettingsSettingsTaskForEachTaskTaskDependsOn `json:"depends_on,omitempty"`
861919
EmailNotifications *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskEmailNotifications `json:"email_notifications,omitempty"`
@@ -865,6 +923,7 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTask struct {
865923
NotebookTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNotebookTask `json:"notebook_task,omitempty"`
866924
NotificationSettings *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNotificationSettings `json:"notification_settings,omitempty"`
867925
PipelineTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPipelineTask `json:"pipeline_task,omitempty"`
926+
PowerBiTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPowerBiTask `json:"power_bi_task,omitempty"`
868927
PythonWheelTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskPythonWheelTask `json:"python_wheel_task,omitempty"`
869928
RunJobTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskRunJobTask `json:"run_job_task,omitempty"`
870929
SparkJarTask *DataSourceJobJobSettingsSettingsTaskForEachTaskTaskSparkJarTask `json:"spark_jar_task,omitempty"`
@@ -1060,7 +1119,7 @@ type DataSourceJobJobSettingsSettingsTaskNewCluster struct {
10601119
SingleUserName string `json:"single_user_name,omitempty"`
10611120
SparkConf map[string]string `json:"spark_conf,omitempty"`
10621121
SparkEnvVars map[string]string `json:"spark_env_vars,omitempty"`
1063-
SparkVersion string `json:"spark_version"`
1122+
SparkVersion string `json:"spark_version,omitempty"`
10641123
SshPublicKeys []string `json:"ssh_public_keys,omitempty"`
10651124
Autoscale *DataSourceJobJobSettingsSettingsTaskNewClusterAutoscale `json:"autoscale,omitempty"`
10661125
AwsAttributes *DataSourceJobJobSettingsSettingsTaskNewClusterAwsAttributes `json:"aws_attributes,omitempty"`
@@ -1091,6 +1150,29 @@ type DataSourceJobJobSettingsSettingsTaskPipelineTask struct {
10911150
PipelineId string `json:"pipeline_id"`
10921151
}
10931152

1153+
type DataSourceJobJobSettingsSettingsTaskPowerBiTaskPowerBiModel struct {
1154+
AuthenticationMethod string `json:"authentication_method,omitempty"`
1155+
ModelName string `json:"model_name,omitempty"`
1156+
OverwriteExisting bool `json:"overwrite_existing,omitempty"`
1157+
StorageMode string `json:"storage_mode,omitempty"`
1158+
WorkspaceName string `json:"workspace_name,omitempty"`
1159+
}
1160+
1161+
type DataSourceJobJobSettingsSettingsTaskPowerBiTaskTables struct {
1162+
Catalog string `json:"catalog,omitempty"`
1163+
Name string `json:"name,omitempty"`
1164+
Schema string `json:"schema,omitempty"`
1165+
StorageMode string `json:"storage_mode,omitempty"`
1166+
}
1167+
1168+
type DataSourceJobJobSettingsSettingsTaskPowerBiTask struct {
1169+
ConnectionResourceName string `json:"connection_resource_name,omitempty"`
1170+
RefreshAfterUpdate bool `json:"refresh_after_update,omitempty"`
1171+
WarehouseId string `json:"warehouse_id,omitempty"`
1172+
PowerBiModel *DataSourceJobJobSettingsSettingsTaskPowerBiTaskPowerBiModel `json:"power_bi_model,omitempty"`
1173+
Tables []DataSourceJobJobSettingsSettingsTaskPowerBiTaskTables `json:"tables,omitempty"`
1174+
}
1175+
10941176
type DataSourceJobJobSettingsSettingsTaskPythonWheelTask struct {
10951177
EntryPoint string `json:"entry_point,omitempty"`
10961178
NamedParameters map[string]string `json:"named_parameters,omitempty"`
@@ -1200,6 +1282,7 @@ type DataSourceJobJobSettingsSettingsTask struct {
12001282
TaskKey string `json:"task_key"`
12011283
TimeoutSeconds int `json:"timeout_seconds,omitempty"`
12021284
ConditionTask *DataSourceJobJobSettingsSettingsTaskConditionTask `json:"condition_task,omitempty"`
1285+
DashboardTask *DataSourceJobJobSettingsSettingsTaskDashboardTask `json:"dashboard_task,omitempty"`
12031286
DbtTask *DataSourceJobJobSettingsSettingsTaskDbtTask `json:"dbt_task,omitempty"`
12041287
DependsOn []DataSourceJobJobSettingsSettingsTaskDependsOn `json:"depends_on,omitempty"`
12051288
EmailNotifications *DataSourceJobJobSettingsSettingsTaskEmailNotifications `json:"email_notifications,omitempty"`
@@ -1210,6 +1293,7 @@ type DataSourceJobJobSettingsSettingsTask struct {
12101293
NotebookTask *DataSourceJobJobSettingsSettingsTaskNotebookTask `json:"notebook_task,omitempty"`
12111294
NotificationSettings *DataSourceJobJobSettingsSettingsTaskNotificationSettings `json:"notification_settings,omitempty"`
12121295
PipelineTask *DataSourceJobJobSettingsSettingsTaskPipelineTask `json:"pipeline_task,omitempty"`
1296+
PowerBiTask *DataSourceJobJobSettingsSettingsTaskPowerBiTask `json:"power_bi_task,omitempty"`
12131297
PythonWheelTask *DataSourceJobJobSettingsSettingsTaskPythonWheelTask `json:"python_wheel_task,omitempty"`
12141298
RunJobTask *DataSourceJobJobSettingsSettingsTaskRunJobTask `json:"run_job_task,omitempty"`
12151299
SparkJarTask *DataSourceJobJobSettingsSettingsTaskSparkJarTask `json:"spark_jar_task,omitempty"`

0 commit comments

Comments
 (0)