diff --git a/bundle/internal/tf/schema/config.go b/bundle/internal/tf/schema/config.go index 0e5ec3fa..d24d5733 100644 --- a/bundle/internal/tf/schema/config.go +++ b/bundle/internal/tf/schema/config.go @@ -14,6 +14,7 @@ type Config struct { AzureWorkspaceResourceId string `json:"azure_workspace_resource_id,omitempty"` ClientId string `json:"client_id,omitempty"` ClientSecret string `json:"client_secret,omitempty"` + ClusterId string `json:"cluster_id,omitempty"` ConfigFile string `json:"config_file,omitempty"` DatabricksCliPath string `json:"databricks_cli_path,omitempty"` DebugHeaders bool `json:"debug_headers,omitempty"` @@ -30,4 +31,5 @@ type Config struct { SkipVerify bool `json:"skip_verify,omitempty"` Token string `json:"token,omitempty"` Username string `json:"username,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_job.go b/bundle/internal/tf/schema/data_source_job.go index ec0aa6f5..a633bd3a 100644 --- a/bundle/internal/tf/schema/data_source_job.go +++ b/bundle/internal/tf/schema/data_source_job.go @@ -2,6 +2,15 @@ package schema +type DataSourceJobJobSettingsSettingsComputeSpec struct { + Kind string `json:"kind,omitempty"` +} + +type DataSourceJobJobSettingsSettingsCompute struct { + ComputeKey string `json:"compute_key,omitempty"` + Spec *DataSourceJobJobSettingsSettingsComputeSpec `json:"spec,omitempty"` +} + type DataSourceJobJobSettingsSettingsContinuous struct { PauseStatus string `json:"pause_status,omitempty"` } @@ -415,6 +424,12 @@ type DataSourceJobJobSettingsSettingsSparkSubmitTask struct { Parameters []string `json:"parameters,omitempty"` } +type DataSourceJobJobSettingsSettingsTaskConditionTask struct { + Left string `json:"left,omitempty"` + Op string `json:"op,omitempty"` + Right string `json:"right,omitempty"` +} + type DataSourceJobJobSettingsSettingsTaskDbtTask struct { Catalog string `json:"catalog,omitempty"` Commands []string `json:"commands"` @@ -425,7 +440,8 @@ type DataSourceJobJobSettingsSettingsTaskDbtTask struct { } type DataSourceJobJobSettingsSettingsTaskDependsOn struct { - TaskKey string `json:"task_key,omitempty"` + Outcome string `json:"outcome,omitempty"` + TaskKey string `json:"task_key"` } type DataSourceJobJobSettingsSettingsTaskEmailNotifications struct { @@ -645,12 +661,27 @@ type DataSourceJobJobSettingsSettingsTaskSparkSubmitTask struct { Parameters []string `json:"parameters,omitempty"` } +type DataSourceJobJobSettingsSettingsTaskSqlTaskAlertSubscriptions struct { + DestinationId string `json:"destination_id,omitempty"` + UserName string `json:"user_name,omitempty"` +} + type DataSourceJobJobSettingsSettingsTaskSqlTaskAlert struct { - AlertId string `json:"alert_id"` + AlertId string `json:"alert_id"` + PauseSubscriptions bool `json:"pause_subscriptions,omitempty"` + Subscriptions []DataSourceJobJobSettingsSettingsTaskSqlTaskAlertSubscriptions `json:"subscriptions,omitempty"` +} + +type DataSourceJobJobSettingsSettingsTaskSqlTaskDashboardSubscriptions struct { + DestinationId string `json:"destination_id,omitempty"` + UserName string `json:"user_name,omitempty"` } type DataSourceJobJobSettingsSettingsTaskSqlTaskDashboard struct { - DashboardId string `json:"dashboard_id"` + CustomSubject string `json:"custom_subject,omitempty"` + DashboardId string `json:"dashboard_id"` + PauseSubscriptions bool `json:"pause_subscriptions,omitempty"` + Subscriptions []DataSourceJobJobSettingsSettingsTaskSqlTaskDashboardSubscriptions `json:"subscriptions,omitempty"` } type DataSourceJobJobSettingsSettingsTaskSqlTaskFile struct { @@ -671,6 +702,7 @@ type DataSourceJobJobSettingsSettingsTaskSqlTask struct { } type DataSourceJobJobSettingsSettingsTask struct { + ComputeKey string `json:"compute_key,omitempty"` Description string `json:"description,omitempty"` ExistingClusterId string `json:"existing_cluster_id,omitempty"` JobClusterKey string `json:"job_cluster_key,omitempty"` @@ -680,6 +712,7 @@ type DataSourceJobJobSettingsSettingsTask struct { RunIf string `json:"run_if,omitempty"` TaskKey string `json:"task_key,omitempty"` TimeoutSeconds int `json:"timeout_seconds,omitempty"` + ConditionTask *DataSourceJobJobSettingsSettingsTaskConditionTask `json:"condition_task,omitempty"` DbtTask *DataSourceJobJobSettingsSettingsTaskDbtTask `json:"dbt_task,omitempty"` DependsOn []DataSourceJobJobSettingsSettingsTaskDependsOn `json:"depends_on,omitempty"` EmailNotifications *DataSourceJobJobSettingsSettingsTaskEmailNotifications `json:"email_notifications,omitempty"` @@ -695,9 +728,9 @@ type DataSourceJobJobSettingsSettingsTask struct { } type DataSourceJobJobSettingsSettingsTriggerFileArrival struct { - MinTimeBetweenTriggerSeconds int `json:"min_time_between_trigger_seconds,omitempty"` - Url string `json:"url"` - WaitAfterLastChangeSeconds int `json:"wait_after_last_change_seconds,omitempty"` + MinTimeBetweenTriggersSeconds int `json:"min_time_between_triggers_seconds,omitempty"` + Url string `json:"url"` + WaitAfterLastChangeSeconds int `json:"wait_after_last_change_seconds,omitempty"` } type DataSourceJobJobSettingsSettingsTrigger struct { @@ -733,6 +766,7 @@ type DataSourceJobJobSettingsSettings struct { RetryOnTimeout bool `json:"retry_on_timeout,omitempty"` Tags map[string]string `json:"tags,omitempty"` TimeoutSeconds int `json:"timeout_seconds,omitempty"` + Compute []DataSourceJobJobSettingsSettingsCompute `json:"compute,omitempty"` Continuous *DataSourceJobJobSettingsSettingsContinuous `json:"continuous,omitempty"` DbtTask *DataSourceJobJobSettingsSettingsDbtTask `json:"dbt_task,omitempty"` EmailNotifications *DataSourceJobJobSettingsSettingsEmailNotifications `json:"email_notifications,omitempty"` diff --git a/bundle/internal/tf/schema/resource_catalog_workspace_binding.go b/bundle/internal/tf/schema/resource_catalog_workspace_binding.go new file mode 100644 index 00000000..40bced98 --- /dev/null +++ b/bundle/internal/tf/schema/resource_catalog_workspace_binding.go @@ -0,0 +1,9 @@ +// Generated from Databricks Terraform provider schema. DO NOT EDIT. + +package schema + +type ResourceCatalogWorkspaceBinding struct { + CatalogName string `json:"catalog_name"` + Id string `json:"id,omitempty"` + WorkspaceId string `json:"workspace_id"` +} diff --git a/bundle/internal/tf/schema/resource_grants.go b/bundle/internal/tf/schema/resource_grants.go index c19adae8..fb754cc6 100644 --- a/bundle/internal/tf/schema/resource_grants.go +++ b/bundle/internal/tf/schema/resource_grants.go @@ -19,5 +19,6 @@ type ResourceGrants struct { StorageCredential string `json:"storage_credential,omitempty"` Table string `json:"table,omitempty"` View string `json:"view,omitempty"` + Volume string `json:"volume,omitempty"` Grant []ResourceGrantsGrant `json:"grant,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_job.go b/bundle/internal/tf/schema/resource_job.go index aea2fdd6..e3137ea1 100644 --- a/bundle/internal/tf/schema/resource_job.go +++ b/bundle/internal/tf/schema/resource_job.go @@ -2,6 +2,15 @@ package schema +type ResourceJobComputeSpec struct { + Kind string `json:"kind,omitempty"` +} + +type ResourceJobCompute struct { + ComputeKey string `json:"compute_key,omitempty"` + Spec *ResourceJobComputeSpec `json:"spec,omitempty"` +} + type ResourceJobContinuous struct { PauseStatus string `json:"pause_status,omitempty"` } @@ -415,6 +424,12 @@ type ResourceJobSparkSubmitTask struct { Parameters []string `json:"parameters,omitempty"` } +type ResourceJobTaskConditionTask struct { + Left string `json:"left,omitempty"` + Op string `json:"op,omitempty"` + Right string `json:"right,omitempty"` +} + type ResourceJobTaskDbtTask struct { Catalog string `json:"catalog,omitempty"` Commands []string `json:"commands"` @@ -425,7 +440,8 @@ type ResourceJobTaskDbtTask struct { } type ResourceJobTaskDependsOn struct { - TaskKey string `json:"task_key,omitempty"` + Outcome string `json:"outcome,omitempty"` + TaskKey string `json:"task_key"` } type ResourceJobTaskEmailNotifications struct { @@ -645,12 +661,27 @@ type ResourceJobTaskSparkSubmitTask struct { Parameters []string `json:"parameters,omitempty"` } +type ResourceJobTaskSqlTaskAlertSubscriptions struct { + DestinationId string `json:"destination_id,omitempty"` + UserName string `json:"user_name,omitempty"` +} + type ResourceJobTaskSqlTaskAlert struct { - AlertId string `json:"alert_id"` + AlertId string `json:"alert_id"` + PauseSubscriptions bool `json:"pause_subscriptions,omitempty"` + Subscriptions []ResourceJobTaskSqlTaskAlertSubscriptions `json:"subscriptions,omitempty"` +} + +type ResourceJobTaskSqlTaskDashboardSubscriptions struct { + DestinationId string `json:"destination_id,omitempty"` + UserName string `json:"user_name,omitempty"` } type ResourceJobTaskSqlTaskDashboard struct { - DashboardId string `json:"dashboard_id"` + CustomSubject string `json:"custom_subject,omitempty"` + DashboardId string `json:"dashboard_id"` + PauseSubscriptions bool `json:"pause_subscriptions,omitempty"` + Subscriptions []ResourceJobTaskSqlTaskDashboardSubscriptions `json:"subscriptions,omitempty"` } type ResourceJobTaskSqlTaskFile struct { @@ -671,6 +702,7 @@ type ResourceJobTaskSqlTask struct { } type ResourceJobTask struct { + ComputeKey string `json:"compute_key,omitempty"` Description string `json:"description,omitempty"` ExistingClusterId string `json:"existing_cluster_id,omitempty"` JobClusterKey string `json:"job_cluster_key,omitempty"` @@ -680,6 +712,7 @@ type ResourceJobTask struct { RunIf string `json:"run_if,omitempty"` TaskKey string `json:"task_key,omitempty"` TimeoutSeconds int `json:"timeout_seconds,omitempty"` + ConditionTask *ResourceJobTaskConditionTask `json:"condition_task,omitempty"` DbtTask *ResourceJobTaskDbtTask `json:"dbt_task,omitempty"` DependsOn []ResourceJobTaskDependsOn `json:"depends_on,omitempty"` EmailNotifications *ResourceJobTaskEmailNotifications `json:"email_notifications,omitempty"` @@ -695,9 +728,9 @@ type ResourceJobTask struct { } type ResourceJobTriggerFileArrival struct { - MinTimeBetweenTriggerSeconds int `json:"min_time_between_trigger_seconds,omitempty"` - Url string `json:"url"` - WaitAfterLastChangeSeconds int `json:"wait_after_last_change_seconds,omitempty"` + MinTimeBetweenTriggersSeconds int `json:"min_time_between_triggers_seconds,omitempty"` + Url string `json:"url"` + WaitAfterLastChangeSeconds int `json:"wait_after_last_change_seconds,omitempty"` } type ResourceJobTrigger struct { @@ -736,6 +769,7 @@ type ResourceJob struct { Tags map[string]string `json:"tags,omitempty"` TimeoutSeconds int `json:"timeout_seconds,omitempty"` Url string `json:"url,omitempty"` + Compute []ResourceJobCompute `json:"compute,omitempty"` Continuous *ResourceJobContinuous `json:"continuous,omitempty"` DbtTask *ResourceJobDbtTask `json:"dbt_task,omitempty"` EmailNotifications *ResourceJobEmailNotifications `json:"email_notifications,omitempty"` diff --git a/bundle/internal/tf/schema/resource_model_serving.go b/bundle/internal/tf/schema/resource_model_serving.go index 6d5ff539..b7ff88cc 100644 --- a/bundle/internal/tf/schema/resource_model_serving.go +++ b/bundle/internal/tf/schema/resource_model_serving.go @@ -3,11 +3,12 @@ package schema type ResourceModelServingConfigServedModels struct { - ModelName string `json:"model_name"` - ModelVersion string `json:"model_version"` - Name string `json:"name,omitempty"` - ScaleToZeroEnabled bool `json:"scale_to_zero_enabled,omitempty"` - WorkloadSize string `json:"workload_size"` + EnvironmentVars map[string]string `json:"environment_vars,omitempty"` + ModelName string `json:"model_name"` + ModelVersion string `json:"model_version"` + Name string `json:"name,omitempty"` + ScaleToZeroEnabled bool `json:"scale_to_zero_enabled,omitempty"` + WorkloadSize string `json:"workload_size"` } type ResourceModelServingConfigTrafficConfigRoutes struct { diff --git a/bundle/internal/tf/schema/resource_service_principal.go b/bundle/internal/tf/schema/resource_service_principal.go index 86e17a99..bdbce227 100644 --- a/bundle/internal/tf/schema/resource_service_principal.go +++ b/bundle/internal/tf/schema/resource_service_principal.go @@ -8,6 +8,7 @@ type ResourceServicePrincipal struct { AllowInstancePoolCreate bool `json:"allow_instance_pool_create,omitempty"` ApplicationId string `json:"application_id,omitempty"` DatabricksSqlAccess bool `json:"databricks_sql_access,omitempty"` + DisableAsUserDeletion bool `json:"disable_as_user_deletion,omitempty"` DisplayName string `json:"display_name,omitempty"` ExternalId string `json:"external_id,omitempty"` Force bool `json:"force,omitempty"` diff --git a/bundle/internal/tf/schema/resource_sql_global_config.go b/bundle/internal/tf/schema/resource_sql_global_config.go index fbc5f0ec..62eddcee 100644 --- a/bundle/internal/tf/schema/resource_sql_global_config.go +++ b/bundle/internal/tf/schema/resource_sql_global_config.go @@ -5,6 +5,7 @@ package schema type ResourceSqlGlobalConfig struct { DataAccessConfig map[string]string `json:"data_access_config,omitempty"` EnableServerlessCompute bool `json:"enable_serverless_compute,omitempty"` + GoogleServiceAccount string `json:"google_service_account,omitempty"` Id string `json:"id,omitempty"` InstanceProfileArn string `json:"instance_profile_arn,omitempty"` SecurityPolicy string `json:"security_policy,omitempty"` diff --git a/bundle/internal/tf/schema/resource_user.go b/bundle/internal/tf/schema/resource_user.go index 9dd34c97..b9644093 100644 --- a/bundle/internal/tf/schema/resource_user.go +++ b/bundle/internal/tf/schema/resource_user.go @@ -7,6 +7,7 @@ type ResourceUser struct { AllowClusterCreate bool `json:"allow_cluster_create,omitempty"` AllowInstancePoolCreate bool `json:"allow_instance_pool_create,omitempty"` DatabricksSqlAccess bool `json:"databricks_sql_access,omitempty"` + DisableAsUserDeletion bool `json:"disable_as_user_deletion,omitempty"` DisplayName string `json:"display_name,omitempty"` ExternalId string `json:"external_id,omitempty"` Force bool `json:"force,omitempty"` diff --git a/bundle/internal/tf/schema/resources.go b/bundle/internal/tf/schema/resources.go index 0620bd03..7a0c2eb8 100644 --- a/bundle/internal/tf/schema/resources.go +++ b/bundle/internal/tf/schema/resources.go @@ -8,6 +8,7 @@ type Resources struct { AzureAdlsGen2Mount map[string]*ResourceAzureAdlsGen2Mount `json:"databricks_azure_adls_gen2_mount,omitempty"` AzureBlobMount map[string]*ResourceAzureBlobMount `json:"databricks_azure_blob_mount,omitempty"` Catalog map[string]*ResourceCatalog `json:"databricks_catalog,omitempty"` + CatalogWorkspaceBinding map[string]*ResourceCatalogWorkspaceBinding `json:"databricks_catalog_workspace_binding,omitempty"` Cluster map[string]*ResourceCluster `json:"databricks_cluster,omitempty"` ClusterPolicy map[string]*ResourceClusterPolicy `json:"databricks_cluster_policy,omitempty"` DbfsFile map[string]*ResourceDbfsFile `json:"databricks_dbfs_file,omitempty"` @@ -86,6 +87,7 @@ func NewResources() *Resources { AzureAdlsGen2Mount: make(map[string]*ResourceAzureAdlsGen2Mount), AzureBlobMount: make(map[string]*ResourceAzureBlobMount), Catalog: make(map[string]*ResourceCatalog), + CatalogWorkspaceBinding: make(map[string]*ResourceCatalogWorkspaceBinding), Cluster: make(map[string]*ResourceCluster), ClusterPolicy: make(map[string]*ResourceClusterPolicy), DbfsFile: make(map[string]*ResourceDbfsFile),