Merge branch 'aws-amplify:master' into cli/env-vars-lambda-sample

aws-amplify · Jul 23, 2021 · 20181e7 · 20181e7
2 parents 08c71bb + 57eeae5
commit 20181e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/packages/amplify-e2e-core/src/categories/lambda-function.ts b/packages/amplify-e2e-core/src/categories/lambda-function.ts
@@ -175,6 +175,9 @@ const coreFunction = (
         selectTemplate(chain, settings.functionTemplate, runtime);
       }
     } else {
+      if (settings.layerOptions && settings.layerOptions.layerAndFunctionExist) {
+        chain.wait('Select which capability you want to update:').sendCarriageReturn() // lambda function
+      }
       chain.wait('Select the Lambda function you want to update').sendCarriageReturn(); // assumes only one function configured in the project
     }
 
@@ -358,6 +361,7 @@ export const removeFunction = (cwd: string, funcName: string) =>
 
 export interface LayerOptions {
   select?: string[]; // list options to select
+  layerAndFunctionExist?: boolean; // whether this test involves both a function and a layer
   expectedListOptions?: string[]; // the expected list of all layers
   versions?: Record<string, { version: number; expectedVersionOptions: number[] }>; // map with keys for each element of select that determines the verison and expected version for each layer
   customArns?: string[]; // external ARNs to enter

diff --git a/packages/amplify-e2e-tests/src/__tests__/layer-2.test.ts b/packages/amplify-e2e-tests/src/__tests__/layer-2.test.ts
@@ -254,6 +254,7 @@ describe('amplify add lambda layer with changes', () => {
         expectedListOptions: [fullLayerName],
         versions: { [fullLayerName]: { version: 1, expectedVersionOptions: [1] } },
         skipLayerAssignment: true,
+        layerAndFunctionExist: true,
       },
     };
 
@@ -277,6 +278,7 @@ describe('amplify add lambda layer with changes', () => {
       layerName,
       projName,
       layerOptions: {
+        layerAndFunctionExist: true,
         layerWalkthrough: (chain: ExecutionContext): void => {
           chain
             .wait('Provide existing layers')

diff --git a/...ration-tests/src/__tests__/migration_tests/lambda-layer-migration/layer-migration.test.ts b/...ration-tests/src/__tests__/migration_tests/lambda-layer-migration/layer-migration.test.ts
@@ -172,6 +172,7 @@ describe('test lambda layer migration flow introduced in v5.0.0', () => {
       layerOptions: {
         select: [],
         expectedListOptions: [layerName],
+        layerAndFunctionExist: true,
       },
     };
 

diff --git a/...ages/amplify-migration-tests/src/__tests__/update_tests/function_migration_update.test.ts b/...ages/amplify-migration-tests/src/__tests__/update_tests/function_migration_update.test.ts
@@ -117,6 +117,7 @@ describe('amplify function migration', () => {
         layerOptions: {
           select: [projName + layerName],
           expectedListOptions: [projName + layerName],
+          layerAndFunctionExist: true,
         },
         name: function1,
         testingWithLatestCodebase: true,