From 6b81b627fe10f6d13bf64f6eca4a0901e1a9cad3 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Thu, 18 Apr 2024 22:20:01 +0200 Subject: [PATCH] Upgrade terraform-provider-databricks to 1.40.0 (#1376) ## Changes Upgrade terraform-provider-databricks to 1.40.0 --- bundle/internal/tf/codegen/schema/version.go | 2 +- .../schema/data_source_external_location.go | 36 +++++++++++++++++++ .../schema/data_source_external_locations.go | 8 +++++ .../tf/schema/data_source_instance_pool.go | 1 + bundle/internal/tf/schema/data_source_job.go | 28 ++++++++------- .../tf/schema/data_source_metastore.go | 4 ++- bundle/internal/tf/schema/data_sources.go | 4 +++ bundle/internal/tf/schema/resource_catalog.go | 27 +++++++------- bundle/internal/tf/schema/resource_cluster.go | 5 +++ .../tf/schema/resource_instance_pool.go | 1 + bundle/internal/tf/schema/resource_job.go | 28 ++++++++------- .../tf/schema/resource_lakehouse_monitor.go | 35 ++++++++++-------- .../internal/tf/schema/resource_pipeline.go | 6 ++++ .../internal/tf/schema/resource_recipient.go | 34 ++++++++++++------ bundle/internal/tf/schema/resource_schema.go | 19 +++++----- bundle/internal/tf/schema/root.go | 2 +- 16 files changed, 166 insertions(+), 74 deletions(-) create mode 100644 bundle/internal/tf/schema/data_source_external_location.go create mode 100644 bundle/internal/tf/schema/data_source_external_locations.go diff --git a/bundle/internal/tf/codegen/schema/version.go b/bundle/internal/tf/codegen/schema/version.go index 7780510e..4fb4bf2c 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.39.0" +const ProviderVersion = "1.40.0" diff --git a/bundle/internal/tf/schema/data_source_external_location.go b/bundle/internal/tf/schema/data_source_external_location.go new file mode 100644 index 00000000..0fea6e52 --- /dev/null +++ b/bundle/internal/tf/schema/data_source_external_location.go @@ -0,0 +1,36 @@ +// Generated from Databricks Terraform provider schema. DO NOT EDIT. + +package schema + +type DataSourceExternalLocationExternalLocationInfoEncryptionDetailsSseEncryptionDetails struct { + Algorithm string `json:"algorithm,omitempty"` + AwsKmsKeyArn string `json:"aws_kms_key_arn,omitempty"` +} + +type DataSourceExternalLocationExternalLocationInfoEncryptionDetails struct { + SseEncryptionDetails *DataSourceExternalLocationExternalLocationInfoEncryptionDetailsSseEncryptionDetails `json:"sse_encryption_details,omitempty"` +} + +type DataSourceExternalLocationExternalLocationInfo struct { + AccessPoint string `json:"access_point,omitempty"` + BrowseOnly bool `json:"browse_only,omitempty"` + Comment string `json:"comment,omitempty"` + CreatedAt int `json:"created_at,omitempty"` + CreatedBy string `json:"created_by,omitempty"` + CredentialId string `json:"credential_id,omitempty"` + CredentialName string `json:"credential_name,omitempty"` + MetastoreId string `json:"metastore_id,omitempty"` + Name string `json:"name,omitempty"` + Owner string `json:"owner,omitempty"` + ReadOnly bool `json:"read_only,omitempty"` + UpdatedAt int `json:"updated_at,omitempty"` + UpdatedBy string `json:"updated_by,omitempty"` + Url string `json:"url,omitempty"` + EncryptionDetails *DataSourceExternalLocationExternalLocationInfoEncryptionDetails `json:"encryption_details,omitempty"` +} + +type DataSourceExternalLocation struct { + Id string `json:"id,omitempty"` + Name string `json:"name"` + ExternalLocationInfo *DataSourceExternalLocationExternalLocationInfo `json:"external_location_info,omitempty"` +} diff --git a/bundle/internal/tf/schema/data_source_external_locations.go b/bundle/internal/tf/schema/data_source_external_locations.go new file mode 100644 index 00000000..05b7b59c --- /dev/null +++ b/bundle/internal/tf/schema/data_source_external_locations.go @@ -0,0 +1,8 @@ +// Generated from Databricks Terraform provider schema. DO NOT EDIT. + +package schema + +type DataSourceExternalLocations struct { + Id string `json:"id,omitempty"` + Names []string `json:"names,omitempty"` +} diff --git a/bundle/internal/tf/schema/data_source_instance_pool.go b/bundle/internal/tf/schema/data_source_instance_pool.go index 240083d6..796d764b 100644 --- a/bundle/internal/tf/schema/data_source_instance_pool.go +++ b/bundle/internal/tf/schema/data_source_instance_pool.go @@ -27,6 +27,7 @@ type DataSourceInstancePoolPoolInfoDiskSpec struct { type DataSourceInstancePoolPoolInfoGcpAttributes struct { GcpAvailability string `json:"gcp_availability,omitempty"` LocalSsdCount int `json:"local_ssd_count,omitempty"` + ZoneId string `json:"zone_id,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 6ce02b0d..dbd29f4b 100644 --- a/bundle/internal/tf/schema/data_source_job.go +++ b/bundle/internal/tf/schema/data_source_job.go @@ -2,15 +2,6 @@ package schema -type DataSourceJobJobSettingsSettingsComputeSpec struct { - Kind string `json:"kind,omitempty"` -} - -type DataSourceJobJobSettingsSettingsCompute struct { - ComputeKey string `json:"compute_key,omitempty"` - Spec *DataSourceJobJobSettingsSettingsComputeSpec `json:"spec,omitempty"` -} - type DataSourceJobJobSettingsSettingsContinuous struct { PauseStatus string `json:"pause_status,omitempty"` } @@ -38,6 +29,16 @@ type DataSourceJobJobSettingsSettingsEmailNotifications struct { OnSuccess []string `json:"on_success,omitempty"` } +type DataSourceJobJobSettingsSettingsEnvironmentSpec struct { + Client string `json:"client"` + Dependencies []string `json:"dependencies,omitempty"` +} + +type DataSourceJobJobSettingsSettingsEnvironment struct { + EnvironmentKey string `json:"environment_key"` + Spec *DataSourceJobJobSettingsSettingsEnvironmentSpec `json:"spec,omitempty"` +} + type DataSourceJobJobSettingsSettingsGitSourceJobSource struct { DirtyState string `json:"dirty_state,omitempty"` ImportFromGitBranch string `json:"import_from_git_branch"` @@ -411,6 +412,7 @@ type DataSourceJobJobSettingsSettingsNotebookTask struct { BaseParameters map[string]string `json:"base_parameters,omitempty"` NotebookPath string `json:"notebook_path"` Source string `json:"source,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } type DataSourceJobJobSettingsSettingsNotificationSettings struct { @@ -725,6 +727,7 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNotebookTask struct { BaseParameters map[string]string `json:"base_parameters,omitempty"` NotebookPath string `json:"notebook_path"` Source string `json:"source,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskNotificationSettings struct { @@ -831,8 +834,8 @@ type DataSourceJobJobSettingsSettingsTaskForEachTaskTaskWebhookNotifications str } type DataSourceJobJobSettingsSettingsTaskForEachTaskTask struct { - ComputeKey string `json:"compute_key,omitempty"` Description string `json:"description,omitempty"` + EnvironmentKey string `json:"environment_key,omitempty"` ExistingClusterId string `json:"existing_cluster_id,omitempty"` JobClusterKey string `json:"job_cluster_key,omitempty"` MaxRetries int `json:"max_retries,omitempty"` @@ -1062,6 +1065,7 @@ type DataSourceJobJobSettingsSettingsTaskNotebookTask struct { BaseParameters map[string]string `json:"base_parameters,omitempty"` NotebookPath string `json:"notebook_path"` Source string `json:"source,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } type DataSourceJobJobSettingsSettingsTaskNotificationSettings struct { @@ -1168,8 +1172,8 @@ type DataSourceJobJobSettingsSettingsTaskWebhookNotifications struct { } type DataSourceJobJobSettingsSettingsTask struct { - ComputeKey string `json:"compute_key,omitempty"` Description string `json:"description,omitempty"` + EnvironmentKey string `json:"environment_key,omitempty"` ExistingClusterId string `json:"existing_cluster_id,omitempty"` JobClusterKey string `json:"job_cluster_key,omitempty"` MaxRetries int `json:"max_retries,omitempty"` @@ -1252,11 +1256,11 @@ type DataSourceJobJobSettingsSettings struct { RetryOnTimeout bool `json:"retry_on_timeout,omitempty"` Tags map[string]string `json:"tags,omitempty"` TimeoutSeconds int `json:"timeout_seconds,omitempty"` - Compute []DataSourceJobJobSettingsSettingsCompute `json:"compute,omitempty"` Continuous *DataSourceJobJobSettingsSettingsContinuous `json:"continuous,omitempty"` DbtTask *DataSourceJobJobSettingsSettingsDbtTask `json:"dbt_task,omitempty"` Deployment *DataSourceJobJobSettingsSettingsDeployment `json:"deployment,omitempty"` EmailNotifications *DataSourceJobJobSettingsSettingsEmailNotifications `json:"email_notifications,omitempty"` + Environment []DataSourceJobJobSettingsSettingsEnvironment `json:"environment,omitempty"` GitSource *DataSourceJobJobSettingsSettingsGitSource `json:"git_source,omitempty"` Health *DataSourceJobJobSettingsSettingsHealth `json:"health,omitempty"` JobCluster []DataSourceJobJobSettingsSettingsJobCluster `json:"job_cluster,omitempty"` diff --git a/bundle/internal/tf/schema/data_source_metastore.go b/bundle/internal/tf/schema/data_source_metastore.go index dd14be81..ce206479 100644 --- a/bundle/internal/tf/schema/data_source_metastore.go +++ b/bundle/internal/tf/schema/data_source_metastore.go @@ -25,6 +25,8 @@ type DataSourceMetastoreMetastoreInfo struct { type DataSourceMetastore struct { Id string `json:"id,omitempty"` - MetastoreId string `json:"metastore_id"` + MetastoreId string `json:"metastore_id,omitempty"` + Name string `json:"name,omitempty"` + Region string `json:"region,omitempty"` MetastoreInfo *DataSourceMetastoreMetastoreInfo `json:"metastore_info,omitempty"` } diff --git a/bundle/internal/tf/schema/data_sources.go b/bundle/internal/tf/schema/data_sources.go index 698cbec9..2e02c438 100644 --- a/bundle/internal/tf/schema/data_sources.go +++ b/bundle/internal/tf/schema/data_sources.go @@ -17,6 +17,8 @@ type DataSources struct { DbfsFile map[string]any `json:"databricks_dbfs_file,omitempty"` DbfsFilePaths map[string]any `json:"databricks_dbfs_file_paths,omitempty"` Directory map[string]any `json:"databricks_directory,omitempty"` + ExternalLocation map[string]any `json:"databricks_external_location,omitempty"` + ExternalLocations map[string]any `json:"databricks_external_locations,omitempty"` Group map[string]any `json:"databricks_group,omitempty"` InstancePool map[string]any `json:"databricks_instance_pool,omitempty"` InstanceProfiles map[string]any `json:"databricks_instance_profiles,omitempty"` @@ -64,6 +66,8 @@ func NewDataSources() *DataSources { DbfsFile: make(map[string]any), DbfsFilePaths: make(map[string]any), Directory: make(map[string]any), + ExternalLocation: make(map[string]any), + ExternalLocations: make(map[string]any), Group: make(map[string]any), InstancePool: make(map[string]any), InstanceProfiles: make(map[string]any), diff --git a/bundle/internal/tf/schema/resource_catalog.go b/bundle/internal/tf/schema/resource_catalog.go index a54f1c27..76c35528 100644 --- a/bundle/internal/tf/schema/resource_catalog.go +++ b/bundle/internal/tf/schema/resource_catalog.go @@ -3,17 +3,18 @@ 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"` + ConnectionName string `json:"connection_name,omitempty"` + EnablePredictiveOptimization string `json:"enable_predictive_optimization,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 111efe8d..6f866ba8 100644 --- a/bundle/internal/tf/schema/resource_cluster.go +++ b/bundle/internal/tf/schema/resource_cluster.go @@ -32,6 +32,10 @@ type ResourceClusterAzureAttributes struct { LogAnalyticsInfo *ResourceClusterAzureAttributesLogAnalyticsInfo `json:"log_analytics_info,omitempty"` } +type ResourceClusterCloneFrom struct { + SourceClusterId string `json:"source_cluster_id"` +} + type ResourceClusterClusterLogConfDbfs struct { Destination string `json:"destination"` } @@ -190,6 +194,7 @@ type ResourceCluster struct { Autoscale *ResourceClusterAutoscale `json:"autoscale,omitempty"` AwsAttributes *ResourceClusterAwsAttributes `json:"aws_attributes,omitempty"` AzureAttributes *ResourceClusterAzureAttributes `json:"azure_attributes,omitempty"` + CloneFrom *ResourceClusterCloneFrom `json:"clone_from,omitempty"` ClusterLogConf *ResourceClusterClusterLogConf `json:"cluster_log_conf,omitempty"` ClusterMountInfo []ResourceClusterClusterMountInfo `json:"cluster_mount_info,omitempty"` DockerImage *ResourceClusterDockerImage `json:"docker_image,omitempty"` diff --git a/bundle/internal/tf/schema/resource_instance_pool.go b/bundle/internal/tf/schema/resource_instance_pool.go index f524b3fc..0097a491 100644 --- a/bundle/internal/tf/schema/resource_instance_pool.go +++ b/bundle/internal/tf/schema/resource_instance_pool.go @@ -27,6 +27,7 @@ type ResourceInstancePoolDiskSpec struct { type ResourceInstancePoolGcpAttributes struct { GcpAvailability string `json:"gcp_availability,omitempty"` LocalSsdCount int `json:"local_ssd_count,omitempty"` + ZoneId string `json:"zone_id,omitempty"` } type ResourceInstancePoolInstancePoolFleetAttributesFleetOnDemandOption struct { diff --git a/bundle/internal/tf/schema/resource_job.go b/bundle/internal/tf/schema/resource_job.go index 83e80c9c..2431262c 100644 --- a/bundle/internal/tf/schema/resource_job.go +++ b/bundle/internal/tf/schema/resource_job.go @@ -2,15 +2,6 @@ package schema -type ResourceJobComputeSpec struct { - Kind string `json:"kind,omitempty"` -} - -type ResourceJobCompute struct { - ComputeKey string `json:"compute_key,omitempty"` - Spec *ResourceJobComputeSpec `json:"spec,omitempty"` -} - type ResourceJobContinuous struct { PauseStatus string `json:"pause_status,omitempty"` } @@ -38,6 +29,16 @@ type ResourceJobEmailNotifications struct { OnSuccess []string `json:"on_success,omitempty"` } +type ResourceJobEnvironmentSpec struct { + Client string `json:"client"` + Dependencies []string `json:"dependencies,omitempty"` +} + +type ResourceJobEnvironment struct { + EnvironmentKey string `json:"environment_key"` + Spec *ResourceJobEnvironmentSpec `json:"spec,omitempty"` +} + type ResourceJobGitSourceJobSource struct { DirtyState string `json:"dirty_state,omitempty"` ImportFromGitBranch string `json:"import_from_git_branch"` @@ -411,6 +412,7 @@ type ResourceJobNotebookTask struct { BaseParameters map[string]string `json:"base_parameters,omitempty"` NotebookPath string `json:"notebook_path"` Source string `json:"source,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } type ResourceJobNotificationSettings struct { @@ -725,6 +727,7 @@ type ResourceJobTaskForEachTaskTaskNotebookTask struct { BaseParameters map[string]string `json:"base_parameters,omitempty"` NotebookPath string `json:"notebook_path"` Source string `json:"source,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } type ResourceJobTaskForEachTaskTaskNotificationSettings struct { @@ -831,8 +834,8 @@ type ResourceJobTaskForEachTaskTaskWebhookNotifications struct { } type ResourceJobTaskForEachTaskTask struct { - ComputeKey string `json:"compute_key,omitempty"` Description string `json:"description,omitempty"` + EnvironmentKey string `json:"environment_key,omitempty"` ExistingClusterId string `json:"existing_cluster_id,omitempty"` JobClusterKey string `json:"job_cluster_key,omitempty"` MaxRetries int `json:"max_retries,omitempty"` @@ -1062,6 +1065,7 @@ type ResourceJobTaskNotebookTask struct { BaseParameters map[string]string `json:"base_parameters,omitempty"` NotebookPath string `json:"notebook_path"` Source string `json:"source,omitempty"` + WarehouseId string `json:"warehouse_id,omitempty"` } type ResourceJobTaskNotificationSettings struct { @@ -1168,8 +1172,8 @@ type ResourceJobTaskWebhookNotifications struct { } type ResourceJobTask struct { - ComputeKey string `json:"compute_key,omitempty"` Description string `json:"description,omitempty"` + EnvironmentKey string `json:"environment_key,omitempty"` ExistingClusterId string `json:"existing_cluster_id,omitempty"` JobClusterKey string `json:"job_cluster_key,omitempty"` MaxRetries int `json:"max_retries,omitempty"` @@ -1256,11 +1260,11 @@ type ResourceJob struct { Tags map[string]string `json:"tags,omitempty"` TimeoutSeconds int `json:"timeout_seconds,omitempty"` Url string `json:"url,omitempty"` - Compute []ResourceJobCompute `json:"compute,omitempty"` Continuous *ResourceJobContinuous `json:"continuous,omitempty"` DbtTask *ResourceJobDbtTask `json:"dbt_task,omitempty"` Deployment *ResourceJobDeployment `json:"deployment,omitempty"` EmailNotifications *ResourceJobEmailNotifications `json:"email_notifications,omitempty"` + Environment []ResourceJobEnvironment `json:"environment,omitempty"` GitSource *ResourceJobGitSource `json:"git_source,omitempty"` Health *ResourceJobHealth `json:"health,omitempty"` JobCluster []ResourceJobJobCluster `json:"job_cluster,omitempty"` diff --git a/bundle/internal/tf/schema/resource_lakehouse_monitor.go b/bundle/internal/tf/schema/resource_lakehouse_monitor.go index 26196d2f..69dbdd04 100644 --- a/bundle/internal/tf/schema/resource_lakehouse_monitor.go +++ b/bundle/internal/tf/schema/resource_lakehouse_monitor.go @@ -3,11 +3,11 @@ package schema type ResourceLakehouseMonitorCustomMetrics struct { - Definition string `json:"definition,omitempty"` - InputColumns []string `json:"input_columns,omitempty"` - Name string `json:"name,omitempty"` - OutputDataType string `json:"output_data_type,omitempty"` - Type string `json:"type,omitempty"` + Definition string `json:"definition"` + InputColumns []string `json:"input_columns"` + Name string `json:"name"` + OutputDataType string `json:"output_data_type"` + Type string `json:"type"` } type ResourceLakehouseMonitorDataClassificationConfig struct { @@ -15,35 +15,40 @@ type ResourceLakehouseMonitorDataClassificationConfig struct { } type ResourceLakehouseMonitorInferenceLog struct { - Granularities []string `json:"granularities,omitempty"` + Granularities []string `json:"granularities"` LabelCol string `json:"label_col,omitempty"` - ModelIdCol string `json:"model_id_col,omitempty"` - PredictionCol string `json:"prediction_col,omitempty"` + ModelIdCol string `json:"model_id_col"` + PredictionCol string `json:"prediction_col"` PredictionProbaCol string `json:"prediction_proba_col,omitempty"` - ProblemType string `json:"problem_type,omitempty"` - TimestampCol string `json:"timestamp_col,omitempty"` + ProblemType string `json:"problem_type"` + TimestampCol string `json:"timestamp_col"` } type ResourceLakehouseMonitorNotificationsOnFailure struct { EmailAddresses []string `json:"email_addresses,omitempty"` } +type ResourceLakehouseMonitorNotificationsOnNewClassificationTagDetected struct { + EmailAddresses []string `json:"email_addresses,omitempty"` +} + type ResourceLakehouseMonitorNotifications struct { - OnFailure *ResourceLakehouseMonitorNotificationsOnFailure `json:"on_failure,omitempty"` + OnFailure *ResourceLakehouseMonitorNotificationsOnFailure `json:"on_failure,omitempty"` + OnNewClassificationTagDetected *ResourceLakehouseMonitorNotificationsOnNewClassificationTagDetected `json:"on_new_classification_tag_detected,omitempty"` } type ResourceLakehouseMonitorSchedule struct { PauseStatus string `json:"pause_status,omitempty"` - QuartzCronExpression string `json:"quartz_cron_expression,omitempty"` - TimezoneId string `json:"timezone_id,omitempty"` + QuartzCronExpression string `json:"quartz_cron_expression"` + TimezoneId string `json:"timezone_id"` } type ResourceLakehouseMonitorSnapshot struct { } type ResourceLakehouseMonitorTimeSeries struct { - Granularities []string `json:"granularities,omitempty"` - TimestampCol string `json:"timestamp_col,omitempty"` + Granularities []string `json:"granularities"` + TimestampCol string `json:"timestamp_col"` } type ResourceLakehouseMonitor struct { diff --git a/bundle/internal/tf/schema/resource_pipeline.go b/bundle/internal/tf/schema/resource_pipeline.go index 3cad9ac4..20c25c1e 100644 --- a/bundle/internal/tf/schema/resource_pipeline.go +++ b/bundle/internal/tf/schema/resource_pipeline.go @@ -117,6 +117,11 @@ type ResourcePipelineCluster struct { InitScripts []ResourcePipelineClusterInitScripts `json:"init_scripts,omitempty"` } +type ResourcePipelineDeployment struct { + Kind string `json:"kind,omitempty"` + MetadataFilePath string `json:"metadata_file_path,omitempty"` +} + type ResourcePipelineFilters struct { Exclude []string `json:"exclude,omitempty"` Include []string `json:"include,omitempty"` @@ -165,6 +170,7 @@ type ResourcePipeline struct { Target string `json:"target,omitempty"` Url string `json:"url,omitempty"` Cluster []ResourcePipelineCluster `json:"cluster,omitempty"` + Deployment *ResourcePipelineDeployment `json:"deployment,omitempty"` Filters *ResourcePipelineFilters `json:"filters,omitempty"` Library []ResourcePipelineLibrary `json:"library,omitempty"` Notification []ResourcePipelineNotification `json:"notification,omitempty"` diff --git a/bundle/internal/tf/schema/resource_recipient.go b/bundle/internal/tf/schema/resource_recipient.go index 47d6de37..91de4df7 100644 --- a/bundle/internal/tf/schema/resource_recipient.go +++ b/bundle/internal/tf/schema/resource_recipient.go @@ -3,7 +3,11 @@ package schema type ResourceRecipientIpAccessList struct { - AllowedIpAddresses []string `json:"allowed_ip_addresses"` + AllowedIpAddresses []string `json:"allowed_ip_addresses,omitempty"` +} + +type ResourceRecipientPropertiesKvpairs struct { + Properties map[string]string `json:"properties"` } type ResourceRecipientTokens struct { @@ -17,13 +21,23 @@ type ResourceRecipientTokens struct { } type ResourceRecipient struct { - AuthenticationType string `json:"authentication_type"` - Comment string `json:"comment,omitempty"` - DataRecipientGlobalMetastoreId string `json:"data_recipient_global_metastore_id,omitempty"` - Id string `json:"id,omitempty"` - Name string `json:"name"` - Owner string `json:"owner,omitempty"` - SharingCode string `json:"sharing_code,omitempty"` - IpAccessList *ResourceRecipientIpAccessList `json:"ip_access_list,omitempty"` - Tokens []ResourceRecipientTokens `json:"tokens,omitempty"` + Activated bool `json:"activated,omitempty"` + ActivationUrl string `json:"activation_url,omitempty"` + AuthenticationType string `json:"authentication_type"` + Cloud string `json:"cloud,omitempty"` + Comment string `json:"comment,omitempty"` + CreatedAt int `json:"created_at,omitempty"` + CreatedBy string `json:"created_by,omitempty"` + DataRecipientGlobalMetastoreId string `json:"data_recipient_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"` + SharingCode string `json:"sharing_code,omitempty"` + UpdatedAt int `json:"updated_at,omitempty"` + UpdatedBy string `json:"updated_by,omitempty"` + IpAccessList *ResourceRecipientIpAccessList `json:"ip_access_list,omitempty"` + PropertiesKvpairs *ResourceRecipientPropertiesKvpairs `json:"properties_kvpairs,omitempty"` + Tokens []ResourceRecipientTokens `json:"tokens,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_schema.go b/bundle/internal/tf/schema/resource_schema.go index f1949b07..3ac8d813 100644 --- a/bundle/internal/tf/schema/resource_schema.go +++ b/bundle/internal/tf/schema/resource_schema.go @@ -3,13 +3,14 @@ package schema type ResourceSchema struct { - CatalogName string `json:"catalog_name"` - 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"` - Owner string `json:"owner,omitempty"` - Properties map[string]string `json:"properties,omitempty"` - StorageRoot string `json:"storage_root,omitempty"` + CatalogName string `json:"catalog_name"` + Comment string `json:"comment,omitempty"` + EnablePredictiveOptimization string `json:"enable_predictive_optimization,omitempty"` + 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"` + Properties map[string]string `json:"properties,omitempty"` + StorageRoot string `json:"storage_root,omitempty"` } diff --git a/bundle/internal/tf/schema/root.go b/bundle/internal/tf/schema/root.go index 0bfab73f..be6852bc 100644 --- a/bundle/internal/tf/schema/root.go +++ b/bundle/internal/tf/schema/root.go @@ -21,7 +21,7 @@ type Root struct { const ProviderHost = "registry.terraform.io" const ProviderSource = "databricks/databricks" -const ProviderVersion = "1.39.0" +const ProviderVersion = "1.40.0" func NewRoot() *Root { return &Root{