Merge of #5956

docs/docs/04-standard-library/cloud/schedule.md

@@ -301,13 +301,21 @@ Trigger events according to a cron schedule using the UNIX cron format.
 
 Timezone is UTC.
 [minute] [hour] [day of month] [month] [day of week]
+'*' means all possible values.
+'-' means a range of values.
+',' means a list of values.
+[minute] allows 0-59.
+[hour] allows 0-23.
+[day of month] allows 1-31.
+[month] allows 1-12 or JAN-DEC.
+[day of week] allows 0-6 or SUN-SAT.
 
 ---
 
 *Example*
 
 ```wing
-"0/1 * ? * *"
+"* * * * *"
 ```
 
 

examples/tests/sdk_tests/schedule/init.test.w

@@ -39,12 +39,4 @@ if (util.env("WING_TARGET") != "sim") {
       error = e;
   }
   assert(error ==  "cron string must be UNIX cron format [minute] [hour] [day of month] [month] [day of week]");
-
-
-  try {
-      new cloud.Schedule( cron: "* * * * *" ) as "s5";
-  } catch e {
-      error = e;
-  }
-  assert(error == "cannot use * in both the Day-of-month and Day-of-week fields. If you use it in one, you must use ? in the other");
 }

libs/awscdk/src/schedule.ts

@@ -9,8 +9,10 @@ import { Construct } from "constructs";
 import { App } from "./app";
 import { cloud, core, std } from "@winglang/sdk";
 import { convertBetweenHandlers } from "@winglang/sdk/lib/shared/convert";
+import { convertUnixCronToAWSCron } from "@winglang/sdk/lib/shared-aws/schedule";
 import { isAwsCdkFunction } from "./function";
 
+
 /**
  * AWS implementation of `cloud.Schedule`.
  *
@@ -25,27 +27,15 @@ export class Schedule extends cloud.Schedule {
 
     const { rate, cron } = props;
 
-    /*
-     * The schedule cron string is Unix cron format: [minute] [hour] [day of month] [month] [day of week]
-     * AWS EventBridge Schedule uses a 6 field format which includes year: [minute] [hour] [day of month] [month] [day of week] [year]
-     * https://docs.aws.amazon.com/scheduler/latest/UserGuide/schedule-types.html#cron-based
-     *
-     * We append * to the cron string for year field.
-     */
     if (cron) {
-      const cronArr = cron.split(" ");
-      let cronOpt: { [k: string]: string } = {
-        minute: cronArr[0],
-        hour: cronArr[1],
-        month: cronArr[3],
-        year: "*",
-      };
-      if (cronArr[2] !== "?") {
-        cronOpt.day = cronArr[2];
-      }
-      if (cronArr[4] !== "?") {
-        cronOpt.weekDay = cronArr[4];
-      }
+      let cronOpt: { [k: string]: string } = {};
+      const awsCron = convertUnixCronToAWSCron(cron);
+      const cronArr = awsCron.split(" ");
+      if (cronArr[0] !== "*" && cronArr[0] !== "?") { cronOpt.minute = cronArr[0]; }
+      if (cronArr[1] !== "*" && cronArr[1] !== "?") { cronOpt.hour = cronArr[1]; }
+      if (cronArr[2] !== "*" && cronArr[2] !== "?") { cronOpt.day = cronArr[2]; }
+      if (cronArr[3] !== "*" && cronArr[3] !== "?") { cronOpt.month = cronArr[3]; }
+      if (cronArr[4] !== "*" && cronArr[4] !== "?") { cronOpt.weekDay = cronArr[4]; }
 
       this.scheduleExpression = EventSchedule.cron(cronOpt);
     } else {