diff --git a/.nextchanges/bundles/triggers-pause-presets.md b/.nextchanges/bundles/triggers-pause-presets.md new file mode 100644 index 00000000000..65710e90154 --- /dev/null +++ b/.nextchanges/bundles/triggers-pause-presets.md @@ -0,0 +1 @@ +* Apply `presets.trigger_pause_status` and the development mode pause default to `triggers[]` entries on jobs. ([#7450](https://github.com/databricks/cli/pull/7450)) diff --git a/acceptance/bundle/presets/triggers_pause_status/databricks.yml b/acceptance/bundle/presets/triggers_pause_status/databricks.yml new file mode 100644 index 00000000000..20e9c5b7744 --- /dev/null +++ b/acceptance/bundle/presets/triggers_pause_status/databricks.yml @@ -0,0 +1,44 @@ +bundle: + name: test-bundle + +resources: + jobs: + mixed_cron: + name: mixed_cron + triggers: + - schedule: + quartz_cron_expression: "0 0 0 1 1 ? 2099" + timezone_id: UTC + - schedule: + quartz_cron_expression: "0 0 0 2 1 ? 2099" + timezone_id: UTC + pause_status: UNPAUSED + + file_arrival: + name: file_arrival + triggers: + - file_arrival: + url: /Volumes/main/default/landing/ + + table_update: + name: table_update + triggers: + - table_update: + table_names: + - main.default.src + - schedule: + quartz_cron_expression: "0 0 0 3 1 ? 2099" + timezone_id: UTC + pause_status: PAUSED + +targets: + no_preset: + default: true + paused: + presets: + trigger_pause_status: PAUSED + unpaused: + presets: + trigger_pause_status: UNPAUSED + dev: + mode: development diff --git a/acceptance/bundle/presets/triggers_pause_status/out.test.toml b/acceptance/bundle/presets/triggers_pause_status/out.test.toml new file mode 100644 index 00000000000..a927a5fbc06 --- /dev/null +++ b/acceptance/bundle/presets/triggers_pause_status/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/presets/triggers_pause_status/output.txt b/acceptance/bundle/presets/triggers_pause_status/output.txt new file mode 100644 index 00000000000..245064f6f51 --- /dev/null +++ b/acceptance/bundle/presets/triggers_pause_status/output.txt @@ -0,0 +1,68 @@ + +=== Target: no_preset + +>>> [CLI] bundle validate -t no_preset -o json +{ + "file_arrival": [ + null + ], + "mixed_cron": [ + null, + "UNPAUSED" + ], + "table_update": [ + null, + "PAUSED" + ] +} + +=== Target: paused + +>>> [CLI] bundle validate -t paused -o json +{ + "file_arrival": [ + "PAUSED" + ], + "mixed_cron": [ + "PAUSED", + "UNPAUSED" + ], + "table_update": [ + "PAUSED", + "PAUSED" + ] +} + +=== Target: unpaused + +>>> [CLI] bundle validate -t unpaused -o json +{ + "file_arrival": [ + "UNPAUSED" + ], + "mixed_cron": [ + "UNPAUSED", + "UNPAUSED" + ], + "table_update": [ + "UNPAUSED", + "PAUSED" + ] +} + +=== Target: dev + +>>> [CLI] bundle validate -t dev -o json +{ + "file_arrival": [ + "PAUSED" + ], + "mixed_cron": [ + "PAUSED", + "UNPAUSED" + ], + "table_update": [ + "PAUSED", + "PAUSED" + ] +} diff --git a/acceptance/bundle/presets/triggers_pause_status/script b/acceptance/bundle/presets/triggers_pause_status/script new file mode 100644 index 00000000000..84fe157bacd --- /dev/null +++ b/acceptance/bundle/presets/triggers_pause_status/script @@ -0,0 +1,4 @@ +for target in no_preset paused unpaused dev; do + title "Target: $target" + trace $CLI bundle validate -t $target -o json | jq '.resources.jobs | map_values([.triggers[].pause_status])' +done diff --git a/bundle/config/mutator/resourcemutator/apply_presets.go b/bundle/config/mutator/resourcemutator/apply_presets.go index 2c20366f5fc..d808daf82fb 100644 --- a/bundle/config/mutator/resourcemutator/apply_presets.go +++ b/bundle/config/mutator/resourcemutator/apply_presets.go @@ -90,6 +90,11 @@ func (m *applyPresets) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnos if j.Trigger != nil && j.Trigger.PauseStatus == "" { j.Trigger.PauseStatus = paused } + for i := range j.Triggers { + if j.Triggers[i].PauseStatus == "" { + j.Triggers[i].PauseStatus = paused + } + } } }