add more testing

packages/backend-function/src/factory.test.ts

@@ -344,6 +344,14 @@ void describe('AmplifyFunctionFactory', () => {
 
       template.hasResourceProperties('AWS::Events::Rule', {
         ScheduleExpression: 'cron(*/5 * * * ? *)',
+        Targets: [
+          {
+            Arn: {
+              'Fn::GetAtt': ['handlerlambdaE29D1580', 'Arn'],
+            },
+            Id: 'Target0',
+          },
+        ],
       });
     });
 
@@ -356,6 +364,14 @@ void describe('AmplifyFunctionFactory', () => {
 
       template.hasResourceProperties('AWS::Events::Rule', {
         ScheduleExpression: 'cron(0 1 * * ? *)',
+        Targets: [
+          {
+            Arn: {
+              'Fn::GetAtt': ['handlerlambdaE29D1580', 'Arn'],
+            },
+            Id: 'Target0',
+          },
+        ],
       });
     });
 

packages/integration-tests/src/constants.ts

@@ -2,3 +2,8 @@
  * Used to run `create amplify` at a specific tagged release
  */
 export const amplifyAtTag = 'amplify@latest';
+
+/**
+ * Used as environment key for function to increment to keep track of number of invocations
+ */
+export const numInvocationsKey = 'NUM_INVOCATIONS';

packages/integration-tests/src/test-e2e/deployment.test.ts

@@ -30,6 +30,7 @@ import {
   amplifySharedSecretNameKey,
   createAmplifySharedSecretName,
 } from '../shared_secret.js';
+import { numInvocationsKey } from '../constants.js';
 
 const testProjectCreators = getTestProjectCreators();
 const testCdkProjectCreators = getTestCdkProjectCreators();
@@ -130,14 +131,12 @@ void describe('deployment tests', { concurrency: testConcurrencyLevel }, () => {
         });
 
         void describe('in sequence', { concurrency: false }, () => {
-          const sharedSecretsEnv = {
+          const env = {
             [amplifySharedSecretNameKey]: createAmplifySharedSecretName(),
+            [numInvocationsKey]: '0',
           };
           void it(`[${testProjectCreator.name}] deploys fully`, async () => {
-            await testProject.deploy(
-              sandboxBackendIdentifier,
-              sharedSecretsEnv
-            );
+            await testProject.deploy(sandboxBackendIdentifier, env);
             await testProject.assertPostDeployment(sandboxBackendIdentifier);
           });
 
@@ -146,7 +145,7 @@ void describe('deployment tests', { concurrency: testConcurrencyLevel }, () => {
               ['sandbox', '--once'],
               testProject.projectDirPath,
               {
-                env: sharedSecretsEnv,
+                env,
               }
             );
             await processController
@@ -161,7 +160,7 @@ void describe('deployment tests', { concurrency: testConcurrencyLevel }, () => {
               ['sandbox', '--dirToWatch', 'amplify'],
               testProject.projectDirPath,
               {
-                env: sharedSecretsEnv,
+                env,
               }
             );
 

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

@@ -17,6 +17,7 @@ import {
 import { HeadBucketCommand, S3Client } from '@aws-sdk/client-s3';
 import { GetRoleCommand, IAMClient } from '@aws-sdk/client-iam';
 import { AmplifyClient } from '@aws-sdk/client-amplify';
+import { numInvocationsKey } from '../constants.js';
 
 /**
  * Creates test projects with data, storage, and auth categories.
@@ -140,11 +141,12 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
       amplifySharedSecretNameKey in environment
         ? environment[amplifySharedSecretNameKey]
         : createAmplifySharedSecretName();
-    const sharedSecretEnvObject = {
+    const env = {
       [amplifySharedSecretNameKey]: this.amplifySharedSecret,
+      [numInvocationsKey]: '0',
     };
     await this.setUpDeployEnvironment(backendIdentifier);
-    await super.deploy(backendIdentifier, sharedSecretEnvObject);
+    await super.deploy(backendIdentifier, env);
   }
 
   /**
@@ -235,7 +237,12 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
     await this.checkLambdaResponse(node16Lambda[0], expectedResponse);
     await this.checkLambdaResponse(funcWithSsm[0], 'It is working');
     await this.checkLambdaResponse(funcWithAwsSdk[0], 'It is working');
-    await this.checkLambdaResponse(funcWithSchedule[0], 'It is working');
+    await this.checkLambdaResponse(funcWithSchedule[0], 1);
+
+    // wait 1 minute and 10 seconds for schedule to invoke lambda again
+    await new Promise((resolve) => setTimeout(resolve, 1000 * 70));
+
+    await this.checkLambdaResponse(funcWithSchedule[0], 3);
 
     const bucketName = await this.resourceFinder.findByBackendIdentifier(
       backendId,

packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/func-src/handler_with_counter.ts

@@ -0,0 +1,12 @@
+/**
+ * This function asserts that schedule functions are working properly
+ */
+export const handler = async () => {
+  let numInvocations = process.env.NUM_INVOCATIONS
+    ? Number(process.env.NUM_INVOCATIONS)
+    : 100;
+  numInvocations++;
+  process.env.NUM_INVOCATIONS = numInvocations.toString();
+
+  return numInvocations;
+};

packages/integration-tests/src/test-projects/data-storage-auth-with-triggers-ts/amplify/function.ts

@@ -47,6 +47,6 @@ export const funcWithAwsSdk = defineFunction({
 
 export const funcWithSchedule = defineFunction({
   name: 'funcWithSchedule',
-  entry: './func-src/handler_with_ssm.ts',
-  schedule: 'every day',
+  entry: './func-src/handler_with_counter.ts',
+  schedule: '* * * * ?',
 });