Add E2E test coverage checking return values pre- and post-expiration

Includes update to e2e lambda config type that allows test writers
to specify a test function duration. Needed because to wait for
parameter expiration, we needed a longer-than-default timeout.

Author: brnkrygs

Diff for: packages/commons/tests/utils/e2eUtils.ts

@@ -5,7 +5,7 @@
  * E2E utils is used by e2e tests. They are helper function that calls either CDK or SDK
  * to interact with services. 
 */
-import { App, CfnOutput, Stack } from 'aws-cdk-lib';
+import { App, CfnOutput, Stack, Duration } from 'aws-cdk-lib';
 import {
   NodejsFunction,
   NodejsFunctionProps
@@ -37,6 +37,7 @@ export type StackWithLambdaFunctionOptions = {
   runtime: string
   bundling?: NodejsFunctionProps['bundling']
   layers?: NodejsFunctionProps['layers']
+  timeout?: Duration
 };
 
 type FunctionPayload = {[key: string]: string | boolean | number};
@@ -55,6 +56,7 @@ export const createStackWithLambdaFunction = (params: StackWithLambdaFunctionOpt
     bundling: params.bundling,
     layers: params.layers,
     logRetention: RetentionDays.ONE_DAY,
+    timeout: params.timeout
   });
 
   if (params.logGroupOutputKey) {

Diff for: packages/parameters/tests/e2e/appConfigProvider.class.test.functionCode.ts

@@ -81,8 +81,16 @@ export const handler = async (_event: unknown, _context: Context): Promise<void>
   try {
     providerWithMiddleware.clearCache();
     middleware.counter = 0;
-    await providerWithMiddleware.get(freeFormBase64encodedPlainText);
-    await providerWithMiddleware.get(freeFormBase64encodedPlainText);
+    const result1 = await providerWithMiddleware.get(freeFormBase64encodedPlainText);
+    const result2 = await providerWithMiddleware.get(freeFormBase64encodedPlainText);
+    logger.log({
+      test: 'get-cached-result1',
+      value: result1
+    });
+    logger.log({
+      test: 'get-cached-result2',
+      value: result2
+    });
     logger.log({
       test: 'get-cached',
       value: middleware.counter // should be 1
@@ -111,4 +119,34 @@ export const handler = async (_event: unknown, _context: Context): Promise<void>
       error: err.message
     });
   }
+
+  // Test 8
+  // get parameter twice, but wait long enough that cache expires count SDK calls and return values
+  try {
+    providerWithMiddleware.clearCache();
+    middleware.counter = 0;
+    const expiredResult1 = await providerWithMiddleware.get(freeFormBase64encodedPlainText, { maxAge: 5 });
+
+    // Wait
+    await new Promise(resolve => setTimeout(resolve, 6000));
+
+    const expiredResult2 = await providerWithMiddleware.get(freeFormBase64encodedPlainText, { maxAge: 5 });
+    logger.log({
+      test: 'get-expired-result1',
+      value: expiredResult1
+    });
+    logger.log({
+      test: 'get-expired-result2',
+      value: expiredResult2
+    });
+    logger.log({
+      test: 'get-expired',
+      value: middleware.counter // should be 2
+    });
+  } catch (err) {
+    logger.log({
+      test: 'get-expired',
+      error: err.message
+    });
+  }
 };

Diff for: packages/parameters/tests/e2e/appConfigProvider.class.test.ts

@@ -4,7 +4,7 @@
   * @group e2e/parameters/appconfig/class
   */
 import path from 'path';
-import { App, Stack, Aspects } from 'aws-cdk-lib';
+import { App, Stack, Aspects, Duration } from 'aws-cdk-lib';
 import { toBase64 } from '@aws-sdk/util-base64-node';
 import { v4 } from 'uuid';
 import { 
@@ -111,6 +111,7 @@ let stack: Stack;
  * Test 6
  * get parameter twice, but force fetch 2nd time, we count number of SDK requests and
  * check that we made two API calls
+ * check that we got matching results
  * 
  * Note: To avoid race conditions, we add a dependency between each pair of configuration profiles.
  * This allows us to influence the order of creation and ensure that each configuration profile
@@ -141,6 +142,7 @@ describe(`parameters E2E tests (appConfigProvider) for runtime ${runtime}`, () =
         FEATURE_FLAG_NAME: featureFlagName,
       },
       runtime,
+      timeout: Duration.seconds(10),
     });
 
     // Create the base resources for an AppConfig application.
@@ -291,8 +293,12 @@ describe(`parameters E2E tests (appConfigProvider) for runtime ${runtime}`, () =
     it('should retrieve single parameter cached', () => {
 
       const logs = invocationLogs[0].getFunctionLogs();
-      const testLog = InvocationLogs.parseFunctionLog(logs[4]);
 
+      const resultLog1 = InvocationLogs.parseFunctionLog(logs[4]);
+      const resultLog2 = InvocationLogs.parseFunctionLog(logs[5]);
+      expect(resultLog1.value).toStrictEqual(resultLog2.value);
+
+      const testLog = InvocationLogs.parseFunctionLog(logs[6]);
       expect(testLog).toStrictEqual({
         test: 'get-cached',
         value: 1
@@ -305,7 +311,7 @@ describe(`parameters E2E tests (appConfigProvider) for runtime ${runtime}`, () =
     it('should retrieve single parameter twice without caching', async () => {
 
       const logs = invocationLogs[0].getFunctionLogs();
-      const testLog = InvocationLogs.parseFunctionLog(logs[5]);
+      const testLog = InvocationLogs.parseFunctionLog(logs[7]);
 
       expect(testLog).toStrictEqual({
         test: 'get-forced',
@@ -314,6 +320,27 @@ describe(`parameters E2E tests (appConfigProvider) for runtime ${runtime}`, () =
 
     }, TEST_CASE_TIMEOUT);
 
+    // Test 7 - get parameter twice, wait for expiration betweenn
+    // we count number of SDK requests and check that we made two API calls
+    // and check that the values match
+    it('should retrieve single parameter twice, with expiration between and matching values', async () => {
+
+      const logs = invocationLogs[0].getFunctionLogs();
+
+      const resultLog1 = InvocationLogs.parseFunctionLog(logs[8]);
+      const resultLog2 = InvocationLogs.parseFunctionLog(logs[9]);
+      expect(resultLog1.test).toBe('get-expired-result1');
+      expect(resultLog2.test).toBe('get-expired-result2');
+      expect(resultLog1.value).toStrictEqual(resultLog2.value);
+
+      const testLog = InvocationLogs.parseFunctionLog(logs[10]);
+      expect(testLog).toStrictEqual({
+        test: 'get-expired',
+        value: 2
+      });
+
+    }, TEST_CASE_TIMEOUT);
+
   });
 
   afterAll(async () => {