From d9abbd02581a8eaaa6a96dbee67e8247eb8944f6 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 8 Oct 2024 13:05:11 +0200 Subject: [PATCH 1/4] chore(layers): remove schema parsing from layer canary --- .../layerPublisher.class.test.functionCode.ts | 5 ++--- layers/tests/e2e/layerPublisher.test.ts | 18 ------------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts index 95f1a271b6..0c2fb4245f 100644 --- a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts +++ b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts @@ -50,9 +50,8 @@ new DynamoDBProvider({ tableName: 'foo', awsSdkV3Client: ddbClient }); // Instantiating the BatchProcessor will confirm that the utility can be used new BatchProcessor(EventType.SQS); -const testSchema = z.object({ instance_id: z.string(), state: z.string() }); - -const testEventSchema = EventBridgeSchema.extend({ detail: testSchema }); +const testPayload = { name: 'John', age: 42 }; +const testSchema = z.object({ name: z.string(), age: z.number() }); const layerPath = process.env.LAYERS_PATH || '/opt/nodejs/node_modules'; const expectedVersion = process.env.POWERTOOLS_PACKAGE_VERSION || '0.0.0'; diff --git a/layers/tests/e2e/layerPublisher.test.ts b/layers/tests/e2e/layerPublisher.test.ts index fd6fca0c58..ce5fcc7540 100644 --- a/layers/tests/e2e/layerPublisher.test.ts +++ b/layers/tests/e2e/layerPublisher.test.ts @@ -133,24 +133,6 @@ describe('Layers E2E tests', () => { functionName: testStack.findAndGetStackOutputValue( `test${outputFormat}Fn` ), - // Uses an EventBridge event payload to test parser functionality - payload: { - version: '0', - id: '6a7e8feb-b491-4cf7-a9f1-bf3703467718', - 'detail-type': 'EC2 Instance State-change Notification', - source: 'aws.ec2', - account: '111122223333', - time: '2017-12-22T18:43:48Z', - region: 'us-west-1', - resources: [ - 'arn:aws:ec2:us-west-1:123456789012:instance/i-1234567890abcdef0', - ], - detail: { - instance_id: 'i-1234567890abcdef0', - state: 'terminated', - }, - 'replay-name': 'replay_archive', - } satisfies EventBridgeEvent, }) ); } From 7dfd64e74a406ad95c5d6d69d2815e792dc9c5f2 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 8 Oct 2024 13:08:48 +0200 Subject: [PATCH 2/4] chore(layers): remove schema parsing from layer canary --- layers/tests/e2e/layerPublisher.class.test.functionCode.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts index 0c2fb4245f..272f8e7a40 100644 --- a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts +++ b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts @@ -8,7 +8,6 @@ import { AppConfigProvider } from '@aws-lambda-powertools/parameters/appconfig'; import { DynamoDBProvider } from '@aws-lambda-powertools/parameters/dynamodb'; import { SecretsProvider } from '@aws-lambda-powertools/parameters/secrets'; import { SSMProvider } from '@aws-lambda-powertools/parameters/ssm'; -import { EventBridgeSchema } from '@aws-lambda-powertools/parser/schemas'; import { Tracer } from '@aws-lambda-powertools/tracer'; import { AppConfigDataClient } from '@aws-sdk/client-appconfigdata'; import { DynamoDBClient } from '@aws-sdk/client-dynamodb'; @@ -50,9 +49,6 @@ new DynamoDBProvider({ tableName: 'foo', awsSdkV3Client: ddbClient }); // Instantiating the BatchProcessor will confirm that the utility can be used new BatchProcessor(EventType.SQS); -const testPayload = { name: 'John', age: 42 }; -const testSchema = z.object({ name: z.string(), age: z.number() }); - const layerPath = process.env.LAYERS_PATH || '/opt/nodejs/node_modules'; const expectedVersion = process.env.POWERTOOLS_PACKAGE_VERSION || '0.0.0'; @@ -121,7 +117,4 @@ export const handler = async (event: unknown): Promise => { // the presence of a log will indicate that the logger is working // while the content of the log will indicate that the tracer is working logger.debug('subsegment', { subsegment: subsegment.format() }); - - // Check that the parser is working - testEventSchema.parse(event); }; From 0f2175ed1a201fb84eaef544c9e6eb1f4ed3a447 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 8 Oct 2024 13:09:45 +0200 Subject: [PATCH 3/4] chore(layers): remove schema parsing from layer canary --- layers/tests/e2e/layerPublisher.class.test.functionCode.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts index 272f8e7a40..a3ce0497dd 100644 --- a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts +++ b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts @@ -13,7 +13,6 @@ import { AppConfigDataClient } from '@aws-sdk/client-appconfigdata'; import { DynamoDBClient } from '@aws-sdk/client-dynamodb'; import { SecretsManagerClient } from '@aws-sdk/client-secrets-manager'; import { SSMClient } from '@aws-sdk/client-ssm'; -import { z } from 'zod'; const logger = new Logger({ logLevel: 'DEBUG', From 2dd4ce48475d8bc1951c76dc37591a997ccffefc Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 8 Oct 2024 13:12:58 +0200 Subject: [PATCH 4/4] chore(layers): remove schema parsing from layer canary --- layers/tests/e2e/layerPublisher.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/layers/tests/e2e/layerPublisher.test.ts b/layers/tests/e2e/layerPublisher.test.ts index ce5fcc7540..87261d7c91 100644 --- a/layers/tests/e2e/layerPublisher.test.ts +++ b/layers/tests/e2e/layerPublisher.test.ts @@ -13,7 +13,6 @@ import { import { TestNodejsFunction } from '@aws-lambda-powertools/testing-utils/resources/lambda'; import { App } from 'aws-cdk-lib'; import { LayerVersion } from 'aws-cdk-lib/aws-lambda'; -import type { EventBridgeEvent } from 'aws-lambda'; import packageJson from '../../package.json'; import { LayerPublisherStack } from '../../src/layer-publisher-stack'; import {