Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(scheduler): validate expressions and target role ARNs (#4561)

vamsiak3ce093f20830
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SchedulerTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SchedulerTest.java
index a0a22e0f58..4a9f2123ce 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SchedulerTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SchedulerTest.java
@@ -189,7 +189,8 @@ class SchedulerTest {
.name(SCHEDULE_NAME)
.scheduleExpression("rate(1 hour)")
.flexibleTimeWindow(FlexibleTimeWindow.builder().mode(FlexibleTimeWindowMode.OFF).build())
- .target(Target.builder().arn("arn:t").roleArn("arn:r").build())
+ .target(Target.builder().arn("arn:t")
+ .roleArn("arn:aws:iam::000000000000:role/r").build())
.build()))
.isInstanceOf(ConflictException.class);
}
@@ -482,7 +483,8 @@ class SchedulerTest {
.name("does-not-exist-schedule")
.scheduleExpression("rate(1 hour)")
.flexibleTimeWindow(FlexibleTimeWindow.builder().mode(FlexibleTimeWindowMode.OFF).build())
- .target(Target.builder().arn("arn:t").roleArn("arn:r").build())
+ .target(Target.builder().arn("arn:t")
+ .roleArn("arn:aws:iam::000000000000:role/r").build())
.build()))
.isInstanceOf(ResourceNotFoundException.class);
}
diff --git a/docs/services/scheduler.md b/docs/services/scheduler.md
index 6e221b20a4..d6c3db30b4 100644
--- a/docs/services/scheduler.md
+++ b/docs/services/scheduler.md
@@ -25,13 +25,17 @@
When `floci.services.scheduler.invocation-enabled` is `true` (the default), a
background dispatcher fires schedule targets on time. Supported expressions:
-- `at(YYYY-MM-DDTHH:mm:ss)` — one-time fire; honors `ScheduleExpressionTimezone`
+- `at(YYYY-MM-DDTHH:mm:ss)`: one-time fire; honors `ScheduleExpressionTimezone`
(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;
+- `rate(N unit)`: repeating fire (`minutes`, `hours`, `days`).
+- `cron(minute hour day-of-month month day-of-week year)`: AWS 6-field cron;
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.
+`CreateSchedule` and `UpdateSchedule` validate expression syntax and require
+`Target.RoleArn` to be an IAM role ARN. Invalid values return HTTP 400 with
+`ValidationException`, including when a Step Functions task calls Scheduler.
+
`State=DISABLED` schedules and schedules outside their `StartDate`/`EndDate`
window are skipped. The dispatcher ticks every
`floci.services.scheduler.tick-interval-seconds` (default `10`).
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.java
index 1c6f990ed3..95af2be369 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
@@ -11,6 +11,7 @@ import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.format.ResolverStyle;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -19,10 +20,11 @@ import java.util.regex.Pattern;
*
* Supported forms (matches the AWS API):
* <ul>
- * <li>{@code at(YYYY-MM-DDTHH:mm:ss)} — one-time fire at the given instant
+ * <li>{@code at(YYYY-MM-DDTHH:mm:ss)}: one-time fire at the given instant
* (interpreted in {@code scheduleExpressionTimezone}, default UTC).</li>
- * <li>{@code rate(N unit)} — repeating fire every N minutes/hours/days/weeks.</li>
- * <li>{@code cron(fields)} — six-field AWS EventBridge cron (minute hour DOM month DOW year).</li>
+ * <li>{@code rate(N unit)}: repeating fire every N minutes/hours/days;
+ * previously persisted week-based schedules remain readable.</li>
+ * <li>{@code cron(fields)}: six-field AWS EventBridge cron (minute hour DOM month DOW year).</li>
* </ul>
*/
public final class SchedulerExpressionParser {
@@ -35,12 +37,17 @@ public final class SchedulerExpressionParser {
"^rate\\(\\s*(\\d+)\\s+(minutes?|hours?|days?|weeks?)\\s*\\)$",
Pattern.CASE_INSENSITIVE);
+ private static final Pattern AWS_RATE_PATTERN = Pattern.compile(
+ "^rate\\(\\s*(\\d+)\\s+(minutes?|hours?|days?)\\s*\\)$",
+ Pattern.CASE_INSENSITIVE);
+
private static final Pattern CRON_PATTERN = Pattern.compile(
"^cron\\((.+)\\)$",
Pattern.CASE_INSENSITIVE);
private static final DateTimeFormatter AT_FORMATTER =
- DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+ DateTimeFormatter.ofPattern("uuuu-MM-dd'T'HH:mm:ss")
+ .withResolverStyle(ResolverStyle.STRICT);
private static final CronParser CRON_PARSER = AwsCronDefinitions.newParser();
@@ -59,6 +66,30 @@ public final class SchedulerExpressionParser {
throw new IllegalArgumentException("Unsupported schedule expression: " + expression);
}
+ /** Checks the complete expression before a schedule is persisted. */
+ public static void validate(String expression, String timezone) {
+ switch (classify(expression)) {
+ case AT -> parseAt(expression, timezone);
+ case RATE -> {
+ Matcher rate = AWS_RATE_PATTERN.matcher(expression.trim());
+ if (!rate.matches()) {
+ throw new IllegalArgumentException("Week-based rates are not supported by Scheduler");
+ }
+ parseRateMillis(expression);
+ long value = Long.parseLong(rate.group(1));
+ String unit = rate.group(2);
+ boolean plural = unit.endsWith("s") || unit.endsWith("S");
+ if ((value == 1) == plural) {
+ throw new IllegalArgumentException("Rate unit must be singular for 1 and plural for values greater than 1");
+ }
+ }
+ case CRON -> {
+ parseCron(expression);
+ resolveZone(timezone);
+ }
+ }
+ }
+
/**
* Parses an {@code at(...)} expression and returns the fire instant.
* The timestamp is interpreted in {@code timezone} (default UTC).
@@ -81,16 +112,16 @@ public final class SchedulerExpressionParser {
if (!m.matches()) {
throw new IllegalArgumentException("Not a valid rate() expression: " + expression);
}
- int value = Integer.parseInt(m.group(1));
+ long value = Long.parseLong(m.group(1));
if (value < 1) {
throw new IllegalArgumentException("Rate value must be >= 1, got: " + value);
}
String unit = m.group(2).toLowerCase();
return switch (unit) {
- case "minute", "minutes" -> value * 60_000L;
- case "hour", "hours" -> value * 3_600_000L;
- case "day", "days" -> value * 86_400_000L;
- case "week", "weeks" -> value * 604_800_000L;
+ case "minute", "minutes" -> Math.multiplyExact(value, 60_000L);
+ case "hour", "hours" -> Math.multiplyExact(value, 3_600_000L);
+ case "day", "days" -> Math.multiplyExact(value, 86_400_000L);
+ case "week", "weeks" -> Math.multiplyExact(value, 604_800_000L);
default -> throw new IllegalArgumentException("Unknown rate unit: " + unit);
};
}
@@ -100,6 +131,18 @@ public final class SchedulerExpressionParser {
* evaluated in {@code timezone} (default UTC).
*/
public static Instant nextCronFire(String expression, Instant from, String timezone) {
+ Cron cron = parseCron(expression);
+ ExecutionTime exec = ExecutionTime.forCron(cron);
+
+ ZoneId zone = resolveZone(timezone);
+ ZonedDateTime zdt = from.atZone(zone);
+ return exec.nextExecution(zdt)
+ .map(ZonedDateTime::toInstant)
+ .orElseThrow(() -> new IllegalStateException(
+ "No next fire time for cron expression: " + expression));
+ }
+
+ private static Cron parseCron(String expression) {
Matcher m = CRON_PATTERN.matcher(expression.trim());
if (!m.matches()) {
throw new IllegalArgumentException("Not a valid cron() expression: " + expression);
@@ -113,14 +156,7 @@ public final class SchedulerExpressionParser {
}
Cron cron = CRON_PARSER.parse("0 " + cronFields);
cron.validate();
- ExecutionTime exec = ExecutionTime.forCron(cron);
-
- ZoneId zone = resolveZone(timezone);
- ZonedDateTime zdt = from.atZone(zone);
- return exec.nextExecution(zdt)
- .map(ZonedDateTime::toInstant)
- .orElseThrow(() -> new IllegalStateException(
- "No next fire time for cron expression: " + expression));
+ return cron;
}
private static ZoneId resolveZone(String timezone) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java
index 82be0b4801..b6a6b9dc7f 100644
--- a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java
@@ -19,6 +19,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.jboss.logging.Logger;
+import java.time.DateTimeException;
import java.time.Instant;
import java.util.List;
import java.util.Map;
@@ -31,6 +32,9 @@ public class SchedulerService {
// AWS EventBridge Scheduler name constraints: [0-9a-zA-Z-_.]+, 1-64 chars.
private static final Pattern NAME_PATTERN = Pattern.compile("[0-9a-zA-Z\\-_.]{1,64}");
+ private static final Pattern ROLE_ARN_PATTERN = Pattern.compile(
+ "arn:(?:" + AwsArnUtils.PARTITION_REGEX + "):iam::\\d{12}:role/[\\w+=,.@/-]+");
+ private static final String ROLE_ARN_MODEL_PATTERN = "^arn:aws(-[a-z]+)?:iam::\\d{12}:role\\/[\\w+=,.@\\/-]+$"; // partition-literal: the Scheduler model's RoleArn pattern, quoted verbatim in the error message
private static final String DEFAULT_GROUP = "default";
// FAIL_ON_TRAILING_TOKENS matters here: without it an Input of "{} garbage" parses as the
// leading object and the rest is silently dropped, so a value AWS rejects would be stored.
@@ -344,6 +348,17 @@ public class SchedulerService {
throw new AwsException("ValidationException",
"1 validation error detected: Value null at 'scheduleExpression' failed to satisfy constraint: Member must not be null", 400);
}
+ if (req.getScheduleExpression().length() > 256) {
+ throw new AwsException("ValidationException",
+ "1 validation error detected: Value '" + req.getScheduleExpression()
+ + "' at 'scheduleExpression' failed to satisfy constraint: Member must have length less than or equal to 256", 400);
+ }
+ try {
+ SchedulerExpressionParser.validate(req.getScheduleExpression(), req.getScheduleExpressionTimezone());
+ } catch (IllegalArgumentException | DateTimeException | ArithmeticException e) {
+ throw new AwsException("ValidationException",
+ "Invalid ScheduleExpression: " + e.getMessage(), 400);
+ }
if (req.getFlexibleTimeWindow() == null) {
throw new AwsException("ValidationException",
"1 validation error detected: Value null at 'flexibleTimeWindow' failed to satisfy constraint: Member must not be null", 400);
@@ -380,6 +395,17 @@ public class SchedulerService {
throw new AwsException("ValidationException",
"1 validation error detected: Value null at 'target.roleArn' failed to satisfy constraint: Member must not be null", 400);
}
+ if (req.getTarget().getRoleArn().length() > 1600) {
+ throw new AwsException("ValidationException",
+ "1 validation error detected: Value '" + req.getTarget().getRoleArn()
+ + "' at 'target.roleArn' failed to satisfy constraint: Member must have length less than or equal to 1600", 400);
+ }
+ if (!ROLE_ARN_PATTERN.matcher(req.getTarget().getRoleArn()).matches()) {
+ throw new AwsException("ValidationException",
+ "1 validation error detected: Value '" + req.getTarget().getRoleArn()
+ + "' at 'target.roleArn' failed to satisfy constraint: Member must satisfy regular expression pattern: "
+ + ROLE_ARN_MODEL_PATTERN, 400);
+ }
if (req.getTarget().getDeadLetterConfig() != null
&& (req.getTarget().getDeadLetterConfig().getArn() == null
|| req.getTarget().getDeadLetterConfig().getArn().isBlank())) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java
index 150b46b44f..fc4871c0e9 100644
--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java
@@ -204,6 +204,23 @@ class ScheduleDispatcherTest {
verify(invoker, times(2)).invoke(eq(s), any());
}
+ @Test
+ void firesPreviouslyPersistedWeekRateSchedule() {
+ Schedule schedule = newSchedule("legacy-weekly", "rate(1 week)", "ENABLED");
+ when(schedulerService.listAllSchedules()).thenReturn(List.of(schedule));
+
+ dispatcher.tick(Instant.parse("2026-04-28T08:59:59Z"));
+ verify(invoker, never()).invoke(any(), any());
+
+ Instant firstFire = Instant.parse("2026-04-28T09:00:00Z");
+ dispatcher.tick(firstFire);
+ verify(invoker).invoke(schedule, firstFire);
+
+ Instant secondFire = firstFire.plusSeconds(7 * 24 * 60 * 60);
+ dispatcher.tick(secondFire);
+ verify(invoker).invoke(schedule, secondFire);
+ }
+
@Test
void rateWithTimezoneStillUsesElapsedHoursAcrossSpringForward() {
Schedule s = newSchedule("rate-dst", "rate(1 day)", "ENABLED");
diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParserTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerExpressionParserTest.java
index 82b140ca86..c88526f09f 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
@@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
+import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
@@ -63,6 +64,9 @@ class SchedulerExpressionParserTest {
assertEquals(3_600_000L, SchedulerExpressionParser.parseRateMillis("rate(1 hour)"));
assertEquals(86_400_000L, SchedulerExpressionParser.parseRateMillis("rate(1 day)"));
assertEquals(604_800_000L, SchedulerExpressionParser.parseRateMillis("rate(1 week)"));
+ assertEquals(1_209_600_000L, SchedulerExpressionParser.parseRateMillis("rate(2 weeks)"));
+ assertThrows(IllegalArgumentException.class,
+ () -> SchedulerExpressionParser.validate("rate(1 week)", null));
}
@Test
@@ -71,6 +75,23 @@ class SchedulerExpressionParserTest {
() -> SchedulerExpressionParser.parseRateMillis("rate(0 minutes)"));
}
+ @Test
+ void validatesRateUnitAgreementWithoutChangingStoredExpressionParsing() {
+ for (String unit : List.of("minute", "hour", "day")) {
+ assertDoesNotThrow(() -> SchedulerExpressionParser.validate("rate(1 " + unit + ")", null));
+ assertDoesNotThrow(() -> SchedulerExpressionParser.validate("rate(5 " + unit + "s)", null));
+ assertThrows(IllegalArgumentException.class,
+ () -> SchedulerExpressionParser.validate("rate(1 " + unit + "s)", null));
+ assertThrows(IllegalArgumentException.class,
+ () -> SchedulerExpressionParser.validate("rate(5 " + unit + ")", null));
+ }
+ assertDoesNotThrow(() -> SchedulerExpressionParser.validate("RATE(1 HOUR)", null));
+ assertThrows(IllegalArgumentException.class,
+ () -> SchedulerExpressionParser.validate("RATE(1 HOURS)", null));
+ assertEquals(3_600_000L, SchedulerExpressionParser.parseRateMillis("rate(1 hours)"));
+ assertEquals(18_000_000L, SchedulerExpressionParser.parseRateMillis("rate(5 hour)"));
+ }
+
@Test
void nextCronFireComputesFutureInstant() {
Instant from = ZonedDateTime.of(2026, 4, 21, 9, 0, 0, 0, ZoneOffset.UTC).toInstant();
diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java
index e1fffaba6e..3318406edd 100644
--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java
@@ -19,6 +19,45 @@ import static org.hamcrest.Matchers.*;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class SchedulerIntegrationTest {
+ @Test
+ @Order(44)
+ void directScheduleRequestsRejectInvalidExpressionAndRoleArn() {
+ String validTarget = """
+ {"Arn":"arn:aws:sqs:us-east-1:000000000000:queue",
+ "RoleArn":"arn:aws:iam::000000000000:role/scheduler-role"}
+ """;
+ String invalidExpression = """
+ {"ScheduleExpression":"cron(invalid)",
+ "FlexibleTimeWindow":{"Mode":"OFF"},"Target":%s}
+ """.formatted(validTarget);
+ given().contentType("application/json").body(invalidExpression)
+ .when().post("/schedules/invalid-expression")
+ .then().statusCode(400).body("__type", containsString("ValidationException"));
+
+ String invalidRole = """
+ {"ScheduleExpression":"rate(1 hour)",
+ "FlexibleTimeWindow":{"Mode":"OFF"},
+ "Target":{"Arn":"arn:aws:sqs:us-east-1:000000000000:queue",
+ "RoleArn":"not-a-role-arn"}}
+ """;
+ given().contentType("application/json").body(invalidRole)
+ .when().post("/schedules/invalid-role")
+ .then().statusCode(400).body("__type", containsString("ValidationException"));
+
+ String valid = """
+ {"ScheduleExpression":"rate(1 hour)",
+ "FlexibleTimeWindow":{"Mode":"OFF"},"Target":%s}
+ """.formatted(validTarget);
+ given().contentType("application/json").body(valid)
+ .when().post("/schedules/validation-update")
+ .then().statusCode(200);
+ given().contentType("application/json").body(invalidExpression)
+ .when().put("/schedules/validation-update")
+ .then().statusCode(400).body("__type", containsString("ValidationException"));
+ given().when().get("/schedules/validation-update")
+ .then().statusCode(200).body("ScheduleExpression", equalTo("rate(1 hour)"));
+ }
+
@Test
@Order(1)
void createScheduleGroup() {
@@ -689,7 +728,7 @@ class SchedulerIntegrationTest {
{
"ScheduleExpression": "rate(1 hour)",
"FlexibleTimeWindow": {"Mode": "OFF"},
- "Target": {"Arn": "arn:t", "RoleArn": "arn:r"}
+ "Target": {"Arn": "arn:t", "RoleArn": "arn:aws:iam::000000000000:role/r"}
}
""")
.when()
@@ -930,7 +969,7 @@ class SchedulerIntegrationTest {
{
"ScheduleExpression": "rate(1 hour)",
"FlexibleTimeWindow": {"Mode": "OFF"},
- "Target": {"Arn": "arn:t", "RoleArn": "arn:r"}
+ "Target": {"Arn": "arn:t", "RoleArn": "arn:aws:iam::000000000000:role/r"}
}
""")
.when()
diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerServiceTest.java
index 75e9d7820a..768c4686f0 100644
--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerServiceTest.java
@@ -142,12 +142,12 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s1", "cascade-grp", "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.createSchedule(
newRequest("s2", "cascade-grp", "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.deleteScheduleGroup("cascade-grp", REGION);
assertThrows(AwsException.class, () ->
@@ -210,6 +210,75 @@ class SchedulerServiceTest {
assertNotNull(s.getLastModificationDate());
}
+ @Test
+ void createAndUpdateRejectInvalidExpressions() {
+ Target target = new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null);
+ FlexibleTimeWindow window = new FlexibleTimeWindow("OFF", null);
+ for (String expression : List.of("cron(invalid)", "cron(0 10 * * *)",
+ "rate(0 minutes)", "rate(1 week)", "rate(1 hours)", "rate(5 hour)",
+ "rate(1 minutes)", "rate(5 minute)", "rate(1 days)", "rate(5 day)",
+ "at(2026-02-30T10:00:00)")) {
+ ScheduleRequest invalid = newRequest("invalid", null, expression, window, target);
+ AwsException createError = assertThrows(AwsException.class,
+ () -> service.createSchedule(invalid, REGION), expression);
+ assertEquals("ValidationException", createError.getErrorCode());
+ assertEquals(400, createError.getHttpStatus());
+ assertTrue(createError.getMessage().startsWith("Invalid ScheduleExpression: "));
+ }
+
+ ScheduleRequest valid = newRequest("existing", null, "rate(1 hour)", window, target);
+ service.createSchedule(valid, REGION);
+ for (String expression : List.of("cron(invalid)", "rate(1 week)", "rate(1 hours)", "rate(5 hour)")) {
+ ScheduleRequest invalidUpdate = newRequest("existing", null, expression, window, target);
+ AwsException updateError = assertThrows(AwsException.class,
+ () -> service.updateSchedule(invalidUpdate, REGION), expression);
+ assertEquals("ValidationException", updateError.getErrorCode());
+ assertTrue(updateError.getMessage().startsWith("Invalid ScheduleExpression: "));
+ assertEquals("rate(1 hour)", service.getSchedule("existing", null, REGION).getScheduleExpression());
+ }
+ }
+
+ @Test
+ void createAndUpdateRejectInvalidTargetRoleArn() {
+ FlexibleTimeWindow window = new FlexibleTimeWindow("OFF", null);
+ for (String roleArn : List.of("not-a-role-arn", "arn:aws:iam::123:role/r",
+ "arn:aws:iam::000000000000:user/r")) {
+ ScheduleRequest invalid = newRequest("invalid", null, "rate(1 hour)", window,
+ new Target("arn:t", roleArn, null, null));
+ AwsException error = assertThrows(AwsException.class,
+ () -> service.createSchedule(invalid, REGION), roleArn);
+ assertEquals("ValidationException", error.getErrorCode());
+ assertEquals(400, error.getHttpStatus());
+ assertTrue(error.getMessage().startsWith("1 validation error detected: Value '" + roleArn
+ + "' at 'target.roleArn' failed to satisfy constraint: Member must satisfy regular expression pattern: "));
+ assertEquals("1 validation error detected: Value '" + roleArn
+ + "' at 'target.roleArn' failed to satisfy constraint: Member must satisfy regular expression pattern: "
+ + "^arn:aws(-[a-z]+)?:iam::\\d{12}:role\\/[\\w+=,.@\\/-]+$", error.getMessage());
+ }
+
+ Target validTarget = new Target("arn:t", "arn:aws-us-gov:iam::000000000000:role/path/r", null, null);
+ service.createSchedule(newRequest("existing", null, "rate(1 hour)", window, validTarget), REGION);
+ ScheduleRequest invalidUpdate = newRequest("existing", null, "rate(1 hour)", window,
+ new Target("arn:t", "not-a-role-arn", null, null));
+ AwsException updateError = assertThrows(AwsException.class,
+ () -> service.updateSchedule(invalidUpdate, REGION));
+ assertEquals("ValidationException", updateError.getErrorCode());
+ assertEquals(validTarget.getRoleArn(), service.getSchedule("existing", null, REGION).getTarget().getRoleArn());
+ }
+
+ @Test
+ void createAcceptsValidAtRateAndSixFieldCron() {
+ Target target = new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null);
+ FlexibleTimeWindow window = new FlexibleTimeWindow("OFF", null);
+ List<String> expressions = List.of("at(2026-10-01T10:00:00)", "rate(2 days)",
+ "cron(0 10 ? * MON *)");
+ for (int i = 0; i < expressions.size(); i++) {
+ Schedule schedule = service.createSchedule(
+ newRequest("valid-" + i, null, expressions.get(i), window, target), REGION);
+ assertEquals(expressions.get(i), schedule.getScheduleExpression());
+ }
+ }
+
@Test
void createScheduleInCustomGroup() {
service.createScheduleGroup("custom", null, REGION);
@@ -228,7 +297,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", null, null,
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -238,7 +307,7 @@ class SchedulerServiceTest {
AwsException e = assertThrows(AwsException.class, () ->
service.createSchedule(
newRequest("s", null, "rate(1 hour)", null,
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -259,7 +328,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target(null, "arn:r", null, null)),
+ new Target(null, "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -281,7 +350,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", null, "rate(1 hour)",
new FlexibleTimeWindow(null, null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -292,7 +361,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", null, "rate(1 hour)",
new FlexibleTimeWindow("INVALID", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -303,7 +372,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", null, "rate(1 hour)",
new FlexibleTimeWindow("FLEXIBLE", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -314,14 +383,14 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", 10),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@Test
void createScheduleDeadLetterConfigMissingArnThrows() {
- Target target = new Target("arn:t", "arn:r", null, null);
+ Target target = new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null);
target.setDeadLetterConfig(new DeadLetterConfig(null));
AwsException e = assertThrows(AwsException.class, () ->
service.createSchedule(
@@ -434,13 +503,13 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("val-upd", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
AwsException e = assertThrows(AwsException.class, () ->
service.updateSchedule(
newRequest("val-upd", null, null,
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ValidationException", e.getErrorCode());
}
@@ -450,13 +519,13 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("dup", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
AwsException e = assertThrows(AwsException.class, () ->
service.createSchedule(
newRequest("dup", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ConflictException", e.getErrorCode());
}
@@ -467,7 +536,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s", "no-such-group", "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ResourceNotFoundException", e.getErrorCode());
}
@@ -477,7 +546,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("find-me", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
Schedule s = service.getSchedule("find-me", null, REGION);
assertEquals("find-me", s.getName());
@@ -494,13 +563,13 @@ class SchedulerServiceTest {
void updateSchedule() {
ScheduleRequest createReq = newRequest("upd", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null));
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null));
createReq.setDescription("original desc");
service.createSchedule(createReq, REGION);
ScheduleRequest updateReq = newRequest("upd", null, "rate(5 minutes)",
new FlexibleTimeWindow("FLEXIBLE", 10),
- new Target("arn:t2", "arn:r2", "{}", null));
+ new Target("arn:t2", "arn:aws:iam::000000000000:role/r2", "{}", null));
updateReq.setScheduleExpressionTimezone("UTC");
updateReq.setDescription("updated desc");
updateReq.setState("DISABLED");
@@ -514,7 +583,7 @@ class SchedulerServiceTest {
@Test
void createAndUpdatePreserveRecurringExpressionAndTimezone() {
- Target target = new Target("arn:t", "arn:r", null, null);
+ Target target = new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null);
FlexibleTimeWindow window = new FlexibleTimeWindow("OFF", null);
Schedule created = service.createSchedule(
newRequest("recurring", null, "rate(1 day)", window, target), REGION);
@@ -539,7 +608,7 @@ class SchedulerServiceTest {
service.updateSchedule(
newRequest("missing", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION));
assertEquals("ResourceNotFoundException", e.getErrorCode());
}
@@ -549,7 +618,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("to-del", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.deleteSchedule("to-del", null, REGION);
assertThrows(AwsException.class, () ->
@@ -568,12 +637,12 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s1", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.createSchedule(
newRequest("s2", null, "rate(2 hours)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
List<Schedule> result = service.listSchedules(null, null, null, REGION);
assertEquals(2, result.size());
@@ -585,12 +654,12 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s-default", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.createSchedule(
newRequest("s-group-a", "group-a", "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
List<Schedule> result = service.listSchedules(null, null, null, REGION);
assertEquals(2, result.size());
@@ -604,12 +673,12 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("s-in-default", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.createSchedule(
newRequest("s-in-group-b", "group-b", "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
List<Schedule> result = service.listSchedules("group-b", null, null, REGION);
assertEquals(1, result.size());
@@ -621,17 +690,17 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("alpha-1", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.createSchedule(
newRequest("alpha-2", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
service.createSchedule(
newRequest("beta-1", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
REGION);
List<Schedule> result = service.listSchedules(null, "alpha", null, REGION);
assertEquals(2, result.size());
@@ -642,13 +711,13 @@ class SchedulerServiceTest {
void listSchedulesWithStateFilter() {
ScheduleRequest enabledReq = newRequest("enabled-1", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null));
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null));
enabledReq.setState("ENABLED");
service.createSchedule(enabledReq, REGION);
ScheduleRequest disabledReq = newRequest("disabled-1", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null));
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null));
disabledReq.setState("DISABLED");
service.createSchedule(disabledReq, REGION);
@@ -672,14 +741,14 @@ class SchedulerServiceTest {
@Test
void updateScheduleOverwritesDeadLetterConfig() {
- Target target = new Target("arn:t", "arn:r", null, null);
+ Target target = new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null);
target.setDeadLetterConfig(new DeadLetterConfig("arn:aws:sqs:us-east-1:000000000000:dlq"));
service.createSchedule(
newRequest("dlc-upd", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null), target),
REGION);
- Target updatedTarget = new Target("arn:t2", "arn:r2", null, null);
+ Target updatedTarget = new Target("arn:t2", "arn:aws:iam::000000000000:role/r2", null, null);
updatedTarget.setDeadLetterConfig(new DeadLetterConfig("arn:aws:sqs:us-east-1:000000000000:dlq-updated"));
ScheduleRequest updateReq = newRequest("dlc-upd", null, "rate(5 minutes)",
new FlexibleTimeWindow("OFF", null), updatedTarget);
@@ -690,7 +759,7 @@ class SchedulerServiceTest {
@Test
void createScheduleWithRetryPolicy() {
- Target target = new Target("arn:t", "arn:r", null, null);
+ Target target = new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null);
target.setRetryPolicy(new RetryPolicy(3600, 5));
ScheduleRequest req = newRequest("retry-schedule", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null), target);
@@ -706,7 +775,7 @@ class SchedulerServiceTest {
Instant end = Instant.parse("2026-12-31T23:59:59Z");
ScheduleRequest req = newRequest("dated-schedule", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null));
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null));
req.setStartDate(start);
req.setEndDate(end);
Schedule s = service.createSchedule(req, REGION);
@@ -723,7 +792,7 @@ class SchedulerServiceTest {
service.createSchedule(
newRequest("regional", null, "rate(1 hour)",
new FlexibleTimeWindow("OFF", null),
- new Target("arn:t", "arn:r", null, null)),
+ new Target("arn:t", "arn:aws:iam::000000000000:role/r", null, null)),
"us-east-1");
assertThrows(AwsException.class, () ->
service.getSchedule("regional", null, "us-west-2"));
diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java
index e312c76dfd..8e6c58c6cf 100644
--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java
@@ -846,6 +846,66 @@ class StepFunctionsAwsSdkTaskIntegrationTest {
assertEquals("Scheduler.ValidationException", result.path("caughtError").asText());
}
+ @Test
+ @Order(27)
+ void schedulerValidationErrorsAreCatchableFromCreateAndUpdateTasks() throws Exception {
+ String[][] cases = {
+ {"createSchedule", "aws-sdk-invalid-expression", "cron(invalid)", ROLE_ARN},
+ {"createSchedule", "aws-sdk-invalid-role", "rate(1 hour)", "not-a-role-arn"},
+ {"updateSchedule", "aws-sdk-invalid-update", "cron(invalid)", ROLE_ARN}
+ };
+ given().contentType("application/json").body("""
+ {"ScheduleExpression":"rate(1 hour)",
+ "FlexibleTimeWindow":{"Mode":"OFF"},
+ "Target":{"Arn":"TARGET_ARN","RoleArn":"ROLE"}}
+ """.replace("TARGET_ARN", quickChildArn).replace("ROLE", ROLE_ARN))
+ .when().post("/schedules/aws-sdk-invalid-update")
+ .then().statusCode(200);
+
+ for (int i = 0; i < cases.length; i++) {
+ String[] testCase = cases[i];
+ String stateMachineArn = createStateMachine("aws-sdk-validation-" + i,
+ catchingScheduleValidationTask(testCase[0], testCase[1], testCase[2], testCase[3]));
+ JsonNode result = mapper.readTree(succeedingOutputOf(stateMachineArn, "{}"));
+ assertEquals("Scheduler.ValidationException", result.path("caughtError").asText(),
+ testCase[0] + ": " + testCase[2]);
+ }
+ }
+
+ private static String catchingScheduleValidationTask(String action, String scheduleName,
+ String expression, String roleArn) {
+ return """
+ {
+ "QueryLanguage": "JSONata",
+ "StartAt": "Schedule",
+ "States": {
+ "Schedule": {
+ "Type": "Task",
+ "Resource": "arn:aws:states:::aws-sdk:scheduler:ACTION",
+ "Arguments": {
+ "Name": "SCHEDULE_NAME",
+ "ScheduleExpression": "EXPRESSION",
+ "FlexibleTimeWindow": {"Mode": "OFF"},
+ "Target": {"Arn": "TARGET_ARN", "RoleArn": "ROLE"}
+ },
+ "Catch": [{
+ "ErrorEquals": ["Scheduler.ValidationException"],
+ "Next": "Recovered",
+ "Output": {"caughtError": "{% $states.errorOutput.Error %}"}
+ }],
+ "End": true
+ },
+ "Recovered": {"Type": "Pass", "End": true}
+ }
+ }
+ """
+ .replace("ACTION", action)
+ .replace("SCHEDULE_NAME", scheduleName)
+ .replace("EXPRESSION", expression)
+ .replace("TARGET_ARN", quickChildArn)
+ .replace("ROLE", roleArn);
+ }
+
private static String deleteScheduleTask(String scheduleName, String groupName) {
String groupArgument = groupName == null ? "" : ", \"GroupName\": \"" + groupName + "\"";
return """