fix lint and e2e test

aws-amplify · Jul 16, 2024 · 3c846fb · 3c846fb
1 parent 2d11214
commit 3c846fb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/packages/backend-function/src/factory.test.ts b/packages/backend-function/src/factory.test.ts
@@ -347,6 +347,7 @@ void describe('AmplifyFunctionFactory', () => {
         Targets: [
           {
             Arn: {
+              // eslint-disable-next-line spellcheck/spell-checker
               'Fn::GetAtt': ['handlerlambdaE29D1580', 'Arn'],
             },
             Id: 'Target0',
@@ -367,6 +368,7 @@ void describe('AmplifyFunctionFactory', () => {
         Targets: [
           {
             Arn: {
+              // eslint-disable-next-line spellcheck/spell-checker
               'Fn::GetAtt': ['handlerlambdaE29D1580', 'Arn'],
             },
             Id: 'Target0',

diff --git a/packages/integration-tests/src/constants.ts b/packages/integration-tests/src/constants.ts
@@ -2,8 +2,3 @@
  * 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';
diff --git a/packages/integration-tests/src/test-e2e/deployment.test.ts b/packages/integration-tests/src/test-e2e/deployment.test.ts
@@ -30,7 +30,6 @@ import {
   amplifySharedSecretNameKey,
   createAmplifySharedSecretName,
 } from '../shared_secret.js';
-import { numInvocationsKey } from '../constants.js';
 
 const testProjectCreators = getTestProjectCreators();
 const testCdkProjectCreators = getTestCdkProjectCreators();
@@ -131,12 +130,14 @@ void describe('deployment tests', { concurrency: testConcurrencyLevel }, () => {
         });
 
         void describe('in sequence', { concurrency: false }, () => {
-          const env = {
+          const sharedSecretsEnv = {
             [amplifySharedSecretNameKey]: createAmplifySharedSecretName(),
-            [numInvocationsKey]: '0',
           };
           void it(`[${testProjectCreator.name}] deploys fully`, async () => {
-            await testProject.deploy(sandboxBackendIdentifier, env);
+            await testProject.deploy(
+              sandboxBackendIdentifier,
+              sharedSecretsEnv
+            );
             await testProject.assertPostDeployment(sandboxBackendIdentifier);
           });
 
@@ -145,7 +146,7 @@ void describe('deployment tests', { concurrency: testConcurrencyLevel }, () => {
               ['sandbox', '--once'],
               testProject.projectDirPath,
               {
-                env,
+                env: sharedSecretsEnv,
               }
             );
             await processController
@@ -160,7 +161,7 @@ void describe('deployment tests', { concurrency: testConcurrencyLevel }, () => {
               ['sandbox', '--dirToWatch', 'amplify'],
               testProject.projectDirPath,
               {
-                env,
+                env: sharedSecretsEnv,
               }
             );
 

diff --git a/packages/integration-tests/src/test-project-setup/data_storage_auth_with_triggers.ts b/packages/integration-tests/src/test-project-setup/data_storage_auth_with_triggers.ts
@@ -17,7 +17,6 @@ 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.
@@ -141,12 +140,11 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
       amplifySharedSecretNameKey in environment
         ? environment[amplifySharedSecretNameKey]
         : createAmplifySharedSecretName();
-    const env = {
+    const sharedSecretsEnv = {
       [amplifySharedSecretNameKey]: this.amplifySharedSecret,
-      [numInvocationsKey]: '0',
     };
     await this.setUpDeployEnvironment(backendIdentifier);
-    await super.deploy(backendIdentifier, env);
+    await super.deploy(backendIdentifier, sharedSecretsEnv);
   }
 
   /**

diff --git a/...test-projects/data-storage-auth-with-triggers-ts/amplify/func-src/handler_with_counter.ts b/...test-projects/data-storage-auth-with-triggers-ts/amplify/func-src/handler_with_counter.ts
@@ -1,12 +1,9 @@
 /**
  * This function asserts that schedule functions are working properly
  */
+let numInvocations = 0;
 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;
 };