Merge pull request #8638 from dokku/8637-cron-set-lacks-global-flag-in-dokku-0-38-x

Support --global on cron:set

docs/processes/scheduled-cron-tasks.md

@@ -68,7 +68,7 @@ The `cron` plugin provides a number of settings that can be used to managed depl
 | Name                  | Description                                                    | Level       | Global Default |
 |-----------------------|----------------------------------------------------------------|-------------|----------------|
 | `mailfrom`            | Sets the `MAILFROM` variable in a cron file for cron reporting | Global-only | empty string   |
-| `maintenance`         | Whether to have cron running for the app or not.               | App-only    | `false`        |
+| `maintenance`         | Whether to have cron running for the app or not.               | App and Global | `false`     |
 | `mailto`              | Sets the `MAILTO` variable in a cron file for cron reporting   | Global-only | empty string   |
 
 All settings can be set via the `cron:set` command. Using `maintenance` as an example:

plugins/cron/subcommands.go

@@ -192,9 +192,13 @@ func CommandSet(appName string, property string, value string) error {
 
 	common.CommandPropertySet("cron", appName, property, value, validProperties, globalProperties)
 	scheduler := common.GetAppScheduler(appName)
+	triggerArgs := []string{scheduler, appName}
+	if appName == "--global" {
+		triggerArgs = []string{scheduler}
+	}
 	_, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
 		Trigger:     "scheduler-cron-write",
-		Args:        []string{scheduler, appName},
+		Args:        triggerArgs,
 		StreamStdio: true,
 	})
 	return err

plugins/scheduler-k3s/triggers.go

@@ -255,6 +255,10 @@ func TriggerSchedulerCronWrite(scheduler string, appName string) error {
 		return nil
 	}
 
+	if appName == "" {
+		return nil
+	}
+
 	cronTasks, err := cron.FetchCronTasks(cron.FetchCronTasksInput{AppName: appName})
 	if err != nil {
 		return fmt.Errorf("Error fetching cron tasks: %w", err)

tests/unit/cron.bats

@@ -120,6 +120,80 @@ teardown() {
   assert_success
 }
 
+@test "(cron:set) --global mailto" {
+  run /bin/bash -c "dokku cron:set --global mailto admin@example.com"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_contains "unknown flag"
+
+  run /bin/bash -c "dokku cron:report --global --format json | jq -r '.\"cron-mailto\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "admin@example.com"
+
+  run /bin/bash -c "dokku cron:set --global mailto"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_contains "unknown flag"
+
+  run /bin/bash -c "dokku cron:report --global --format json | jq -r '.\"cron-mailto\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output ""
+}
+
+@test "(cron:set) --global mailfrom" {
+  run /bin/bash -c "dokku cron:set --global mailfrom dokku@example.com"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_contains "unknown flag"
+
+  run /bin/bash -c "dokku cron:report --global --format json | jq -r '.\"cron-mailfrom\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "dokku@example.com"
+
+  run /bin/bash -c "dokku cron:set --global mailfrom"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_contains "unknown flag"
+}
+
+@test "(cron:set) --global maintenance" {
+  run /bin/bash -c "dokku cron:set --global maintenance true"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_contains "unknown flag"
+
+  run /bin/bash -c "dokku cron:report --global --format json | jq -r '.\"cron-global-maintenance\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "true"
+
+  run /bin/bash -c "dokku cron:set --global maintenance"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_contains "unknown flag"
+}
+
+@test "(cron:set) --global rejects task maintenance properties" {
+  run /bin/bash -c "dokku cron:set --global maintenance.fakeid true"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "Task maintenance properties cannot be set globally"
+}
+
 @test "(cron) create [multiple]" {
   run deploy_app python dokku@$DOKKU_DOMAIN:$TEST_APP template_cron_file_valid_multiple
   echo "output: $output"