From d5a5f39dedff39a7f66bd34a7547b56b158f9a5c Mon Sep 17 00:00:00 2001 From: monalisa Date: Fri, 27 Oct 2023 00:32:40 +0200 Subject: [PATCH 1/4] Bump terraform provider version to v1.29 --- bundle/internal/tf/codegen/schema/version.go | 2 +- .../internal/tf/schema/data_source_cluster.go | 6 --- .../tf/schema/data_source_current_user.go | 15 ++++---- .../internal/tf/schema/data_source_group.go | 1 - .../tf/schema/data_source_instance_pool.go | 1 - bundle/internal/tf/schema/data_source_job.go | 37 ------------------- .../schema/data_source_service_principal.go | 17 ++++----- bundle/internal/tf/schema/data_source_user.go | 19 +++++----- bundle/internal/tf/schema/resource_catalog.go | 24 ++++++------ bundle/internal/tf/schema/resource_cluster.go | 6 --- .../tf/schema/resource_external_location.go | 32 +++++----------- bundle/internal/tf/schema/resource_grants.go | 2 - .../tf/schema/resource_instance_pool.go | 1 - bundle/internal/tf/schema/resource_job.go | 37 ------------------- .../internal/tf/schema/resource_metastore.go | 2 - .../schema/resource_metastore_data_access.go | 10 +---- .../tf/schema/resource_mlflow_model.go | 4 +- .../tf/schema/resource_model_serving.go | 8 ---- .../internal/tf/schema/resource_pipeline.go | 6 --- bundle/internal/tf/schema/resource_share.go | 1 - .../internal/tf/schema/resource_sql_alert.go | 27 ++++++-------- .../tf/schema/resource_sql_dashboard.go | 11 ++---- .../internal/tf/schema/resource_sql_query.go | 2 - .../internal/tf/schema/resource_sql_table.go | 2 +- .../tf/schema/resource_storage_credential.go | 6 +-- bundle/internal/tf/schema/resources.go | 6 --- bundle/internal/tf/schema/root.go | 2 +- 27 files changed, 69 insertions(+), 218 deletions(-) diff --git a/bundle/internal/tf/codegen/schema/version.go b/bundle/internal/tf/codegen/schema/version.go index c82218fc3..3269a9719 100644 --- a/bundle/internal/tf/codegen/schema/version.go +++ b/bundle/internal/tf/codegen/schema/version.go @@ -1,3 +1,3 @@ package schema -const ProviderVersion = "1.28.0" +const ProviderVersion = "1.29.0" diff --git a/bundle/internal/tf/schema/data_source_cluster.go b/bundle/internal/tf/schema/data_source_cluster.go index ce1ad034c..b5017402b 100644 --- a/bundle/internal/tf/schema/data_source_cluster.go +++ b/bundle/internal/tf/schema/data_source_cluster.go @@ -90,7 +90,6 @@ type DataSourceClusterClusterInfoGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -121,10 +120,6 @@ type DataSourceClusterClusterInfoInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type DataSourceClusterClusterInfoInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type DataSourceClusterClusterInfoInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -135,7 +130,6 @@ type DataSourceClusterClusterInfoInitScripts struct { File *DataSourceClusterClusterInfoInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceClusterClusterInfoInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceClusterClusterInfoInitScriptsS3 `json:"s3,omitempty"` - Volumes *DataSourceClusterClusterInfoInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceClusterClusterInfoInitScriptsWorkspace `json:"workspace,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_current_user.go b/bundle/internal/tf/schema/data_source_current_user.go index d59e64615..854a83b82 100644 --- a/bundle/internal/tf/schema/data_source_current_user.go +++ b/bundle/internal/tf/schema/data_source_current_user.go @@ -3,12 +3,11 @@ package schema type DataSourceCurrentUser struct { - AclPrincipalId string `json:"acl_principal_id,omitempty"` - Alphanumeric string `json:"alphanumeric,omitempty"` - ExternalId string `json:"external_id,omitempty"` - Home string `json:"home,omitempty"` - Id string `json:"id,omitempty"` - Repos string `json:"repos,omitempty"` - UserName string `json:"user_name,omitempty"` - WorkspaceUrl string `json:"workspace_url,omitempty"` + Alphanumeric string `json:"alphanumeric,omitempty"` + ExternalId string `json:"external_id,omitempty"` + Home string `json:"home,omitempty"` + Id string `json:"id,omitempty"` + Repos string `json:"repos,omitempty"` + UserName string `json:"user_name,omitempty"` + WorkspaceUrl string `json:"workspace_url,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_group.go b/bundle/internal/tf/schema/data_source_group.go index 862f3eac6..64b1d6900 100644 --- a/bundle/internal/tf/schema/data_source_group.go +++ b/bundle/internal/tf/schema/data_source_group.go @@ -3,7 +3,6 @@ package schema type DataSourceGroup struct { - AclPrincipalId string `json:"acl_principal_id,omitempty"` AllowClusterCreate bool `json:"allow_cluster_create,omitempty"` AllowInstancePoolCreate bool `json:"allow_instance_pool_create,omitempty"` ChildGroups []string `json:"child_groups,omitempty"` diff --git a/bundle/internal/tf/schema/data_source_instance_pool.go b/bundle/internal/tf/schema/data_source_instance_pool.go index 240083d64..498247174 100644 --- a/bundle/internal/tf/schema/data_source_instance_pool.go +++ b/bundle/internal/tf/schema/data_source_instance_pool.go @@ -26,7 +26,6 @@ type DataSourceInstancePoolPoolInfoDiskSpec struct { type DataSourceInstancePoolPoolInfoGcpAttributes struct { GcpAvailability string `json:"gcp_availability,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` } type DataSourceInstancePoolPoolInfoInstancePoolFleetAttributesFleetOnDemandOption struct { diff --git a/bundle/internal/tf/schema/data_source_job.go b/bundle/internal/tf/schema/data_source_job.go index 569c8b810..6d2d1aa9b 100644 --- a/bundle/internal/tf/schema/data_source_job.go +++ b/bundle/internal/tf/schema/data_source_job.go @@ -124,7 +124,6 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -155,10 +154,6 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -169,7 +164,6 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScripts struct { File *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -311,7 +305,6 @@ type DataSourceJobJobSettingsSettingsNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -342,10 +335,6 @@ type DataSourceJobJobSettingsSettingsNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type DataSourceJobJobSettingsSettingsNewClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type DataSourceJobJobSettingsSettingsNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -356,7 +345,6 @@ type DataSourceJobJobSettingsSettingsNewClusterInitScripts struct { File *DataSourceJobJobSettingsSettingsNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceJobJobSettingsSettingsNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceJobJobSettingsSettingsNewClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *DataSourceJobJobSettingsSettingsNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceJobJobSettingsSettingsNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -413,11 +401,6 @@ type DataSourceJobJobSettingsSettingsNotificationSettings struct { NoAlertForSkippedRuns bool `json:"no_alert_for_skipped_runs,omitempty"` } -type DataSourceJobJobSettingsSettingsParameter struct { - Default string `json:"default,omitempty"` - Name string `json:"name,omitempty"` -} - type DataSourceJobJobSettingsSettingsPipelineTask struct { FullRefresh bool `json:"full_refresh,omitempty"` PipelineId string `json:"pipeline_id"` @@ -431,7 +414,6 @@ type DataSourceJobJobSettingsSettingsPythonWheelTask struct { } type DataSourceJobJobSettingsSettingsQueue struct { - Enabled bool `json:"enabled"` } type DataSourceJobJobSettingsSettingsRunAs struct { @@ -439,11 +421,6 @@ type DataSourceJobJobSettingsSettingsRunAs struct { UserName string `json:"user_name,omitempty"` } -type DataSourceJobJobSettingsSettingsRunJobTask struct { - JobId int `json:"job_id"` - JobParameters map[string]string `json:"job_parameters,omitempty"` -} - type DataSourceJobJobSettingsSettingsSchedule struct { PauseStatus string `json:"pause_status,omitempty"` QuartzCronExpression string `json:"quartz_cron_expression"` @@ -596,7 +573,6 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -627,10 +603,6 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -641,7 +613,6 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterInitScripts struct { File *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -711,11 +682,6 @@ type DataSourceJobJobSettingsSettingsTaskPythonWheelTask struct { Parameters []string `json:"parameters,omitempty"` } -type DataSourceJobJobSettingsSettingsTaskRunJobTask struct { - JobId int `json:"job_id"` - JobParameters map[string]string `json:"job_parameters,omitempty"` -} - type DataSourceJobJobSettingsSettingsTaskSparkJarTask struct { JarUri string `json:"jar_uri,omitempty"` MainClassName string `json:"main_class_name,omitempty"` @@ -794,7 +760,6 @@ type DataSourceJobJobSettingsSettingsTask struct { NotificationSettings *DataSourceJobJobSettingsSettingsTaskNotificationSettings `json:"notification_settings,omitempty"` PipelineTask *DataSourceJobJobSettingsSettingsTaskPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *DataSourceJobJobSettingsSettingsTaskPythonWheelTask `json:"python_wheel_task,omitempty"` - RunJobTask *DataSourceJobJobSettingsSettingsTaskRunJobTask `json:"run_job_task,omitempty"` SparkJarTask *DataSourceJobJobSettingsSettingsTaskSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *DataSourceJobJobSettingsSettingsTaskSparkPythonTask `json:"spark_python_task,omitempty"` SparkSubmitTask *DataSourceJobJobSettingsSettingsTaskSparkSubmitTask `json:"spark_submit_task,omitempty"` @@ -856,12 +821,10 @@ type DataSourceJobJobSettingsSettings struct { NewCluster *DataSourceJobJobSettingsSettingsNewCluster `json:"new_cluster,omitempty"` NotebookTask *DataSourceJobJobSettingsSettingsNotebookTask `json:"notebook_task,omitempty"` NotificationSettings *DataSourceJobJobSettingsSettingsNotificationSettings `json:"notification_settings,omitempty"` - Parameter []DataSourceJobJobSettingsSettingsParameter `json:"parameter,omitempty"` PipelineTask *DataSourceJobJobSettingsSettingsPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *DataSourceJobJobSettingsSettingsPythonWheelTask `json:"python_wheel_task,omitempty"` Queue *DataSourceJobJobSettingsSettingsQueue `json:"queue,omitempty"` RunAs *DataSourceJobJobSettingsSettingsRunAs `json:"run_as,omitempty"` - RunJobTask *DataSourceJobJobSettingsSettingsRunJobTask `json:"run_job_task,omitempty"` Schedule *DataSourceJobJobSettingsSettingsSchedule `json:"schedule,omitempty"` SparkJarTask *DataSourceJobJobSettingsSettingsSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *DataSourceJobJobSettingsSettingsSparkPythonTask `json:"spark_python_task,omitempty"` diff --git a/bundle/internal/tf/schema/data_source_service_principal.go b/bundle/internal/tf/schema/data_source_service_principal.go index 7d29ea422..83d2d1316 100644 --- a/bundle/internal/tf/schema/data_source_service_principal.go +++ b/bundle/internal/tf/schema/data_source_service_principal.go @@ -3,13 +3,12 @@ package schema type DataSourceServicePrincipal struct { - AclPrincipalId string `json:"acl_principal_id,omitempty"` - Active bool `json:"active,omitempty"` - ApplicationId string `json:"application_id,omitempty"` - DisplayName string `json:"display_name,omitempty"` - ExternalId string `json:"external_id,omitempty"` - Home string `json:"home,omitempty"` - Id string `json:"id,omitempty"` - Repos string `json:"repos,omitempty"` - SpId string `json:"sp_id,omitempty"` + Active bool `json:"active,omitempty"` + ApplicationId string `json:"application_id,omitempty"` + DisplayName string `json:"display_name,omitempty"` + ExternalId string `json:"external_id,omitempty"` + Home string `json:"home,omitempty"` + Id string `json:"id,omitempty"` + Repos string `json:"repos,omitempty"` + SpId string `json:"sp_id,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_user.go b/bundle/internal/tf/schema/data_source_user.go index 78981f29b..3e3272e79 100644 --- a/bundle/internal/tf/schema/data_source_user.go +++ b/bundle/internal/tf/schema/data_source_user.go @@ -3,14 +3,13 @@ package schema type DataSourceUser struct { - AclPrincipalId string `json:"acl_principal_id,omitempty"` - Alphanumeric string `json:"alphanumeric,omitempty"` - ApplicationId string `json:"application_id,omitempty"` - DisplayName string `json:"display_name,omitempty"` - ExternalId string `json:"external_id,omitempty"` - Home string `json:"home,omitempty"` - Id string `json:"id,omitempty"` - Repos string `json:"repos,omitempty"` - UserId string `json:"user_id,omitempty"` - UserName string `json:"user_name,omitempty"` + Alphanumeric string `json:"alphanumeric,omitempty"` + ApplicationId string `json:"application_id,omitempty"` + DisplayName string `json:"display_name,omitempty"` + ExternalId string `json:"external_id,omitempty"` + Home string `json:"home,omitempty"` + Id string `json:"id,omitempty"` + Repos string `json:"repos,omitempty"` + UserId string `json:"user_id,omitempty"` + UserName string `json:"user_name,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_catalog.go b/bundle/internal/tf/schema/resource_catalog.go index a54f1c270..0ae591145 100644 --- a/bundle/internal/tf/schema/resource_catalog.go +++ b/bundle/internal/tf/schema/resource_catalog.go @@ -3,17 +3,15 @@ package schema type ResourceCatalog struct { - Comment string `json:"comment,omitempty"` - ConnectionName string `json:"connection_name,omitempty"` - ForceDestroy bool `json:"force_destroy,omitempty"` - Id string `json:"id,omitempty"` - IsolationMode string `json:"isolation_mode,omitempty"` - MetastoreId string `json:"metastore_id,omitempty"` - Name string `json:"name"` - Options map[string]string `json:"options,omitempty"` - Owner string `json:"owner,omitempty"` - Properties map[string]string `json:"properties,omitempty"` - ProviderName string `json:"provider_name,omitempty"` - ShareName string `json:"share_name,omitempty"` - StorageRoot string `json:"storage_root,omitempty"` + Comment string `json:"comment,omitempty"` + ForceDestroy bool `json:"force_destroy,omitempty"` + Id string `json:"id,omitempty"` + IsolationMode string `json:"isolation_mode,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` + Name string `json:"name"` + Owner string `json:"owner,omitempty"` + Properties map[string]string `json:"properties,omitempty"` + ProviderName string `json:"provider_name,omitempty"` + ShareName string `json:"share_name,omitempty"` + StorageRoot string `json:"storage_root,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_cluster.go b/bundle/internal/tf/schema/resource_cluster.go index 1d5a5ef25..a95b8c13a 100644 --- a/bundle/internal/tf/schema/resource_cluster.go +++ b/bundle/internal/tf/schema/resource_cluster.go @@ -68,7 +68,6 @@ type ResourceClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -99,10 +98,6 @@ type ResourceClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type ResourceClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type ResourceClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -113,7 +108,6 @@ type ResourceClusterInitScripts struct { File *ResourceClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *ResourceClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceClusterInitScriptsWorkspace `json:"workspace,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_external_location.go b/bundle/internal/tf/schema/resource_external_location.go index af64c677c..24e3fd0a2 100644 --- a/bundle/internal/tf/schema/resource_external_location.go +++ b/bundle/internal/tf/schema/resource_external_location.go @@ -2,27 +2,15 @@ package schema -type ResourceExternalLocationEncryptionDetailsSseEncryptionDetails struct { - Algorithm string `json:"algorithm,omitempty"` - AwsKmsKeyArn string `json:"aws_kms_key_arn,omitempty"` -} - -type ResourceExternalLocationEncryptionDetails struct { - SseEncryptionDetails *ResourceExternalLocationEncryptionDetailsSseEncryptionDetails `json:"sse_encryption_details,omitempty"` -} - type ResourceExternalLocation struct { - AccessPoint string `json:"access_point,omitempty"` - Comment string `json:"comment,omitempty"` - CredentialName string `json:"credential_name"` - ForceDestroy bool `json:"force_destroy,omitempty"` - ForceUpdate bool `json:"force_update,omitempty"` - Id string `json:"id,omitempty"` - MetastoreId string `json:"metastore_id,omitempty"` - Name string `json:"name"` - Owner string `json:"owner,omitempty"` - ReadOnly bool `json:"read_only,omitempty"` - SkipValidation bool `json:"skip_validation,omitempty"` - Url string `json:"url"` - EncryptionDetails *ResourceExternalLocationEncryptionDetails `json:"encryption_details,omitempty"` + Comment string `json:"comment,omitempty"` + CredentialName string `json:"credential_name"` + ForceDestroy bool `json:"force_destroy,omitempty"` + Id string `json:"id,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` + Name string `json:"name"` + Owner string `json:"owner,omitempty"` + ReadOnly bool `json:"read_only,omitempty"` + SkipValidation bool `json:"skip_validation,omitempty"` + Url string `json:"url"` } diff --git a/bundle/internal/tf/schema/resource_grants.go b/bundle/internal/tf/schema/resource_grants.go index 09b958f82..fb754cc62 100644 --- a/bundle/internal/tf/schema/resource_grants.go +++ b/bundle/internal/tf/schema/resource_grants.go @@ -10,12 +10,10 @@ type ResourceGrantsGrant struct { type ResourceGrants struct { Catalog string `json:"catalog,omitempty"` ExternalLocation string `json:"external_location,omitempty"` - ForeignConnection string `json:"foreign_connection,omitempty"` Function string `json:"function,omitempty"` Id string `json:"id,omitempty"` MaterializedView string `json:"materialized_view,omitempty"` Metastore string `json:"metastore,omitempty"` - Model string `json:"model,omitempty"` Schema string `json:"schema,omitempty"` Share string `json:"share,omitempty"` StorageCredential string `json:"storage_credential,omitempty"` diff --git a/bundle/internal/tf/schema/resource_instance_pool.go b/bundle/internal/tf/schema/resource_instance_pool.go index f524b3fce..2c3221217 100644 --- a/bundle/internal/tf/schema/resource_instance_pool.go +++ b/bundle/internal/tf/schema/resource_instance_pool.go @@ -26,7 +26,6 @@ type ResourceInstancePoolDiskSpec struct { type ResourceInstancePoolGcpAttributes struct { GcpAvailability string `json:"gcp_availability,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` } type ResourceInstancePoolInstancePoolFleetAttributesFleetOnDemandOption struct { diff --git a/bundle/internal/tf/schema/resource_job.go b/bundle/internal/tf/schema/resource_job.go index 7af075609..77b681ee5 100644 --- a/bundle/internal/tf/schema/resource_job.go +++ b/bundle/internal/tf/schema/resource_job.go @@ -124,7 +124,6 @@ type ResourceJobJobClusterNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -155,10 +154,6 @@ type ResourceJobJobClusterNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type ResourceJobJobClusterNewClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type ResourceJobJobClusterNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -169,7 +164,6 @@ type ResourceJobJobClusterNewClusterInitScripts struct { File *ResourceJobJobClusterNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceJobJobClusterNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceJobJobClusterNewClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *ResourceJobJobClusterNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceJobJobClusterNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -311,7 +305,6 @@ type ResourceJobNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -342,10 +335,6 @@ type ResourceJobNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type ResourceJobNewClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type ResourceJobNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -356,7 +345,6 @@ type ResourceJobNewClusterInitScripts struct { File *ResourceJobNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceJobNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceJobNewClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *ResourceJobNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceJobNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -413,11 +401,6 @@ type ResourceJobNotificationSettings struct { NoAlertForSkippedRuns bool `json:"no_alert_for_skipped_runs,omitempty"` } -type ResourceJobParameter struct { - Default string `json:"default,omitempty"` - Name string `json:"name,omitempty"` -} - type ResourceJobPipelineTask struct { FullRefresh bool `json:"full_refresh,omitempty"` PipelineId string `json:"pipeline_id"` @@ -431,7 +414,6 @@ type ResourceJobPythonWheelTask struct { } type ResourceJobQueue struct { - Enabled bool `json:"enabled"` } type ResourceJobRunAs struct { @@ -439,11 +421,6 @@ type ResourceJobRunAs struct { UserName string `json:"user_name,omitempty"` } -type ResourceJobRunJobTask struct { - JobId int `json:"job_id"` - JobParameters map[string]string `json:"job_parameters,omitempty"` -} - type ResourceJobSchedule struct { PauseStatus string `json:"pause_status,omitempty"` QuartzCronExpression string `json:"quartz_cron_expression"` @@ -596,7 +573,6 @@ type ResourceJobTaskNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -627,10 +603,6 @@ type ResourceJobTaskNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type ResourceJobTaskNewClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type ResourceJobTaskNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -641,7 +613,6 @@ type ResourceJobTaskNewClusterInitScripts struct { File *ResourceJobTaskNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceJobTaskNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceJobTaskNewClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *ResourceJobTaskNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceJobTaskNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -711,11 +682,6 @@ type ResourceJobTaskPythonWheelTask struct { Parameters []string `json:"parameters,omitempty"` } -type ResourceJobTaskRunJobTask struct { - JobId int `json:"job_id"` - JobParameters map[string]string `json:"job_parameters,omitempty"` -} - type ResourceJobTaskSparkJarTask struct { JarUri string `json:"jar_uri,omitempty"` MainClassName string `json:"main_class_name,omitempty"` @@ -794,7 +760,6 @@ type ResourceJobTask struct { NotificationSettings *ResourceJobTaskNotificationSettings `json:"notification_settings,omitempty"` PipelineTask *ResourceJobTaskPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *ResourceJobTaskPythonWheelTask `json:"python_wheel_task,omitempty"` - RunJobTask *ResourceJobTaskRunJobTask `json:"run_job_task,omitempty"` SparkJarTask *ResourceJobTaskSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *ResourceJobTaskSparkPythonTask `json:"spark_python_task,omitempty"` SparkSubmitTask *ResourceJobTaskSparkSubmitTask `json:"spark_submit_task,omitempty"` @@ -860,12 +825,10 @@ type ResourceJob struct { NewCluster *ResourceJobNewCluster `json:"new_cluster,omitempty"` NotebookTask *ResourceJobNotebookTask `json:"notebook_task,omitempty"` NotificationSettings *ResourceJobNotificationSettings `json:"notification_settings,omitempty"` - Parameter []ResourceJobParameter `json:"parameter,omitempty"` PipelineTask *ResourceJobPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *ResourceJobPythonWheelTask `json:"python_wheel_task,omitempty"` Queue *ResourceJobQueue `json:"queue,omitempty"` RunAs *ResourceJobRunAs `json:"run_as,omitempty"` - RunJobTask *ResourceJobRunJobTask `json:"run_job_task,omitempty"` Schedule *ResourceJobSchedule `json:"schedule,omitempty"` SparkJarTask *ResourceJobSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *ResourceJobSparkPythonTask `json:"spark_python_task,omitempty"` diff --git a/bundle/internal/tf/schema/resource_metastore.go b/bundle/internal/tf/schema/resource_metastore.go index 3561d2bfa..24e502657 100644 --- a/bundle/internal/tf/schema/resource_metastore.go +++ b/bundle/internal/tf/schema/resource_metastore.go @@ -13,12 +13,10 @@ type ResourceMetastore struct { ForceDestroy bool `json:"force_destroy,omitempty"` GlobalMetastoreId string `json:"global_metastore_id,omitempty"` Id string `json:"id,omitempty"` - MetastoreId string `json:"metastore_id,omitempty"` Name string `json:"name"` Owner string `json:"owner,omitempty"` Region string `json:"region,omitempty"` StorageRoot string `json:"storage_root"` - StorageRootCredentialId string `json:"storage_root_credential_id,omitempty"` UpdatedAt int `json:"updated_at,omitempty"` UpdatedBy string `json:"updated_by,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_metastore_data_access.go b/bundle/internal/tf/schema/resource_metastore_data_access.go index 86df5e4be..6d26776d8 100644 --- a/bundle/internal/tf/schema/resource_metastore_data_access.go +++ b/bundle/internal/tf/schema/resource_metastore_data_access.go @@ -8,8 +8,6 @@ type ResourceMetastoreDataAccessAwsIamRole struct { type ResourceMetastoreDataAccessAzureManagedIdentity struct { AccessConnectorId string `json:"access_connector_id"` - CredentialId string `json:"credential_id,omitempty"` - ManagedIdentityId string `json:"managed_identity_id,omitempty"` } type ResourceMetastoreDataAccessAzureServicePrincipal struct { @@ -19,8 +17,7 @@ type ResourceMetastoreDataAccessAzureServicePrincipal struct { } type ResourceMetastoreDataAccessDatabricksGcpServiceAccount struct { - CredentialId string `json:"credential_id,omitempty"` - Email string `json:"email,omitempty"` + Email string `json:"email,omitempty"` } type ResourceMetastoreDataAccessGcpServiceAccountKey struct { @@ -30,14 +27,11 @@ type ResourceMetastoreDataAccessGcpServiceAccountKey struct { } type ResourceMetastoreDataAccess struct { - Comment string `json:"comment,omitempty"` - ForceDestroy bool `json:"force_destroy,omitempty"` + ConfigurationType string `json:"configuration_type,omitempty"` Id string `json:"id,omitempty"` IsDefault bool `json:"is_default,omitempty"` MetastoreId string `json:"metastore_id"` Name string `json:"name"` - Owner string `json:"owner,omitempty"` - ReadOnly bool `json:"read_only,omitempty"` AwsIamRole *ResourceMetastoreDataAccessAwsIamRole `json:"aws_iam_role,omitempty"` AzureManagedIdentity *ResourceMetastoreDataAccessAzureManagedIdentity `json:"azure_managed_identity,omitempty"` AzureServicePrincipal *ResourceMetastoreDataAccessAzureServicePrincipal `json:"azure_service_principal,omitempty"` diff --git a/bundle/internal/tf/schema/resource_mlflow_model.go b/bundle/internal/tf/schema/resource_mlflow_model.go index 406c124f2..90c1f61dd 100644 --- a/bundle/internal/tf/schema/resource_mlflow_model.go +++ b/bundle/internal/tf/schema/resource_mlflow_model.go @@ -3,8 +3,8 @@ package schema type ResourceMlflowModelTags struct { - Key string `json:"key,omitempty"` - Value string `json:"value,omitempty"` + Key string `json:"key"` + Value string `json:"value"` } type ResourceMlflowModel struct { diff --git a/bundle/internal/tf/schema/resource_model_serving.go b/bundle/internal/tf/schema/resource_model_serving.go index b0cabbe5a..b7ff88ccd 100644 --- a/bundle/internal/tf/schema/resource_model_serving.go +++ b/bundle/internal/tf/schema/resource_model_serving.go @@ -4,13 +4,11 @@ package schema type ResourceModelServingConfigServedModels struct { EnvironmentVars map[string]string `json:"environment_vars,omitempty"` - InstanceProfileArn string `json:"instance_profile_arn,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"` - WorkloadType string `json:"workload_type,omitempty"` } type ResourceModelServingConfigTrafficConfigRoutes struct { @@ -27,15 +25,9 @@ type ResourceModelServingConfig struct { TrafficConfig *ResourceModelServingConfigTrafficConfig `json:"traffic_config,omitempty"` } -type ResourceModelServingTags struct { - Key string `json:"key"` - Value string `json:"value,omitempty"` -} - type ResourceModelServing struct { Id string `json:"id,omitempty"` Name string `json:"name"` ServingEndpointId string `json:"serving_endpoint_id,omitempty"` Config *ResourceModelServingConfig `json:"config,omitempty"` - Tags []ResourceModelServingTags `json:"tags,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_pipeline.go b/bundle/internal/tf/schema/resource_pipeline.go index 72354f621..9e7f71b11 100644 --- a/bundle/internal/tf/schema/resource_pipeline.go +++ b/bundle/internal/tf/schema/resource_pipeline.go @@ -47,7 +47,6 @@ type ResourcePipelineClusterClusterLogConf struct { type ResourcePipelineClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` - LocalSsdCount int `json:"local_ssd_count,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -77,10 +76,6 @@ type ResourcePipelineClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } -type ResourcePipelineClusterInitScriptsVolumes struct { - Destination string `json:"destination,omitempty"` -} - type ResourcePipelineClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -91,7 +86,6 @@ type ResourcePipelineClusterInitScripts struct { File *ResourcePipelineClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourcePipelineClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourcePipelineClusterInitScriptsS3 `json:"s3,omitempty"` - Volumes *ResourcePipelineClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourcePipelineClusterInitScriptsWorkspace `json:"workspace,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_share.go b/bundle/internal/tf/schema/resource_share.go index e531e7770..72d7f8104 100644 --- a/bundle/internal/tf/schema/resource_share.go +++ b/bundle/internal/tf/schema/resource_share.go @@ -32,6 +32,5 @@ type ResourceShare struct { CreatedBy string `json:"created_by,omitempty"` Id string `json:"id,omitempty"` Name string `json:"name"` - Owner string `json:"owner,omitempty"` Object []ResourceShareObject `json:"object,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_alert.go b/bundle/internal/tf/schema/resource_sql_alert.go index a9768fd8e..22a369d46 100644 --- a/bundle/internal/tf/schema/resource_sql_alert.go +++ b/bundle/internal/tf/schema/resource_sql_alert.go @@ -3,22 +3,19 @@ package schema type ResourceSqlAlertOptions struct { - Column string `json:"column"` - CustomBody string `json:"custom_body,omitempty"` - CustomSubject string `json:"custom_subject,omitempty"` - EmptyResultState string `json:"empty_result_state,omitempty"` - Muted bool `json:"muted,omitempty"` - Op string `json:"op"` - Value string `json:"value"` + Column string `json:"column"` + CustomBody string `json:"custom_body,omitempty"` + CustomSubject string `json:"custom_subject,omitempty"` + Muted bool `json:"muted,omitempty"` + Op string `json:"op"` + Value string `json:"value"` } type ResourceSqlAlert struct { - CreatedAt string `json:"created_at,omitempty"` - Id string `json:"id,omitempty"` - Name string `json:"name"` - Parent string `json:"parent,omitempty"` - QueryId string `json:"query_id"` - Rearm int `json:"rearm,omitempty"` - UpdatedAt string `json:"updated_at,omitempty"` - Options *ResourceSqlAlertOptions `json:"options,omitempty"` + Id string `json:"id,omitempty"` + Name string `json:"name"` + Parent string `json:"parent,omitempty"` + QueryId string `json:"query_id"` + Rearm int `json:"rearm,omitempty"` + Options *ResourceSqlAlertOptions `json:"options,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_dashboard.go b/bundle/internal/tf/schema/resource_sql_dashboard.go index fc97bbdec..5c3bd896b 100644 --- a/bundle/internal/tf/schema/resource_sql_dashboard.go +++ b/bundle/internal/tf/schema/resource_sql_dashboard.go @@ -3,11 +3,8 @@ package schema type ResourceSqlDashboard struct { - CreatedAt string `json:"created_at,omitempty"` - DashboardFiltersEnabled bool `json:"dashboard_filters_enabled,omitempty"` - Id string `json:"id,omitempty"` - Name string `json:"name"` - Parent string `json:"parent,omitempty"` - Tags []string `json:"tags,omitempty"` - UpdatedAt string `json:"updated_at,omitempty"` + Id string `json:"id,omitempty"` + Name string `json:"name"` + Parent string `json:"parent,omitempty"` + Tags []string `json:"tags,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_query.go b/bundle/internal/tf/schema/resource_sql_query.go index 27c653fc6..5016d8d72 100644 --- a/bundle/internal/tf/schema/resource_sql_query.go +++ b/bundle/internal/tf/schema/resource_sql_query.go @@ -118,7 +118,6 @@ type ResourceSqlQuerySchedule struct { } type ResourceSqlQuery struct { - CreatedAt string `json:"created_at,omitempty"` DataSourceId string `json:"data_source_id"` Description string `json:"description,omitempty"` Id string `json:"id,omitempty"` @@ -127,7 +126,6 @@ type ResourceSqlQuery struct { Query string `json:"query"` RunAsRole string `json:"run_as_role,omitempty"` Tags []string `json:"tags,omitempty"` - UpdatedAt string `json:"updated_at,omitempty"` Parameter []ResourceSqlQueryParameter `json:"parameter,omitempty"` Schedule *ResourceSqlQuerySchedule `json:"schedule,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_table.go b/bundle/internal/tf/schema/resource_sql_table.go index 077645c2f..2891975c3 100644 --- a/bundle/internal/tf/schema/resource_sql_table.go +++ b/bundle/internal/tf/schema/resource_sql_table.go @@ -6,7 +6,7 @@ type ResourceSqlTableColumn struct { Comment string `json:"comment,omitempty"` Name string `json:"name"` Nullable bool `json:"nullable,omitempty"` - Type string `json:"type,omitempty"` + Type string `json:"type"` } type ResourceSqlTable struct { diff --git a/bundle/internal/tf/schema/resource_storage_credential.go b/bundle/internal/tf/schema/resource_storage_credential.go index 1687c79ab..eab5810b3 100644 --- a/bundle/internal/tf/schema/resource_storage_credential.go +++ b/bundle/internal/tf/schema/resource_storage_credential.go @@ -8,8 +8,6 @@ type ResourceStorageCredentialAwsIamRole struct { type ResourceStorageCredentialAzureManagedIdentity struct { AccessConnectorId string `json:"access_connector_id"` - CredentialId string `json:"credential_id,omitempty"` - ManagedIdentityId string `json:"managed_identity_id,omitempty"` } type ResourceStorageCredentialAzureServicePrincipal struct { @@ -19,8 +17,7 @@ type ResourceStorageCredentialAzureServicePrincipal struct { } type ResourceStorageCredentialDatabricksGcpServiceAccount struct { - CredentialId string `json:"credential_id,omitempty"` - Email string `json:"email,omitempty"` + Email string `json:"email,omitempty"` } type ResourceStorageCredentialGcpServiceAccountKey struct { @@ -31,7 +28,6 @@ type ResourceStorageCredentialGcpServiceAccountKey struct { type ResourceStorageCredential struct { Comment string `json:"comment,omitempty"` - ForceDestroy bool `json:"force_destroy,omitempty"` Id string `json:"id,omitempty"` MetastoreId string `json:"metastore_id,omitempty"` Name string `json:"name"` diff --git a/bundle/internal/tf/schema/resources.go b/bundle/internal/tf/schema/resources.go index cf98f9a91..c2361254a 100644 --- a/bundle/internal/tf/schema/resources.go +++ b/bundle/internal/tf/schema/resources.go @@ -12,7 +12,6 @@ type Resources struct { 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"` - Connection map[string]*ResourceConnection `json:"databricks_connection,omitempty"` DbfsFile map[string]*ResourceDbfsFile `json:"databricks_dbfs_file,omitempty"` Directory map[string]*ResourceDirectory `json:"databricks_directory,omitempty"` Entitlements map[string]*ResourceEntitlements `json:"databricks_entitlements,omitempty"` @@ -53,7 +52,6 @@ type Resources struct { Pipeline map[string]*ResourcePipeline `json:"databricks_pipeline,omitempty"` Provider map[string]*ResourceProvider `json:"databricks_provider,omitempty"` Recipient map[string]*ResourceRecipient `json:"databricks_recipient,omitempty"` - RegisteredModel map[string]*ResourceRegisteredModel `json:"databricks_registered_model,omitempty"` Repo map[string]*ResourceRepo `json:"databricks_repo,omitempty"` Schema map[string]*ResourceSchema `json:"databricks_schema,omitempty"` Secret map[string]*ResourceSecret `json:"databricks_secret,omitempty"` @@ -73,7 +71,6 @@ type Resources struct { SqlVisualization map[string]*ResourceSqlVisualization `json:"databricks_sql_visualization,omitempty"` SqlWidget map[string]*ResourceSqlWidget `json:"databricks_sql_widget,omitempty"` StorageCredential map[string]*ResourceStorageCredential `json:"databricks_storage_credential,omitempty"` - SystemSchema map[string]*ResourceSystemSchema `json:"databricks_system_schema,omitempty"` Table map[string]*ResourceTable `json:"databricks_table,omitempty"` Token map[string]*ResourceToken `json:"databricks_token,omitempty"` User map[string]*ResourceUser `json:"databricks_user,omitempty"` @@ -95,7 +92,6 @@ func NewResources() *Resources { CatalogWorkspaceBinding: make(map[string]*ResourceCatalogWorkspaceBinding), Cluster: make(map[string]*ResourceCluster), ClusterPolicy: make(map[string]*ResourceClusterPolicy), - Connection: make(map[string]*ResourceConnection), DbfsFile: make(map[string]*ResourceDbfsFile), Directory: make(map[string]*ResourceDirectory), Entitlements: make(map[string]*ResourceEntitlements), @@ -136,7 +132,6 @@ func NewResources() *Resources { Pipeline: make(map[string]*ResourcePipeline), Provider: make(map[string]*ResourceProvider), Recipient: make(map[string]*ResourceRecipient), - RegisteredModel: make(map[string]*ResourceRegisteredModel), Repo: make(map[string]*ResourceRepo), Schema: make(map[string]*ResourceSchema), Secret: make(map[string]*ResourceSecret), @@ -156,7 +151,6 @@ func NewResources() *Resources { SqlVisualization: make(map[string]*ResourceSqlVisualization), SqlWidget: make(map[string]*ResourceSqlWidget), StorageCredential: make(map[string]*ResourceStorageCredential), - SystemSchema: make(map[string]*ResourceSystemSchema), Table: make(map[string]*ResourceTable), Token: make(map[string]*ResourceToken), User: make(map[string]*ResourceUser), diff --git a/bundle/internal/tf/schema/root.go b/bundle/internal/tf/schema/root.go index 74f4db1a2..b1b5d7e05 100644 --- a/bundle/internal/tf/schema/root.go +++ b/bundle/internal/tf/schema/root.go @@ -24,7 +24,7 @@ func NewRoot() *Root { "required_providers": map[string]interface{}{ "databricks": map[string]interface{}{ "source": "databricks/databricks", - "version": "1.28.0", + "version": "1.29.0", }, }, }, From 38894b64445ba78189f642ba3f74c6dece034a84 Mon Sep 17 00:00:00 2001 From: monalisa Date: Fri, 27 Oct 2023 00:40:28 +0200 Subject: [PATCH 2/4] actually update provider schema --- .../internal/tf/schema/data_source_cluster.go | 6 +++ .../tf/schema/data_source_current_user.go | 15 ++++--- .../internal/tf/schema/data_source_group.go | 1 + .../tf/schema/data_source_instance_pool.go | 1 + bundle/internal/tf/schema/data_source_job.go | 43 +++++++++++++++++++ .../schema/data_source_service_principal.go | 17 ++++---- bundle/internal/tf/schema/data_source_user.go | 19 ++++---- .../tf/schema/resource_artifact_allowlist.go | 17 ++++++++ bundle/internal/tf/schema/resource_catalog.go | 24 ++++++----- bundle/internal/tf/schema/resource_cluster.go | 6 +++ .../tf/schema/resource_external_location.go | 32 +++++++++----- bundle/internal/tf/schema/resource_grants.go | 2 + .../tf/schema/resource_instance_pool.go | 1 + bundle/internal/tf/schema/resource_job.go | 43 +++++++++++++++++++ .../internal/tf/schema/resource_metastore.go | 2 + .../schema/resource_metastore_data_access.go | 10 ++++- .../tf/schema/resource_mlflow_model.go | 4 +- .../tf/schema/resource_model_serving.go | 8 ++++ .../internal/tf/schema/resource_pipeline.go | 6 +++ bundle/internal/tf/schema/resource_share.go | 1 + .../internal/tf/schema/resource_sql_alert.go | 27 ++++++------ .../tf/schema/resource_sql_dashboard.go | 11 +++-- .../internal/tf/schema/resource_sql_query.go | 2 + .../internal/tf/schema/resource_sql_table.go | 6 ++- .../tf/schema/resource_storage_credential.go | 6 ++- bundle/internal/tf/schema/resources.go | 8 ++++ 26 files changed, 251 insertions(+), 67 deletions(-) create mode 100644 bundle/internal/tf/schema/resource_artifact_allowlist.go diff --git a/bundle/internal/tf/schema/data_source_cluster.go b/bundle/internal/tf/schema/data_source_cluster.go index b5017402b..ce1ad034c 100644 --- a/bundle/internal/tf/schema/data_source_cluster.go +++ b/bundle/internal/tf/schema/data_source_cluster.go @@ -90,6 +90,7 @@ type DataSourceClusterClusterInfoGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -120,6 +121,10 @@ type DataSourceClusterClusterInfoInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type DataSourceClusterClusterInfoInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type DataSourceClusterClusterInfoInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -130,6 +135,7 @@ type DataSourceClusterClusterInfoInitScripts struct { File *DataSourceClusterClusterInfoInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceClusterClusterInfoInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceClusterClusterInfoInitScriptsS3 `json:"s3,omitempty"` + Volumes *DataSourceClusterClusterInfoInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceClusterClusterInfoInitScriptsWorkspace `json:"workspace,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_current_user.go b/bundle/internal/tf/schema/data_source_current_user.go index 854a83b82..d59e64615 100644 --- a/bundle/internal/tf/schema/data_source_current_user.go +++ b/bundle/internal/tf/schema/data_source_current_user.go @@ -3,11 +3,12 @@ package schema type DataSourceCurrentUser struct { - Alphanumeric string `json:"alphanumeric,omitempty"` - ExternalId string `json:"external_id,omitempty"` - Home string `json:"home,omitempty"` - Id string `json:"id,omitempty"` - Repos string `json:"repos,omitempty"` - UserName string `json:"user_name,omitempty"` - WorkspaceUrl string `json:"workspace_url,omitempty"` + AclPrincipalId string `json:"acl_principal_id,omitempty"` + Alphanumeric string `json:"alphanumeric,omitempty"` + ExternalId string `json:"external_id,omitempty"` + Home string `json:"home,omitempty"` + Id string `json:"id,omitempty"` + Repos string `json:"repos,omitempty"` + UserName string `json:"user_name,omitempty"` + WorkspaceUrl string `json:"workspace_url,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_group.go b/bundle/internal/tf/schema/data_source_group.go index 64b1d6900..862f3eac6 100644 --- a/bundle/internal/tf/schema/data_source_group.go +++ b/bundle/internal/tf/schema/data_source_group.go @@ -3,6 +3,7 @@ package schema type DataSourceGroup struct { + AclPrincipalId string `json:"acl_principal_id,omitempty"` AllowClusterCreate bool `json:"allow_cluster_create,omitempty"` AllowInstancePoolCreate bool `json:"allow_instance_pool_create,omitempty"` ChildGroups []string `json:"child_groups,omitempty"` diff --git a/bundle/internal/tf/schema/data_source_instance_pool.go b/bundle/internal/tf/schema/data_source_instance_pool.go index 498247174..240083d64 100644 --- a/bundle/internal/tf/schema/data_source_instance_pool.go +++ b/bundle/internal/tf/schema/data_source_instance_pool.go @@ -26,6 +26,7 @@ type DataSourceInstancePoolPoolInfoDiskSpec struct { type DataSourceInstancePoolPoolInfoGcpAttributes struct { GcpAvailability string `json:"gcp_availability,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` } type DataSourceInstancePoolPoolInfoInstancePoolFleetAttributesFleetOnDemandOption struct { diff --git a/bundle/internal/tf/schema/data_source_job.go b/bundle/internal/tf/schema/data_source_job.go index 6d2d1aa9b..49be8f013 100644 --- a/bundle/internal/tf/schema/data_source_job.go +++ b/bundle/internal/tf/schema/data_source_job.go @@ -24,6 +24,11 @@ type DataSourceJobJobSettingsSettingsDbtTask struct { WarehouseId string `json:"warehouse_id,omitempty"` } +type DataSourceJobJobSettingsSettingsDeployment struct { + Kind string `json:"kind"` + MetadataFilePath string `json:"metadata_file_path,omitempty"` +} + type DataSourceJobJobSettingsSettingsEmailNotifications struct { AlertOnLastAttempt bool `json:"alert_on_last_attempt,omitempty"` NoAlertForSkippedRuns bool `json:"no_alert_for_skipped_runs,omitempty"` @@ -124,6 +129,7 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -154,6 +160,10 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -164,6 +174,7 @@ type DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScripts struct { File *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceJobJobSettingsSettingsJobClusterNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -305,6 +316,7 @@ type DataSourceJobJobSettingsSettingsNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -335,6 +347,10 @@ type DataSourceJobJobSettingsSettingsNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type DataSourceJobJobSettingsSettingsNewClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type DataSourceJobJobSettingsSettingsNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -345,6 +361,7 @@ type DataSourceJobJobSettingsSettingsNewClusterInitScripts struct { File *DataSourceJobJobSettingsSettingsNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceJobJobSettingsSettingsNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceJobJobSettingsSettingsNewClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *DataSourceJobJobSettingsSettingsNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceJobJobSettingsSettingsNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -401,6 +418,11 @@ type DataSourceJobJobSettingsSettingsNotificationSettings struct { NoAlertForSkippedRuns bool `json:"no_alert_for_skipped_runs,omitempty"` } +type DataSourceJobJobSettingsSettingsParameter struct { + Default string `json:"default,omitempty"` + Name string `json:"name,omitempty"` +} + type DataSourceJobJobSettingsSettingsPipelineTask struct { FullRefresh bool `json:"full_refresh,omitempty"` PipelineId string `json:"pipeline_id"` @@ -414,6 +436,7 @@ type DataSourceJobJobSettingsSettingsPythonWheelTask struct { } type DataSourceJobJobSettingsSettingsQueue struct { + Enabled bool `json:"enabled"` } type DataSourceJobJobSettingsSettingsRunAs struct { @@ -421,6 +444,11 @@ type DataSourceJobJobSettingsSettingsRunAs struct { UserName string `json:"user_name,omitempty"` } +type DataSourceJobJobSettingsSettingsRunJobTask struct { + JobId int `json:"job_id"` + JobParameters map[string]string `json:"job_parameters,omitempty"` +} + type DataSourceJobJobSettingsSettingsSchedule struct { PauseStatus string `json:"pause_status,omitempty"` QuartzCronExpression string `json:"quartz_cron_expression"` @@ -573,6 +601,7 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -603,6 +632,10 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -613,6 +646,7 @@ type DataSourceJobJobSettingsSettingsTaskNewClusterInitScripts struct { File *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *DataSourceJobJobSettingsSettingsTaskNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -682,6 +716,11 @@ type DataSourceJobJobSettingsSettingsTaskPythonWheelTask struct { Parameters []string `json:"parameters,omitempty"` } +type DataSourceJobJobSettingsSettingsTaskRunJobTask struct { + JobId int `json:"job_id"` + JobParameters map[string]string `json:"job_parameters,omitempty"` +} + type DataSourceJobJobSettingsSettingsTaskSparkJarTask struct { JarUri string `json:"jar_uri,omitempty"` MainClassName string `json:"main_class_name,omitempty"` @@ -760,6 +799,7 @@ type DataSourceJobJobSettingsSettingsTask struct { NotificationSettings *DataSourceJobJobSettingsSettingsTaskNotificationSettings `json:"notification_settings,omitempty"` PipelineTask *DataSourceJobJobSettingsSettingsTaskPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *DataSourceJobJobSettingsSettingsTaskPythonWheelTask `json:"python_wheel_task,omitempty"` + RunJobTask *DataSourceJobJobSettingsSettingsTaskRunJobTask `json:"run_job_task,omitempty"` SparkJarTask *DataSourceJobJobSettingsSettingsTaskSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *DataSourceJobJobSettingsSettingsTaskSparkPythonTask `json:"spark_python_task,omitempty"` SparkSubmitTask *DataSourceJobJobSettingsSettingsTaskSparkSubmitTask `json:"spark_submit_task,omitempty"` @@ -813,6 +853,7 @@ type DataSourceJobJobSettingsSettings struct { Compute []DataSourceJobJobSettingsSettingsCompute `json:"compute,omitempty"` Continuous *DataSourceJobJobSettingsSettingsContinuous `json:"continuous,omitempty"` DbtTask *DataSourceJobJobSettingsSettingsDbtTask `json:"dbt_task,omitempty"` + Deployment *DataSourceJobJobSettingsSettingsDeployment `json:"deployment,omitempty"` EmailNotifications *DataSourceJobJobSettingsSettingsEmailNotifications `json:"email_notifications,omitempty"` GitSource *DataSourceJobJobSettingsSettingsGitSource `json:"git_source,omitempty"` Health *DataSourceJobJobSettingsSettingsHealth `json:"health,omitempty"` @@ -821,10 +862,12 @@ type DataSourceJobJobSettingsSettings struct { NewCluster *DataSourceJobJobSettingsSettingsNewCluster `json:"new_cluster,omitempty"` NotebookTask *DataSourceJobJobSettingsSettingsNotebookTask `json:"notebook_task,omitempty"` NotificationSettings *DataSourceJobJobSettingsSettingsNotificationSettings `json:"notification_settings,omitempty"` + Parameter []DataSourceJobJobSettingsSettingsParameter `json:"parameter,omitempty"` PipelineTask *DataSourceJobJobSettingsSettingsPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *DataSourceJobJobSettingsSettingsPythonWheelTask `json:"python_wheel_task,omitempty"` Queue *DataSourceJobJobSettingsSettingsQueue `json:"queue,omitempty"` RunAs *DataSourceJobJobSettingsSettingsRunAs `json:"run_as,omitempty"` + RunJobTask *DataSourceJobJobSettingsSettingsRunJobTask `json:"run_job_task,omitempty"` Schedule *DataSourceJobJobSettingsSettingsSchedule `json:"schedule,omitempty"` SparkJarTask *DataSourceJobJobSettingsSettingsSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *DataSourceJobJobSettingsSettingsSparkPythonTask `json:"spark_python_task,omitempty"` diff --git a/bundle/internal/tf/schema/data_source_service_principal.go b/bundle/internal/tf/schema/data_source_service_principal.go index 83d2d1316..7d29ea422 100644 --- a/bundle/internal/tf/schema/data_source_service_principal.go +++ b/bundle/internal/tf/schema/data_source_service_principal.go @@ -3,12 +3,13 @@ package schema type DataSourceServicePrincipal struct { - Active bool `json:"active,omitempty"` - ApplicationId string `json:"application_id,omitempty"` - DisplayName string `json:"display_name,omitempty"` - ExternalId string `json:"external_id,omitempty"` - Home string `json:"home,omitempty"` - Id string `json:"id,omitempty"` - Repos string `json:"repos,omitempty"` - SpId string `json:"sp_id,omitempty"` + AclPrincipalId string `json:"acl_principal_id,omitempty"` + Active bool `json:"active,omitempty"` + ApplicationId string `json:"application_id,omitempty"` + DisplayName string `json:"display_name,omitempty"` + ExternalId string `json:"external_id,omitempty"` + Home string `json:"home,omitempty"` + Id string `json:"id,omitempty"` + Repos string `json:"repos,omitempty"` + SpId string `json:"sp_id,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_user.go b/bundle/internal/tf/schema/data_source_user.go index 3e3272e79..78981f29b 100644 --- a/bundle/internal/tf/schema/data_source_user.go +++ b/bundle/internal/tf/schema/data_source_user.go @@ -3,13 +3,14 @@ package schema type DataSourceUser struct { - Alphanumeric string `json:"alphanumeric,omitempty"` - ApplicationId string `json:"application_id,omitempty"` - DisplayName string `json:"display_name,omitempty"` - ExternalId string `json:"external_id,omitempty"` - Home string `json:"home,omitempty"` - Id string `json:"id,omitempty"` - Repos string `json:"repos,omitempty"` - UserId string `json:"user_id,omitempty"` - UserName string `json:"user_name,omitempty"` + AclPrincipalId string `json:"acl_principal_id,omitempty"` + Alphanumeric string `json:"alphanumeric,omitempty"` + ApplicationId string `json:"application_id,omitempty"` + DisplayName string `json:"display_name,omitempty"` + ExternalId string `json:"external_id,omitempty"` + Home string `json:"home,omitempty"` + Id string `json:"id,omitempty"` + Repos string `json:"repos,omitempty"` + UserId string `json:"user_id,omitempty"` + UserName string `json:"user_name,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_artifact_allowlist.go b/bundle/internal/tf/schema/resource_artifact_allowlist.go new file mode 100644 index 000000000..e2629ac1e --- /dev/null +++ b/bundle/internal/tf/schema/resource_artifact_allowlist.go @@ -0,0 +1,17 @@ +// Generated from Databricks Terraform provider schema. DO NOT EDIT. + +package schema + +type ResourceArtifactAllowlistArtifactMatcher struct { + Artifact string `json:"artifact"` + MatchType string `json:"match_type"` +} + +type ResourceArtifactAllowlist struct { + ArtifactType string `json:"artifact_type"` + CreatedAt int `json:"created_at,omitempty"` + CreatedBy string `json:"created_by,omitempty"` + Id string `json:"id,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` + ArtifactMatcher []ResourceArtifactAllowlistArtifactMatcher `json:"artifact_matcher,omitempty"` +} diff --git a/bundle/internal/tf/schema/resource_catalog.go b/bundle/internal/tf/schema/resource_catalog.go index 0ae591145..a54f1c270 100644 --- a/bundle/internal/tf/schema/resource_catalog.go +++ b/bundle/internal/tf/schema/resource_catalog.go @@ -3,15 +3,17 @@ package schema type ResourceCatalog struct { - Comment string `json:"comment,omitempty"` - ForceDestroy bool `json:"force_destroy,omitempty"` - Id string `json:"id,omitempty"` - IsolationMode string `json:"isolation_mode,omitempty"` - MetastoreId string `json:"metastore_id,omitempty"` - Name string `json:"name"` - Owner string `json:"owner,omitempty"` - Properties map[string]string `json:"properties,omitempty"` - ProviderName string `json:"provider_name,omitempty"` - ShareName string `json:"share_name,omitempty"` - StorageRoot string `json:"storage_root,omitempty"` + Comment string `json:"comment,omitempty"` + ConnectionName string `json:"connection_name,omitempty"` + ForceDestroy bool `json:"force_destroy,omitempty"` + Id string `json:"id,omitempty"` + IsolationMode string `json:"isolation_mode,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` + Name string `json:"name"` + Options map[string]string `json:"options,omitempty"` + Owner string `json:"owner,omitempty"` + Properties map[string]string `json:"properties,omitempty"` + ProviderName string `json:"provider_name,omitempty"` + ShareName string `json:"share_name,omitempty"` + StorageRoot string `json:"storage_root,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_cluster.go b/bundle/internal/tf/schema/resource_cluster.go index a95b8c13a..1d5a5ef25 100644 --- a/bundle/internal/tf/schema/resource_cluster.go +++ b/bundle/internal/tf/schema/resource_cluster.go @@ -68,6 +68,7 @@ type ResourceClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -98,6 +99,10 @@ type ResourceClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type ResourceClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type ResourceClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -108,6 +113,7 @@ type ResourceClusterInitScripts struct { File *ResourceClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *ResourceClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceClusterInitScriptsWorkspace `json:"workspace,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_external_location.go b/bundle/internal/tf/schema/resource_external_location.go index 24e3fd0a2..af64c677c 100644 --- a/bundle/internal/tf/schema/resource_external_location.go +++ b/bundle/internal/tf/schema/resource_external_location.go @@ -2,15 +2,27 @@ package schema +type ResourceExternalLocationEncryptionDetailsSseEncryptionDetails struct { + Algorithm string `json:"algorithm,omitempty"` + AwsKmsKeyArn string `json:"aws_kms_key_arn,omitempty"` +} + +type ResourceExternalLocationEncryptionDetails struct { + SseEncryptionDetails *ResourceExternalLocationEncryptionDetailsSseEncryptionDetails `json:"sse_encryption_details,omitempty"` +} + type ResourceExternalLocation struct { - Comment string `json:"comment,omitempty"` - CredentialName string `json:"credential_name"` - ForceDestroy bool `json:"force_destroy,omitempty"` - Id string `json:"id,omitempty"` - MetastoreId string `json:"metastore_id,omitempty"` - Name string `json:"name"` - Owner string `json:"owner,omitempty"` - ReadOnly bool `json:"read_only,omitempty"` - SkipValidation bool `json:"skip_validation,omitempty"` - Url string `json:"url"` + AccessPoint string `json:"access_point,omitempty"` + Comment string `json:"comment,omitempty"` + CredentialName string `json:"credential_name"` + ForceDestroy bool `json:"force_destroy,omitempty"` + ForceUpdate bool `json:"force_update,omitempty"` + Id string `json:"id,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` + Name string `json:"name"` + Owner string `json:"owner,omitempty"` + ReadOnly bool `json:"read_only,omitempty"` + SkipValidation bool `json:"skip_validation,omitempty"` + Url string `json:"url"` + EncryptionDetails *ResourceExternalLocationEncryptionDetails `json:"encryption_details,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_grants.go b/bundle/internal/tf/schema/resource_grants.go index fb754cc62..09b958f82 100644 --- a/bundle/internal/tf/schema/resource_grants.go +++ b/bundle/internal/tf/schema/resource_grants.go @@ -10,10 +10,12 @@ type ResourceGrantsGrant struct { type ResourceGrants struct { Catalog string `json:"catalog,omitempty"` ExternalLocation string `json:"external_location,omitempty"` + ForeignConnection string `json:"foreign_connection,omitempty"` Function string `json:"function,omitempty"` Id string `json:"id,omitempty"` MaterializedView string `json:"materialized_view,omitempty"` Metastore string `json:"metastore,omitempty"` + Model string `json:"model,omitempty"` Schema string `json:"schema,omitempty"` Share string `json:"share,omitempty"` StorageCredential string `json:"storage_credential,omitempty"` diff --git a/bundle/internal/tf/schema/resource_instance_pool.go b/bundle/internal/tf/schema/resource_instance_pool.go index 2c3221217..f524b3fce 100644 --- a/bundle/internal/tf/schema/resource_instance_pool.go +++ b/bundle/internal/tf/schema/resource_instance_pool.go @@ -26,6 +26,7 @@ type ResourceInstancePoolDiskSpec struct { type ResourceInstancePoolGcpAttributes struct { GcpAvailability string `json:"gcp_availability,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` } type ResourceInstancePoolInstancePoolFleetAttributesFleetOnDemandOption struct { diff --git a/bundle/internal/tf/schema/resource_job.go b/bundle/internal/tf/schema/resource_job.go index 77b681ee5..b4a33bdf1 100644 --- a/bundle/internal/tf/schema/resource_job.go +++ b/bundle/internal/tf/schema/resource_job.go @@ -24,6 +24,11 @@ type ResourceJobDbtTask struct { WarehouseId string `json:"warehouse_id,omitempty"` } +type ResourceJobDeployment struct { + Kind string `json:"kind"` + MetadataFilePath string `json:"metadata_file_path,omitempty"` +} + type ResourceJobEmailNotifications struct { AlertOnLastAttempt bool `json:"alert_on_last_attempt,omitempty"` NoAlertForSkippedRuns bool `json:"no_alert_for_skipped_runs,omitempty"` @@ -124,6 +129,7 @@ type ResourceJobJobClusterNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -154,6 +160,10 @@ type ResourceJobJobClusterNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type ResourceJobJobClusterNewClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type ResourceJobJobClusterNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -164,6 +174,7 @@ type ResourceJobJobClusterNewClusterInitScripts struct { File *ResourceJobJobClusterNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceJobJobClusterNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceJobJobClusterNewClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *ResourceJobJobClusterNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceJobJobClusterNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -305,6 +316,7 @@ type ResourceJobNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -335,6 +347,10 @@ type ResourceJobNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type ResourceJobNewClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type ResourceJobNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -345,6 +361,7 @@ type ResourceJobNewClusterInitScripts struct { File *ResourceJobNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceJobNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceJobNewClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *ResourceJobNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceJobNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -401,6 +418,11 @@ type ResourceJobNotificationSettings struct { NoAlertForSkippedRuns bool `json:"no_alert_for_skipped_runs,omitempty"` } +type ResourceJobParameter struct { + Default string `json:"default,omitempty"` + Name string `json:"name,omitempty"` +} + type ResourceJobPipelineTask struct { FullRefresh bool `json:"full_refresh,omitempty"` PipelineId string `json:"pipeline_id"` @@ -414,6 +436,7 @@ type ResourceJobPythonWheelTask struct { } type ResourceJobQueue struct { + Enabled bool `json:"enabled"` } type ResourceJobRunAs struct { @@ -421,6 +444,11 @@ type ResourceJobRunAs struct { UserName string `json:"user_name,omitempty"` } +type ResourceJobRunJobTask struct { + JobId int `json:"job_id"` + JobParameters map[string]string `json:"job_parameters,omitempty"` +} + type ResourceJobSchedule struct { PauseStatus string `json:"pause_status,omitempty"` QuartzCronExpression string `json:"quartz_cron_expression"` @@ -573,6 +601,7 @@ type ResourceJobTaskNewClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` BootDiskSize int `json:"boot_disk_size,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` UsePreemptibleExecutors bool `json:"use_preemptible_executors,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -603,6 +632,10 @@ type ResourceJobTaskNewClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type ResourceJobTaskNewClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type ResourceJobTaskNewClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -613,6 +646,7 @@ type ResourceJobTaskNewClusterInitScripts struct { File *ResourceJobTaskNewClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourceJobTaskNewClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourceJobTaskNewClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *ResourceJobTaskNewClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourceJobTaskNewClusterInitScriptsWorkspace `json:"workspace,omitempty"` } @@ -682,6 +716,11 @@ type ResourceJobTaskPythonWheelTask struct { Parameters []string `json:"parameters,omitempty"` } +type ResourceJobTaskRunJobTask struct { + JobId int `json:"job_id"` + JobParameters map[string]string `json:"job_parameters,omitempty"` +} + type ResourceJobTaskSparkJarTask struct { JarUri string `json:"jar_uri,omitempty"` MainClassName string `json:"main_class_name,omitempty"` @@ -760,6 +799,7 @@ type ResourceJobTask struct { NotificationSettings *ResourceJobTaskNotificationSettings `json:"notification_settings,omitempty"` PipelineTask *ResourceJobTaskPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *ResourceJobTaskPythonWheelTask `json:"python_wheel_task,omitempty"` + RunJobTask *ResourceJobTaskRunJobTask `json:"run_job_task,omitempty"` SparkJarTask *ResourceJobTaskSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *ResourceJobTaskSparkPythonTask `json:"spark_python_task,omitempty"` SparkSubmitTask *ResourceJobTaskSparkSubmitTask `json:"spark_submit_task,omitempty"` @@ -817,6 +857,7 @@ type ResourceJob struct { Compute []ResourceJobCompute `json:"compute,omitempty"` Continuous *ResourceJobContinuous `json:"continuous,omitempty"` DbtTask *ResourceJobDbtTask `json:"dbt_task,omitempty"` + Deployment *ResourceJobDeployment `json:"deployment,omitempty"` EmailNotifications *ResourceJobEmailNotifications `json:"email_notifications,omitempty"` GitSource *ResourceJobGitSource `json:"git_source,omitempty"` Health *ResourceJobHealth `json:"health,omitempty"` @@ -825,10 +866,12 @@ type ResourceJob struct { NewCluster *ResourceJobNewCluster `json:"new_cluster,omitempty"` NotebookTask *ResourceJobNotebookTask `json:"notebook_task,omitempty"` NotificationSettings *ResourceJobNotificationSettings `json:"notification_settings,omitempty"` + Parameter []ResourceJobParameter `json:"parameter,omitempty"` PipelineTask *ResourceJobPipelineTask `json:"pipeline_task,omitempty"` PythonWheelTask *ResourceJobPythonWheelTask `json:"python_wheel_task,omitempty"` Queue *ResourceJobQueue `json:"queue,omitempty"` RunAs *ResourceJobRunAs `json:"run_as,omitempty"` + RunJobTask *ResourceJobRunJobTask `json:"run_job_task,omitempty"` Schedule *ResourceJobSchedule `json:"schedule,omitempty"` SparkJarTask *ResourceJobSparkJarTask `json:"spark_jar_task,omitempty"` SparkPythonTask *ResourceJobSparkPythonTask `json:"spark_python_task,omitempty"` diff --git a/bundle/internal/tf/schema/resource_metastore.go b/bundle/internal/tf/schema/resource_metastore.go index 24e502657..3561d2bfa 100644 --- a/bundle/internal/tf/schema/resource_metastore.go +++ b/bundle/internal/tf/schema/resource_metastore.go @@ -13,10 +13,12 @@ type ResourceMetastore struct { ForceDestroy bool `json:"force_destroy,omitempty"` GlobalMetastoreId string `json:"global_metastore_id,omitempty"` Id string `json:"id,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` Name string `json:"name"` Owner string `json:"owner,omitempty"` Region string `json:"region,omitempty"` StorageRoot string `json:"storage_root"` + StorageRootCredentialId string `json:"storage_root_credential_id,omitempty"` UpdatedAt int `json:"updated_at,omitempty"` UpdatedBy string `json:"updated_by,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_metastore_data_access.go b/bundle/internal/tf/schema/resource_metastore_data_access.go index 6d26776d8..86df5e4be 100644 --- a/bundle/internal/tf/schema/resource_metastore_data_access.go +++ b/bundle/internal/tf/schema/resource_metastore_data_access.go @@ -8,6 +8,8 @@ type ResourceMetastoreDataAccessAwsIamRole struct { type ResourceMetastoreDataAccessAzureManagedIdentity struct { AccessConnectorId string `json:"access_connector_id"` + CredentialId string `json:"credential_id,omitempty"` + ManagedIdentityId string `json:"managed_identity_id,omitempty"` } type ResourceMetastoreDataAccessAzureServicePrincipal struct { @@ -17,7 +19,8 @@ type ResourceMetastoreDataAccessAzureServicePrincipal struct { } type ResourceMetastoreDataAccessDatabricksGcpServiceAccount struct { - Email string `json:"email,omitempty"` + CredentialId string `json:"credential_id,omitempty"` + Email string `json:"email,omitempty"` } type ResourceMetastoreDataAccessGcpServiceAccountKey struct { @@ -27,11 +30,14 @@ type ResourceMetastoreDataAccessGcpServiceAccountKey struct { } type ResourceMetastoreDataAccess struct { - ConfigurationType string `json:"configuration_type,omitempty"` + Comment string `json:"comment,omitempty"` + ForceDestroy bool `json:"force_destroy,omitempty"` Id string `json:"id,omitempty"` IsDefault bool `json:"is_default,omitempty"` MetastoreId string `json:"metastore_id"` Name string `json:"name"` + Owner string `json:"owner,omitempty"` + ReadOnly bool `json:"read_only,omitempty"` AwsIamRole *ResourceMetastoreDataAccessAwsIamRole `json:"aws_iam_role,omitempty"` AzureManagedIdentity *ResourceMetastoreDataAccessAzureManagedIdentity `json:"azure_managed_identity,omitempty"` AzureServicePrincipal *ResourceMetastoreDataAccessAzureServicePrincipal `json:"azure_service_principal,omitempty"` diff --git a/bundle/internal/tf/schema/resource_mlflow_model.go b/bundle/internal/tf/schema/resource_mlflow_model.go index 90c1f61dd..406c124f2 100644 --- a/bundle/internal/tf/schema/resource_mlflow_model.go +++ b/bundle/internal/tf/schema/resource_mlflow_model.go @@ -3,8 +3,8 @@ package schema type ResourceMlflowModelTags struct { - Key string `json:"key"` - Value string `json:"value"` + Key string `json:"key,omitempty"` + Value string `json:"value,omitempty"` } type ResourceMlflowModel struct { diff --git a/bundle/internal/tf/schema/resource_model_serving.go b/bundle/internal/tf/schema/resource_model_serving.go index b7ff88ccd..b0cabbe5a 100644 --- a/bundle/internal/tf/schema/resource_model_serving.go +++ b/bundle/internal/tf/schema/resource_model_serving.go @@ -4,11 +4,13 @@ package schema type ResourceModelServingConfigServedModels struct { EnvironmentVars map[string]string `json:"environment_vars,omitempty"` + InstanceProfileArn string `json:"instance_profile_arn,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"` + WorkloadType string `json:"workload_type,omitempty"` } type ResourceModelServingConfigTrafficConfigRoutes struct { @@ -25,9 +27,15 @@ type ResourceModelServingConfig struct { TrafficConfig *ResourceModelServingConfigTrafficConfig `json:"traffic_config,omitempty"` } +type ResourceModelServingTags struct { + Key string `json:"key"` + Value string `json:"value,omitempty"` +} + type ResourceModelServing struct { Id string `json:"id,omitempty"` Name string `json:"name"` ServingEndpointId string `json:"serving_endpoint_id,omitempty"` Config *ResourceModelServingConfig `json:"config,omitempty"` + Tags []ResourceModelServingTags `json:"tags,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_pipeline.go b/bundle/internal/tf/schema/resource_pipeline.go index 9e7f71b11..72354f621 100644 --- a/bundle/internal/tf/schema/resource_pipeline.go +++ b/bundle/internal/tf/schema/resource_pipeline.go @@ -47,6 +47,7 @@ type ResourcePipelineClusterClusterLogConf struct { type ResourcePipelineClusterGcpAttributes struct { Availability string `json:"availability,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` + LocalSsdCount int `json:"local_ssd_count,omitempty"` ZoneId string `json:"zone_id,omitempty"` } @@ -76,6 +77,10 @@ type ResourcePipelineClusterInitScriptsS3 struct { Region string `json:"region,omitempty"` } +type ResourcePipelineClusterInitScriptsVolumes struct { + Destination string `json:"destination,omitempty"` +} + type ResourcePipelineClusterInitScriptsWorkspace struct { Destination string `json:"destination,omitempty"` } @@ -86,6 +91,7 @@ type ResourcePipelineClusterInitScripts struct { File *ResourcePipelineClusterInitScriptsFile `json:"file,omitempty"` Gcs *ResourcePipelineClusterInitScriptsGcs `json:"gcs,omitempty"` S3 *ResourcePipelineClusterInitScriptsS3 `json:"s3,omitempty"` + Volumes *ResourcePipelineClusterInitScriptsVolumes `json:"volumes,omitempty"` Workspace *ResourcePipelineClusterInitScriptsWorkspace `json:"workspace,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_share.go b/bundle/internal/tf/schema/resource_share.go index 72d7f8104..e531e7770 100644 --- a/bundle/internal/tf/schema/resource_share.go +++ b/bundle/internal/tf/schema/resource_share.go @@ -32,5 +32,6 @@ type ResourceShare struct { CreatedBy string `json:"created_by,omitempty"` Id string `json:"id,omitempty"` Name string `json:"name"` + Owner string `json:"owner,omitempty"` Object []ResourceShareObject `json:"object,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_alert.go b/bundle/internal/tf/schema/resource_sql_alert.go index 22a369d46..a9768fd8e 100644 --- a/bundle/internal/tf/schema/resource_sql_alert.go +++ b/bundle/internal/tf/schema/resource_sql_alert.go @@ -3,19 +3,22 @@ package schema type ResourceSqlAlertOptions struct { - Column string `json:"column"` - CustomBody string `json:"custom_body,omitempty"` - CustomSubject string `json:"custom_subject,omitempty"` - Muted bool `json:"muted,omitempty"` - Op string `json:"op"` - Value string `json:"value"` + Column string `json:"column"` + CustomBody string `json:"custom_body,omitempty"` + CustomSubject string `json:"custom_subject,omitempty"` + EmptyResultState string `json:"empty_result_state,omitempty"` + Muted bool `json:"muted,omitempty"` + Op string `json:"op"` + Value string `json:"value"` } type ResourceSqlAlert struct { - Id string `json:"id,omitempty"` - Name string `json:"name"` - Parent string `json:"parent,omitempty"` - QueryId string `json:"query_id"` - Rearm int `json:"rearm,omitempty"` - Options *ResourceSqlAlertOptions `json:"options,omitempty"` + CreatedAt string `json:"created_at,omitempty"` + Id string `json:"id,omitempty"` + Name string `json:"name"` + Parent string `json:"parent,omitempty"` + QueryId string `json:"query_id"` + Rearm int `json:"rearm,omitempty"` + UpdatedAt string `json:"updated_at,omitempty"` + Options *ResourceSqlAlertOptions `json:"options,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_dashboard.go b/bundle/internal/tf/schema/resource_sql_dashboard.go index 5c3bd896b..fc97bbdec 100644 --- a/bundle/internal/tf/schema/resource_sql_dashboard.go +++ b/bundle/internal/tf/schema/resource_sql_dashboard.go @@ -3,8 +3,11 @@ package schema type ResourceSqlDashboard struct { - Id string `json:"id,omitempty"` - Name string `json:"name"` - Parent string `json:"parent,omitempty"` - Tags []string `json:"tags,omitempty"` + CreatedAt string `json:"created_at,omitempty"` + DashboardFiltersEnabled bool `json:"dashboard_filters_enabled,omitempty"` + Id string `json:"id,omitempty"` + Name string `json:"name"` + Parent string `json:"parent,omitempty"` + Tags []string `json:"tags,omitempty"` + UpdatedAt string `json:"updated_at,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_query.go b/bundle/internal/tf/schema/resource_sql_query.go index 5016d8d72..27c653fc6 100644 --- a/bundle/internal/tf/schema/resource_sql_query.go +++ b/bundle/internal/tf/schema/resource_sql_query.go @@ -118,6 +118,7 @@ type ResourceSqlQuerySchedule struct { } type ResourceSqlQuery struct { + CreatedAt string `json:"created_at,omitempty"` DataSourceId string `json:"data_source_id"` Description string `json:"description,omitempty"` Id string `json:"id,omitempty"` @@ -126,6 +127,7 @@ type ResourceSqlQuery struct { Query string `json:"query"` RunAsRole string `json:"run_as_role,omitempty"` Tags []string `json:"tags,omitempty"` + UpdatedAt string `json:"updated_at,omitempty"` Parameter []ResourceSqlQueryParameter `json:"parameter,omitempty"` Schedule *ResourceSqlQuerySchedule `json:"schedule,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_sql_table.go b/bundle/internal/tf/schema/resource_sql_table.go index 2891975c3..97a8977bc 100644 --- a/bundle/internal/tf/schema/resource_sql_table.go +++ b/bundle/internal/tf/schema/resource_sql_table.go @@ -6,21 +6,25 @@ type ResourceSqlTableColumn struct { Comment string `json:"comment,omitempty"` Name string `json:"name"` Nullable bool `json:"nullable,omitempty"` - Type string `json:"type"` + Type string `json:"type,omitempty"` } type ResourceSqlTable struct { CatalogName string `json:"catalog_name"` ClusterId string `json:"cluster_id,omitempty"` + ClusterKeys []string `json:"cluster_keys,omitempty"` Comment string `json:"comment,omitempty"` DataSourceFormat string `json:"data_source_format,omitempty"` Id string `json:"id,omitempty"` Name string `json:"name"` + Options map[string]string `json:"options,omitempty"` + Partitions []string `json:"partitions,omitempty"` Properties map[string]string `json:"properties,omitempty"` SchemaName string `json:"schema_name"` StorageCredentialName string `json:"storage_credential_name,omitempty"` StorageLocation string `json:"storage_location,omitempty"` TableType string `json:"table_type"` ViewDefinition string `json:"view_definition,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` Column []ResourceSqlTableColumn `json:"column,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_storage_credential.go b/bundle/internal/tf/schema/resource_storage_credential.go index eab5810b3..1687c79ab 100644 --- a/bundle/internal/tf/schema/resource_storage_credential.go +++ b/bundle/internal/tf/schema/resource_storage_credential.go @@ -8,6 +8,8 @@ type ResourceStorageCredentialAwsIamRole struct { type ResourceStorageCredentialAzureManagedIdentity struct { AccessConnectorId string `json:"access_connector_id"` + CredentialId string `json:"credential_id,omitempty"` + ManagedIdentityId string `json:"managed_identity_id,omitempty"` } type ResourceStorageCredentialAzureServicePrincipal struct { @@ -17,7 +19,8 @@ type ResourceStorageCredentialAzureServicePrincipal struct { } type ResourceStorageCredentialDatabricksGcpServiceAccount struct { - Email string `json:"email,omitempty"` + CredentialId string `json:"credential_id,omitempty"` + Email string `json:"email,omitempty"` } type ResourceStorageCredentialGcpServiceAccountKey struct { @@ -28,6 +31,7 @@ type ResourceStorageCredentialGcpServiceAccountKey struct { type ResourceStorageCredential struct { Comment string `json:"comment,omitempty"` + ForceDestroy bool `json:"force_destroy,omitempty"` Id string `json:"id,omitempty"` MetastoreId string `json:"metastore_id,omitempty"` Name string `json:"name"` diff --git a/bundle/internal/tf/schema/resources.go b/bundle/internal/tf/schema/resources.go index c2361254a..9a04be7ea 100644 --- a/bundle/internal/tf/schema/resources.go +++ b/bundle/internal/tf/schema/resources.go @@ -4,6 +4,7 @@ package schema type Resources struct { AccessControlRuleSet map[string]*ResourceAccessControlRuleSet `json:"databricks_access_control_rule_set,omitempty"` + ArtifactAllowlist map[string]*ResourceArtifactAllowlist `json:"databricks_artifact_allowlist,omitempty"` AwsS3Mount map[string]*ResourceAwsS3Mount `json:"databricks_aws_s3_mount,omitempty"` AzureAdlsGen1Mount map[string]*ResourceAzureAdlsGen1Mount `json:"databricks_azure_adls_gen1_mount,omitempty"` AzureAdlsGen2Mount map[string]*ResourceAzureAdlsGen2Mount `json:"databricks_azure_adls_gen2_mount,omitempty"` @@ -12,6 +13,7 @@ type Resources struct { 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"` + Connection map[string]*ResourceConnection `json:"databricks_connection,omitempty"` DbfsFile map[string]*ResourceDbfsFile `json:"databricks_dbfs_file,omitempty"` Directory map[string]*ResourceDirectory `json:"databricks_directory,omitempty"` Entitlements map[string]*ResourceEntitlements `json:"databricks_entitlements,omitempty"` @@ -52,6 +54,7 @@ type Resources struct { Pipeline map[string]*ResourcePipeline `json:"databricks_pipeline,omitempty"` Provider map[string]*ResourceProvider `json:"databricks_provider,omitempty"` Recipient map[string]*ResourceRecipient `json:"databricks_recipient,omitempty"` + RegisteredModel map[string]*ResourceRegisteredModel `json:"databricks_registered_model,omitempty"` Repo map[string]*ResourceRepo `json:"databricks_repo,omitempty"` Schema map[string]*ResourceSchema `json:"databricks_schema,omitempty"` Secret map[string]*ResourceSecret `json:"databricks_secret,omitempty"` @@ -71,6 +74,7 @@ type Resources struct { SqlVisualization map[string]*ResourceSqlVisualization `json:"databricks_sql_visualization,omitempty"` SqlWidget map[string]*ResourceSqlWidget `json:"databricks_sql_widget,omitempty"` StorageCredential map[string]*ResourceStorageCredential `json:"databricks_storage_credential,omitempty"` + SystemSchema map[string]*ResourceSystemSchema `json:"databricks_system_schema,omitempty"` Table map[string]*ResourceTable `json:"databricks_table,omitempty"` Token map[string]*ResourceToken `json:"databricks_token,omitempty"` User map[string]*ResourceUser `json:"databricks_user,omitempty"` @@ -84,6 +88,7 @@ type Resources struct { func NewResources() *Resources { return &Resources{ AccessControlRuleSet: make(map[string]*ResourceAccessControlRuleSet), + ArtifactAllowlist: make(map[string]*ResourceArtifactAllowlist), AwsS3Mount: make(map[string]*ResourceAwsS3Mount), AzureAdlsGen1Mount: make(map[string]*ResourceAzureAdlsGen1Mount), AzureAdlsGen2Mount: make(map[string]*ResourceAzureAdlsGen2Mount), @@ -92,6 +97,7 @@ func NewResources() *Resources { CatalogWorkspaceBinding: make(map[string]*ResourceCatalogWorkspaceBinding), Cluster: make(map[string]*ResourceCluster), ClusterPolicy: make(map[string]*ResourceClusterPolicy), + Connection: make(map[string]*ResourceConnection), DbfsFile: make(map[string]*ResourceDbfsFile), Directory: make(map[string]*ResourceDirectory), Entitlements: make(map[string]*ResourceEntitlements), @@ -132,6 +138,7 @@ func NewResources() *Resources { Pipeline: make(map[string]*ResourcePipeline), Provider: make(map[string]*ResourceProvider), Recipient: make(map[string]*ResourceRecipient), + RegisteredModel: make(map[string]*ResourceRegisteredModel), Repo: make(map[string]*ResourceRepo), Schema: make(map[string]*ResourceSchema), Secret: make(map[string]*ResourceSecret), @@ -151,6 +158,7 @@ func NewResources() *Resources { SqlVisualization: make(map[string]*ResourceSqlVisualization), SqlWidget: make(map[string]*ResourceSqlWidget), StorageCredential: make(map[string]*ResourceStorageCredential), + SystemSchema: make(map[string]*ResourceSystemSchema), Table: make(map[string]*ResourceTable), Token: make(map[string]*ResourceToken), User: make(map[string]*ResourceUser), From 8adf737f396e51d36719a48399913e742bb022bd Mon Sep 17 00:00:00 2001 From: monalisa Date: Fri, 27 Oct 2023 00:54:18 +0200 Subject: [PATCH 3/4] add hide diff --- .gitattributes | 3 +++ bundle/internal/tf/codegen/templates/root.go.tmpl | 1 + bundle/internal/tf/schema/root.go | 1 + 3 files changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index 5e5dc235b..e94cfcd7b 100755 --- a/.gitattributes +++ b/.gitattributes @@ -83,3 +83,6 @@ cmd/workspace/warehouses/warehouses.go linguist-generated=true cmd/workspace/workspace-bindings/workspace-bindings.go linguist-generated=true cmd/workspace/workspace-conf/workspace-conf.go linguist-generated=true cmd/workspace/workspace/workspace.go linguist-generated=true + +# Hide diff for Go structs generated from databricks terraform provider schema +bundle/internal/tf/schema/*.go linguist-generated=true diff --git a/bundle/internal/tf/codegen/templates/root.go.tmpl b/bundle/internal/tf/codegen/templates/root.go.tmpl index 5530427c7..57fa71299 100644 --- a/bundle/internal/tf/codegen/templates/root.go.tmpl +++ b/bundle/internal/tf/codegen/templates/root.go.tmpl @@ -1,3 +1,4 @@ +// Generated from Databricks Terraform provider schema. DO NOT EDIT. package schema type Providers struct { diff --git a/bundle/internal/tf/schema/root.go b/bundle/internal/tf/schema/root.go index b1b5d7e05..3ad8cf4d1 100644 --- a/bundle/internal/tf/schema/root.go +++ b/bundle/internal/tf/schema/root.go @@ -1,3 +1,4 @@ +// Generated from Databricks Terraform provider schema. DO NOT EDIT. package schema type Providers struct { From 5e61be7de81a1800f077e6563f593a80b9cef000 Mon Sep 17 00:00:00 2001 From: monalisa Date: Fri, 27 Oct 2023 01:00:41 +0200 Subject: [PATCH 4/4] add readme --- bundle/internal/tf/codegen/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bundle/internal/tf/codegen/README.md b/bundle/internal/tf/codegen/README.md index fce447cf9..b1f8a33a8 100644 --- a/bundle/internal/tf/codegen/README.md +++ b/bundle/internal/tf/codegen/README.md @@ -13,3 +13,9 @@ Run with: ```go go run . ``` + +How to regenerate Go structs from an updated terraform provider? +1. Bump version in ./schema/version.go +2. Delete `./tmp` if it exists +3. Run `go run .` +4. Run `gofmt -s -w ../schema`