feat(layers): add arm64 to integration test matrix (#1720)

* feat(layers): add arm64 to test matrix

Author: dreamorosi

Diff for: .github/workflows/run-e2e-tests.yml

@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       prNumber:
-        description: "(Optional) PR Number. If you specify a value the value of the branch field will be ignored."
+        description: '(Optional) PR Number. If you specify a value the value of the branch field will be ignored.'
         required: false
-        default: ""
+        default: ''
 
 jobs:
   run-e2e-tests-on-utils:
@@ -19,12 +19,21 @@ jobs:
       contents: read
     strategy:
       matrix:
-        package: [layers, packages/logger, packages/metrics, packages/tracer, packages/parameters, packages/idempotency]
+        package:
+          [
+            layers,
+            packages/logger,
+            packages/metrics,
+            packages/tracer,
+            packages/parameters,
+            packages/idempotency,
+          ]
         version: [14, 16, 18]
+        arch: [x86_64, arm64]
       fail-fast: false
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab  # v3.5.2
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       # If we pass a PR Number when triggering the workflow we will retrieve the PR info and get its headSHA
       - name: Extract PR details
         id: extract_PR_details
@@ -38,7 +47,7 @@ jobs:
       # we checkout the PR at that point in time
       - name: Checkout PR code
         if: ${{ inputs.prNumber != '' }}
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab  # v3.5.2
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ steps.extract_PR_details.outputs.headSHA }}
       - name: Setup NodeJS
@@ -59,5 +68,6 @@ jobs:
         env:
           RUNTIME: nodejs${{ matrix.version }}x
           CI: true
+          ARCH: ${{ matrix.arch }}
           JSII_SILENCE_WARNING_DEPRECATED_NODE_VERSION: true
         run: npm run test:e2e -w ${{ matrix.package }}

Diff for: packages/idempotency/tests/e2e/constants.ts

@@ -1,4 +1,4 @@
-export const RESOURCE_NAME_PREFIX = 'Idempotency-E2E';
+export const RESOURCE_NAME_PREFIX = 'Idempotency';
 
 export const ONE_MINUTE = 60 * 1_000;
 export const TEARDOWN_TIMEOUT = 5 * ONE_MINUTE;

Diff for: packages/logger/tests/e2e/constants.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
 
-const RESOURCE_NAME_PREFIX = 'Logger-E2E';
+const RESOURCE_NAME_PREFIX = 'Logger';
 const ONE_MINUTE = 60 * 1000;
 const TEST_CASE_TIMEOUT = ONE_MINUTE;
 const SETUP_TIMEOUT = 5 * ONE_MINUTE;

Diff for: packages/metrics/tests/e2e/constants.ts

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { MetricUnits } from '../../src';
 
-const RESOURCE_NAME_PREFIX = 'Metrics-E2E';
+const RESOURCE_NAME_PREFIX = 'Metrics';
 const ONE_MINUTE = 60 * 1000;
 const TEST_CASE_TIMEOUT = 3 * ONE_MINUTE;
 const SETUP_TIMEOUT = 5 * ONE_MINUTE;

Diff for: packages/parameters/tests/e2e/constants.ts

@@ -1,4 +1,4 @@
-export const RESOURCE_NAME_PREFIX = 'Parameters-E2E';
+export const RESOURCE_NAME_PREFIX = 'Parameters';
 export const ONE_MINUTE = 60 * 1000;
 export const TEST_CASE_TIMEOUT = 3 * ONE_MINUTE;
 export const SETUP_TIMEOUT = 5 * ONE_MINUTE;

Diff for: packages/parameters/tests/helpers/resources.ts

