pr feedback

packages/backend-function/src/factory.ts

@@ -261,11 +261,7 @@ class FunctionFactory implements ConstructFactory<AmplifyFunction> {
       return [];
     }
 
-    const schedules = Array.isArray(this.props.schedule)
-      ? this.props.schedule
-      : [this.props.schedule];
-
-    return schedules;
+    return this.props.schedule;
   };
 }
 
@@ -376,14 +372,10 @@ class AmplifyFunction
       );
     }
 
-    const timeIntervals = Array.isArray(props.schedule)
-      ? props.schedule
-      : [props.schedule];
-
     try {
       const schedules = convertFunctionSchedulesToRuleSchedules(
         functionLambda,
-        timeIntervals
+        props.schedule
       );
       const lambdaTarget = new targets.LambdaFunction(functionLambda);
 

packages/backend-function/src/schedule_parser.ts

@@ -20,11 +20,15 @@ type CronPart =
  */
 export const convertFunctionSchedulesToRuleSchedules = (
   lambda: NodejsFunction,
-  schedules: FunctionSchedule[]
+  functionSchedules: FunctionSchedule | FunctionSchedule[]
 ) => {
   const errors: string[] = [];
   const ruleSchedules: Schedule[] = [];
 
+  const schedules = Array.isArray(functionSchedules)
+    ? functionSchedules
+    : [functionSchedules];
+
   schedules.forEach((schedule) => {
     if (isTimeInterval(schedule)) {
       const { value, unit } = parseTimeInterval(schedule);

packages/integration-tests/src/test-project-setup/data_storage_auth_with_triggers.ts

@@ -240,11 +240,13 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
     await this.checkLambdaResponse(funcWithSsm[0], 'It is working');
     await this.checkLambdaResponse(funcWithAwsSdk[0], 'It is working');
 
-    // test schedule function event trigger once
+    // Test schedule function event trigger on first deployment in order to do the following:
+    // 1. reduce flakiness on subsequent deployments (ex. sandbox updates)
+    // 2. reduce deployment e2e testing time as we are only waiting for 70 seconds one time per deployment
     if (this.checkInvocationCount) {
       const invocationCount = await this.getLambdaResponse(funcWithSchedule[0]);
 
-      // wait 1 minute and 10 seconds for schedule to invoke lambda again
+      // wait 70 seconds for schedule to invoke lambda again
       await new Promise((resolve) => setTimeout(resolve, 1000 * 70));
 
       await this.checkLambdaResponse(funcWithSchedule[0], invocationCount + 2);