diff --git a/clusters/clusters_api.go b/clusters/clusters_api.go index 82e6963330..207151478d 100644 --- a/clusters/clusters_api.go +++ b/clusters/clusters_api.go @@ -412,7 +412,7 @@ type Cluster struct { ClusterLogConf *StorageInfo `json:"cluster_log_conf,omitempty"` DockerImage *DockerImage `json:"docker_image,omitempty"` - DataSecurityMode string `json:"data_security_mode,omitempty"` + DataSecurityMode string `json:"data_security_mode,omitempty" tf:"suppress_diff"` SingleUserName string `json:"single_user_name,omitempty"` IdempotencyToken string `json:"idempotency_token,omitempty" tf:"force_new"` WorkloadType *WorkloadType `json:"workload_type,omitempty"` diff --git a/jobs/resource_job.go b/jobs/resource_job.go index cc9b412149..26ee185254 100644 --- a/jobs/resource_job.go +++ b/jobs/resource_job.go @@ -175,6 +175,10 @@ type JobCluster struct { NewCluster *clusters.Cluster `json:"new_cluster,omitempty" tf:"group:cluster_type"` } +type ContinuousConf struct { + PauseStatus string `json:"pause_status,omitempty" tf:"computed"` +} + // JobSettings contains the information for configuring a job on databricks type JobSettings struct { Name string `json:"name,omitempty" tf:"default:Untitled"` @@ -207,6 +211,7 @@ type JobSettings struct { // END Jobs + Repo integration preview Schedule *CronSchedule `json:"schedule,omitempty"` + Continuous *ContinuousConf `json:"continuous,omitempty"` MaxConcurrentRuns int32 `json:"max_concurrent_runs,omitempty"` EmailNotifications *EmailNotifications `json:"email_notifications,omitempty" tf:"suppress_diff"` WebhookNotifications *WebhookNotifications `json:"webhook_notifications,omitempty" tf:"suppress_diff"` @@ -567,6 +572,8 @@ var jobSchema = common.StructToSchema(JobSettings{}, Default: false, Type: schema.TypeBool, } + s["schedule"].ConflictsWith = []string{"continuous"} + s["continuous"].ConflictsWith = []string{"schedule"} return s })