@@ -6,6 +6,7 @@ import type {
 import {
   concatenateResourceName,
   getRuntimeKey,
+  getArchitectureKey,
   TestDynamodbTable,
   TestNodejsFunction,
 } from '@aws-lambda-powertools/testing-utils';
@@ -58,7 +59,7 @@ class TestSecureStringParameter extends Construct {
 
     const { value } = props;
 
-    const name = `/secure/${getRuntimeKey()}/${randomUUID()}`;
+    const name = `/secure/${getRuntimeKey()}/${getArchitectureKey()}/${randomUUID()}`;
     const secureStringCreator = new AwsCustomResource(
       testStack.stack,
       `create-${randomUUID()}`,

Diff for: packages/testing/src/constants.ts

@@ -1,4 +1,4 @@
-import { Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Runtime, Architecture } from 'aws-cdk-lib/aws-lambda';
 
 /**
  * The default AWS Lambda runtime to use when none is provided.
@@ -14,4 +14,22 @@ const TEST_RUNTIMES = {
   [defaultRuntime]: Runtime.NODEJS_18_X,
 } as const;
 
-export { TEST_RUNTIMES, defaultRuntime };
+/**
+ * The default AWS Lambda architecture to use when none is provided.
+ */
+const defaultArchitecture = 'x86_64';
+
+/**
+ * The AWS Lambda architectures that are supported by the project.
+ */
+const TEST_ARCHITECTURES = {
+  [defaultArchitecture]: Architecture.X86_64,
+  arm64: Architecture.ARM_64,
+} as const;
+
+export {
+  TEST_RUNTIMES,
+  defaultRuntime,
+  TEST_ARCHITECTURES,
+  defaultArchitecture,
+};

Diff for: packages/testing/src/helpers.ts

@@ -1,5 +1,10 @@
 import { randomUUID } from 'node:crypto';
-import { TEST_RUNTIMES, defaultRuntime } from './constants';
+import {
+  TEST_RUNTIMES,
+  defaultRuntime,
+  TEST_ARCHITECTURES,
+  defaultArchitecture,
+} from './constants';
 
 const isValidRuntimeKey = (
   runtime: string
@@ -15,6 +20,21 @@ const getRuntimeKey = (): keyof typeof TEST_RUNTIMES => {
   return runtime;
 };
 
+const isValidArchitectureKey = (
+  architecture: string
+): architecture is keyof typeof TEST_ARCHITECTURES =>
+  architecture in TEST_ARCHITECTURES;
+
+const getArchitectureKey = (): keyof typeof TEST_ARCHITECTURES => {
+  const architecture: string = process.env.ARCH || defaultArchitecture;
+
+  if (!isValidArchitectureKey(architecture)) {
+    throw new Error(`Invalid architecture key value: ${architecture}`);
+  }
+
+  return architecture;
+};
+
 /**
  * Generate a unique name for a test.
  *
@@ -23,10 +43,11 @@ const getRuntimeKey = (): keyof typeof TEST_RUNTIMES => {
  * @example
  * ```ts
  * process.env.RUNTIME = 'nodejs18x';
- * const testPrefix = 'E2E-TRACER';
+ * process.env.ARCH = 'x86_64';
+ * const testPrefix = 'TRACER';
  * const testName = 'someFeature';
  * const uniqueName = generateTestUniqueName({ testPrefix, testName });
- * // uniqueName = 'E2E-TRACER-node18-12345-someFeature'
+ * // uniqueName = 'TRACER-18-x86-12345-someFeature'
  * ```
  */
 const generateTestUniqueName = ({
@@ -38,7 +59,8 @@ const generateTestUniqueName = ({
 }): string =>
   [
     testPrefix,
-    getRuntimeKey().replace(/[jsx]/g, ''),
+    getRuntimeKey().replace(/[nodejsx]/g, ''),
+    getArchitectureKey().replace(/_64/g, ''),
     randomUUID().toString().substring(0, 5),
     testName,
   ]
@@ -81,4 +103,5 @@ export {
   generateTestUniqueName,
   concatenateResourceName,
   findAndGetStackOutputValue,
+  getArchitectureKey,
 };

Diff for: packages/testing/src/resources/TestNodejsFunction.ts

@@ -3,8 +3,12 @@ import { Tracing } from 'aws-cdk-lib/aws-lambda';
 import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { RetentionDays } from 'aws-cdk-lib/aws-logs';
 import { randomUUID } from 'node:crypto';
-import { TEST_RUNTIMES } from '../constants';
-import { concatenateResourceName, getRuntimeKey } from '../helpers';
+import { TEST_RUNTIMES, TEST_ARCHITECTURES } from '../constants';
+import {
+  concatenateResourceName,
+  getRuntimeKey,
+  getArchitectureKey,
+} from '../helpers';
 import type { TestStack } from '../TestStack';
 import type { ExtraTestProps, TestNodejsFunctionProps } from './types';
 
@@ -29,6 +33,7 @@ class TestNodejsFunction extends NodejsFunction {
         resourceName: extraProps.nameSuffix,
       }),
       runtime: TEST_RUNTIMES[getRuntimeKey()],
+      architecture: TEST_ARCHITECTURES[getArchitectureKey()],
       logRetention: RetentionDays.ONE_DAY,
     });
 

Diff for: packages/tracer/tests/e2e/constants.ts

@@ -1,5 +1,5 @@
 // Prefix for all resources created by the E2E tests
-const RESOURCE_NAME_PREFIX = 'Tracer-E2E';
+const RESOURCE_NAME_PREFIX = 'Tracer';
 // Constants relating time to be used in the tests
 const ONE_MINUTE = 60 * 1_000;
 const TEST_CASE_TIMEOUT = 5 * ONE_MINUTE;