Light, fluffy, and always free - The AWS Local Emulator alternative
fix(eventbridge,scheduler): read cron day-of-week as AWS 1-7 SUN-SAT (#3147)
Max Freedom Pollard60a8a9d25262
diff --git a/docs/services/scheduler.md b/docs/services/scheduler.mdindex 3fbc662a37..2a5e14a1c8 100644--- a/docs/services/scheduler.md+++ b/docs/services/scheduler.md@@ -29,7 +29,8 @@ background dispatcher fires schedule targets on time. Supported expressions:(default UTC) and `ActionAfterCompletion=DELETE`.- `rate(N unit)` — repeating fire (`minutes`, `hours`, `days`, `weeks`).- `cron(minute hour day-of-month month day-of-week year)` — AWS 6-field cron;- honors `ScheduleExpressionTimezone`.+ honors `ScheduleExpressionTimezone`. Day-of-week is `1-7` or `SUN-SAT`, so+ `2` is Monday and `cron(30 2 ? * 2#1 *)` is the first Monday of the month.`State=DISABLED` schedules and schedules outside their `StartDate`/`EndDate`window are skipped. The dispatcher ticks everydiff --git a/src/main/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParser.java b/src/main/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParser.javaindex 02606055b9..1f2f121d20 100644--- a/src/main/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParser.java+++ b/src/main/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParser.java@@ -29,7 +29,11 @@ public final class ScheduleExpressionParser {.withHours().and().withDayOfMonth().supportsHash().supportsL().supportsW().supportsQuestionMark().and().withMonth().and()- .withDayOfWeek().supportsHash().supportsL().supportsW().supportsQuestionMark().and()+ // AWS numbers day-of-week 1-7 as SUN-SAT, not the Unix 0-6 SUN-SAT that cron-utils+ // defaults to, so Monday is 2. Without this every numeric day fires one day late and+ // 7 (Saturday) does not parse at all.+ .withDayOfWeek().withValidRange(1, 7).withMondayDoWValue(2)+ .supportsHash().supportsL().supportsW().supportsQuestionMark().and().withYear().optional().and().instance();CRON_PARSER = new CronParser(definition);diff --git a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParser.java b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParser.javaindex 46b1404adf..df6fc48af5 100644--- a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParser.java+++ b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParser.java@@ -52,7 +52,11 @@ public final class SchedulerExpressionParser {.withHours().and().withDayOfMonth().supportsHash().supportsL().supportsW().supportsQuestionMark().and().withMonth().and()- .withDayOfWeek().supportsHash().supportsL().supportsW().supportsQuestionMark().and()+ // AWS numbers day-of-week 1-7 as SUN-SAT, not the Unix 0-6 SUN-SAT that cron-utils+ // defaults to, so Monday is 2. Without this every numeric day fires one day late and+ // 7 (Saturday) does not parse at all.+ .withDayOfWeek().withValidRange(1, 7).withMondayDoWValue(2)+ .supportsHash().supportsL().supportsW().supportsQuestionMark().and().withYear().optional().and().instance();CRON_PARSER = new CronParser(definition);diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParserTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParserTest.javaindex ce685f8d0b..538763ee02 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParserTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/ScheduleExpressionParserTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.eventbridge;import org.junit.jupiter.api.Test;+import java.time.DayOfWeek;import java.time.ZonedDateTime;import static org.junit.jupiter.api.Assertions.*;@@ -123,11 +124,15 @@ class ScheduleExpressionParserTest {@Testvoid getNextFireTimeWeekdays() {+ // AWS day-of-week is 1-7 = SUN-SAT, so Monday to Friday is 2-6.ZonedDateTime from = ZonedDateTime.parse("2026-03-23T08:00:00Z");- ZonedDateTime next = ScheduleExpressionParser.getNextFireTime("cron(0 9-17 * * 1-5 *)", from);+ ZonedDateTime next = ScheduleExpressionParser.getNextFireTime("cron(0 9-17 * * 2-6 *)", from);assertNotNull(next);assertTrue(next.getHour() >= 9 && next.getHour() <= 17);+ assertTrue(next.getDayOfWeek().getValue() >= DayOfWeek.MONDAY.getValue()+ && next.getDayOfWeek().getValue() <= DayOfWeek.FRIDAY.getValue(),+ "expected a weekday but got " + next);}@Test@@ -135,10 +140,52 @@ class ScheduleExpressionParserTest {ZonedDateTime from = ZonedDateTime.parse("2026-03-01T02:00:00Z");ZonedDateTime next = ScheduleExpressionParser.getNextFireTime("cron(30 2 ? * 2#1 *)", from);- assertNotNull(next);- assertEquals(2, next.getHour());- assertEquals(30, next.getMinute());- assertEquals(2, next.getDayOfWeek().getValue());+ assertEquals(ZonedDateTime.parse("2026-03-02T02:30:00Z"), next);+ assertEquals(DayOfWeek.MONDAY, next.getDayOfWeek());+ }++ // ──────────────────────────── Day-of-week numbering (AWS 1-7 = SUN-SAT) ────────────────────────────++ /** 2026-03-01 is a Sunday, so it doubles as the day the "from" instant lands on. */+ private static final ZonedDateTime SUNDAY_2026_03_01_02_00 = ZonedDateTime.parse("2026-03-01T02:00:00Z");++ @Test+ void dayOfWeekOneIsSunday() {+ assertEquals(ZonedDateTime.parse("2026-03-01T12:00:00Z"),+ ScheduleExpressionParser.getNextFireTime("cron(0 12 ? * 1 *)", SUNDAY_2026_03_01_02_00));+ }++ @Test+ void dayOfWeekTwoIsMonday() {+ assertEquals(ZonedDateTime.parse("2026-03-02T12:00:00Z"),+ ScheduleExpressionParser.getNextFireTime("cron(0 12 ? * 2 *)", SUNDAY_2026_03_01_02_00));+ }++ @Test+ void dayOfWeekSevenIsSaturdayAndIsAccepted() {+ assertEquals(ZonedDateTime.parse("2026-03-07T12:00:00Z"),+ ScheduleExpressionParser.getNextFireTime("cron(0 12 ? * 7 *)", SUNDAY_2026_03_01_02_00));+ }++ @Test+ void dayOfWeekNamesAgreeWithTheirNumbers() {+ assertEquals(+ ScheduleExpressionParser.getNextFireTime("cron(0 12 ? * 2 *)", SUNDAY_2026_03_01_02_00),+ ScheduleExpressionParser.getNextFireTime("cron(0 12 ? * MON *)", SUNDAY_2026_03_01_02_00));+ }++ @Test+ void lastWeekdayOfMonthUsesAwsNumbering() {+ // AWS documents cron(15 10 ? * 6L 2022-2023) as the last Friday of the month.+ // The last Friday of March 2026 is the 27th.+ assertEquals(ZonedDateTime.parse("2026-03-27T10:15:00Z"),+ ScheduleExpressionParser.getNextFireTime("cron(15 10 ? * 6L *)", SUNDAY_2026_03_01_02_00));+ }++ @Test+ void dayOfWeekZeroIsRejected() {+ assertThrows(IllegalArgumentException.class,+ () -> ScheduleExpressionParser.getNextFireTime("cron(0 12 ? * 0 *)", SUNDAY_2026_03_01_02_00));}@Testdiff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParserTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParserTest.javaindex 8439fa29a8..428cf0811d 100644--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParserTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParserTest.java@@ -96,4 +96,60 @@ class SchedulerExpressionParserTest {assertThrows(IllegalArgumentException.class,() -> SchedulerExpressionParser.nextCronFire("cron(0 10 * * *)", from, null));}++ // Day-of-week numbering: AWS is 1-7 = SUN-SAT.++ /** 2026-03-01 is a Sunday, so it doubles as the day the "from" instant lands on. */+ private static final Instant SUNDAY_2026_03_01_02_00 =+ ZonedDateTime.of(2026, 3, 1, 2, 0, 0, 0, ZoneOffset.UTC).toInstant();++ private static Instant utc(int day, int hour, int minute) {+ return ZonedDateTime.of(2026, 3, day, hour, minute, 0, 0, ZoneOffset.UTC).toInstant();+ }++ @Test+ void dayOfWeekOneIsSunday() {+ assertEquals(utc(1, 12, 0),+ SchedulerExpressionParser.nextCronFire("cron(0 12 ? * 1 *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }++ @Test+ void dayOfWeekTwoIsMonday() {+ assertEquals(utc(2, 12, 0),+ SchedulerExpressionParser.nextCronFire("cron(0 12 ? * 2 *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }++ @Test+ void dayOfWeekSevenIsSaturdayAndIsAccepted() {+ assertEquals(utc(7, 12, 0),+ SchedulerExpressionParser.nextCronFire("cron(0 12 ? * 7 *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }++ @Test+ void dayOfWeekNamesAgreeWithTheirNumbers() {+ assertEquals(+ SchedulerExpressionParser.nextCronFire("cron(0 12 ? * 2 *)", SUNDAY_2026_03_01_02_00, "UTC"),+ SchedulerExpressionParser.nextCronFire("cron(0 12 ? * MON *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }++ @Test+ void hashSelectsTheNthWeekdayOfTheMonth() {+ // 2#1 is the first Monday of March 2026, which is the 2nd.+ assertEquals(utc(2, 2, 30),+ SchedulerExpressionParser.nextCronFire("cron(30 2 ? * 2#1 *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }++ @Test+ void lastWeekdayOfMonthUsesAwsNumbering() {+ // AWS documents cron(15 10 ? * 6L 2022-2023) as the last Friday of the month.+ // The last Friday of March 2026 is the 27th.+ assertEquals(utc(27, 10, 15),+ SchedulerExpressionParser.nextCronFire("cron(15 10 ? * 6L *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }++ @Test+ void dayOfWeekZeroIsRejected() {+ assertThrows(IllegalArgumentException.class,+ () -> SchedulerExpressionParser.nextCronFire("cron(0 12 ? * 0 *)", SUNDAY_2026_03_01_02_00, "UTC"));+ }}