Add defaults on jobs that terraform applies

denik · denik · commit 0be67e60231f · 2025-04-25T14:10:52.000+02:00
diff --git a/acceptance/bundle/includes/yml_outside_root/output.txt b/acceptance/bundle/includes/yml_outside_root/output.txt
@@ -16,6 +16,7 @@ Validation OK!
   },
   "edit_mode": "UI_LOCKED",
   "format": "MULTI_TASK",
+  "max_concurrent_runs": 1,
   "name": "include_outside_root",
   "permissions": [],
   "queue": {
diff --git a/acceptance/bundle/override/job_cluster/output.txt b/acceptance/bundle/override/job_cluster/output.txt
@@ -18,6 +18,7 @@
         }
       }
     ],
+    "max_concurrent_runs": 1,
     "name": "job",
     "permissions": [],
     "queue": {
@@ -45,6 +46,7 @@
         }
       }
     ],
+    "max_concurrent_runs": 1,
     "name": "job",
     "permissions": [],
     "queue": {
diff --git a/acceptance/bundle/override/job_cluster_var/output.txt b/acceptance/bundle/override/job_cluster_var/output.txt
@@ -18,6 +18,7 @@
         }
       }
     ],
+    "max_concurrent_runs": 1,
     "name": "job",
     "permissions": [],
     "queue": {
@@ -54,6 +55,7 @@ Validation OK!
         }
       }
     ],
+    "max_concurrent_runs": 1,
     "name": "job",
     "permissions": [],
     "queue": {
diff --git a/acceptance/bundle/override/job_tasks/output.txt b/acceptance/bundle/override/job_tasks/output.txt
@@ -1,4 +1,5 @@
 {
+  "max_concurrent_runs": 1,
   "name": "job",
   "permissions": [],
   "queue": {
@@ -34,6 +35,7 @@ Error: file test1.py not found
 
 Exit code: 1
 {
+  "max_concurrent_runs": 1,
   "name": "job",
   "permissions": [],
   "queue": {
diff --git a/acceptance/bundle/paths/git_source_jobs/output.txt b/acceptance/bundle/paths/git_source_jobs/output.txt
@@ -13,6 +13,7 @@
           "git_provider": "gitHub",
           "git_url": "https://github.com/foo"
         },
+        "max_concurrent_runs": 1,
         "name": "my_job",
         "permissions": [],
         "queue": {
diff --git a/acceptance/bundle/paths/relative_path_outside_root/output.txt b/acceptance/bundle/paths/relative_path_outside_root/output.txt
@@ -10,6 +10,7 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
         "name": "include_outside_root",
         "permissions": [],
         "queue": {
diff --git a/acceptance/bundle/python/mutator-ordering/output.txt b/acceptance/bundle/python/mutator-ordering/output.txt
@@ -18,6 +18,8 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
+        "name": "Untitled",
         "permissions": [],
         "queue": {
           "enabled": true
diff --git a/acceptance/bundle/python/resolve-variable/output.txt b/acceptance/bundle/python/resolve-variable/output.txt
@@ -17,6 +17,7 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
         "name": "abc",
         "permissions": [],
         "queue": {
diff --git a/acceptance/bundle/python/resource-loading/output.txt b/acceptance/bundle/python/resource-loading/output.txt
@@ -18,6 +18,7 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
         "name": "Job 1",
         "permissions": [],
         "queue": {
@@ -31,6 +32,7 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
         "name": "Job 2",
         "permissions": [],
         "queue": {
@@ -44,6 +46,7 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
         "name": "Job 3",
         "permissions": [],
         "queue": {
diff --git a/acceptance/bundle/validate/empty_resources/empty_dict/output.txt b/acceptance/bundle/validate/empty_resources/empty_dict/output.txt
@@ -9,6 +9,8 @@
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
+      "name": "Untitled",
       "permissions": [],
       "queue": {
         "enabled": true
diff --git a/acceptance/bundle/validate/empty_resources/with_grants/output.txt b/acceptance/bundle/validate/empty_resources/with_grants/output.txt
@@ -13,6 +13,8 @@ Warning: unknown field: grants
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
+      "name": "Untitled",
       "permissions": [],
       "queue": {
         "enabled": true
diff --git a/acceptance/bundle/validate/empty_resources/with_permissions/output.txt b/acceptance/bundle/validate/empty_resources/with_permissions/output.txt
@@ -9,6 +9,8 @@
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
+      "name": "Untitled",
       "permissions": [],
       "queue": {
         "enabled": true
diff --git a/acceptance/bundle/validate/presets_name_prefix/output.txt b/acceptance/bundle/validate/presets_name_prefix/output.txt
@@ -12,6 +12,7 @@
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
       "name": "prefix-job1",
       "permissions": [],
       "queue": {
@@ -47,6 +48,7 @@
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
       "name": "[prefix]job1",
       "permissions": [],
       "queue": {
@@ -82,6 +84,7 @@
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
       "name": "job1",
       "permissions": [],
       "queue": {
diff --git a/acceptance/bundle/variables/complex/out.default.json b/acceptance/bundle/variables/complex/out.default.json
@@ -24,6 +24,8 @@
             }
           }
         ],
+        "max_concurrent_runs": 1,
+        "name": "Untitled",
         "permissions": [],
         "queue": {
           "enabled": true
diff --git a/acceptance/bundle/variables/complex/out.dev.json b/acceptance/bundle/variables/complex/out.dev.json
@@ -22,6 +22,8 @@
             }
           }
         ],
+        "max_concurrent_runs": 1,
+        "name": "Untitled",
         "permissions": [],
         "queue": {
           "enabled": true
diff --git a/acceptance/bundle/variables/complex_multiple_files/output.txt b/acceptance/bundle/variables/complex_multiple_files/output.txt
@@ -58,6 +58,8 @@
             }
           }
         ],
+        "max_concurrent_runs": 1,
+        "name": "Untitled",
         "permissions": [],
         "queue": {
           "enabled": true
diff --git a/acceptance/bundle/variables/prepend-workspace-var/output.txt b/acceptance/bundle/variables/prepend-workspace-var/output.txt
@@ -19,6 +19,8 @@
         },
         "edit_mode": "UI_LOCKED",
         "format": "MULTI_TASK",
+        "max_concurrent_runs": 1,
+        "name": "Untitled",
         "permissions": [],
         "queue": {
           "enabled": true
diff --git a/acceptance/bundle/variables/resolve-nonstrings/output.txt b/acceptance/bundle/variables/resolve-nonstrings/output.txt
@@ -24,6 +24,8 @@
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
+      "max_concurrent_runs": 1,
+      "name": "Untitled",
       "notification_settings": {
         "no_alert_for_canceled_runs": true,
         "no_alert_for_skipped_runs": false
diff --git a/bundle/config/mutator/resourcemutator/resource_mutator.go b/bundle/config/mutator/resourcemutator/resource_mutator.go
@@ -51,6 +51,26 @@ func applyInitializeMutators(ctx context.Context, b *bundle.Bundle) diag.Diagnos
 		{"resources.dashboards.*.parent_path", b.Config.Workspace.ResourcePath},
 		{"resources.dashboards.*.embed_credentials", false},
 		{"resources.volumes.*.volume_type", "MANAGED"},
+
+		// Jobs:
+
+		// The defaults are the same as for terraform provider latest version (v1.75.0)
+		// https://github.com/databricks/terraform-provider-databricks/blob/v1.75.0/jobs/resource_job.go#L532
+		{"resources.jobs.*.name", "Untitled"},
+		{"resources.jobs.*.max_concurrent_runs", 1},
+		{"resources.jobs.*.schedule.pause_status", "UNPAUSED"},
+		{"resources.jobs.*.trigger.pause_status", "UNPAUSED"},
+		{"resources.jobs.*.continuous.pause_status", "UNPAUSED"},
+
+		// This is converted from single-task to multi-task
+		{"resources.jobs.*.task[*].dbt_task.schema", "default"},
+		{"resources.jobs.*.task[*].for_each_task.task.dbt_task.schema", "default"},
+
+		// https://github.com/databricks/terraform-provider-databricks/blob/v1.75.0/clusters/resource_cluster.go
+		// This triggers SingleNodeCluster() cluster validator. It needs to be run before applying defaults.
+		//{"resources.jobs.*.job_clusters[*].new_cluster.num_workers", 0},
+		{"resources.jobs.*.job_clusters[*].new_cluster.workload_type.clients.notebooks", true},
+		{"resources.jobs.*.job_clusters[*].new_cluster.workload_type.clients.jobs", true},
 	}
 
 	for _, defaultDef := range defaults {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`],`
	`21`	`+ "max_concurrent_runs": 1,`
`21`	`22`	`"name": "job",`
`22`	`23`	`"permissions": [],`
`23`	`24`	`"queue": {`
`@@ -45,6 +46,7 @@`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`],`
	`49`	`+ "max_concurrent_runs": 1,`
`48`	`50`	`"name": "job",`
`49`	`51`	`"permissions": [],`
`50`	`52`	`"queue": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "max_concurrent_runs": 1,`
`2`	`3`	`"name": "job",`
`3`	`4`	`"permissions": [],`
`4`	`5`	`"queue": {`
`@@ -34,6 +35,7 @@ Error: file test1.py not found`
`34`	`35`
`35`	`36`	`Exit code: 1`
`36`	`37`	`{`
	`38`	`+ "max_concurrent_runs": 1,`
`37`	`39`	`"name": "job",`
`38`	`40`	`"permissions": [],`
`39`	`41`	`"queue": {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`],`
	`27`	`+ "max_concurrent_runs": 1,`
	`28`	`+ "name": "Untitled",`
`27`	`29`	`"permissions": [],`
`28`	`30`	`"queue": {`
`29`	`31`	`"enabled": true`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`],`
	`25`	`+ "max_concurrent_runs": 1,`
	`26`	`+ "name": "Untitled",`
`25`	`27`	`"permissions": [],`
`26`	`28`	`"queue": {`
`27`	`29`	`"enabled": true`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`],`
	`61`	`+ "max_concurrent_runs": 1,`
	`62`	`+ "name": "Untitled",`
`61`	`63`	`"permissions": [],`
`62`	`64`	`"queue": {`
`63`	`65`	`"enabled": true`