Add reproducer for middyjs/middy#1263

WtfJoke · Dec 14, 2024 · b3d89cb · b3d89cb
1 parent 36dc31f
commit b3d89cb
Show file tree

Hide file tree

Showing 13 changed files with 5,361 additions and 179 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,36 @@
-# Welcome to your CDK TypeScript project
+# Bug reproducer
 
-This is a blank project for CDK development with TypeScript.
+This project is to demonstrate the bug https://github.com/middyjs/middy/issues/1263
 
-The `cdk.json` file tells the CDK Toolkit how to execute your app.
+
+# To reproduce
+1. Login to aws account
+2. `npm run cdk deploy`
+3. Invoke the lambda using the test console with `payloadInputa.json`
+4. Lambda responds with 
+```json
+{
+  "statusCode": 200,
+  "body": "{\"hi\":\"there\"}",
+  "headers": {
+    "Content-Type": "application/json",
+    "Access-Control-Allow-Origin": "http://localhost:3000",
+    "Vary": "Origin"
+  }
+}
+```
+4. Invoke the lambda using the test console with `payloadInputb.json`, `Access-Control-Allow-Origin` is still `http://localhost:3000`
+```json
+{
+  "statusCode": 200,
+  "body": "{\"hi\":\"there\"}",
+  "headers": {
+    "Content-Type": "application/json",
+    "Access-Control-Allow-Origin": "http://localhost:3000",
+    "Vary": "Origin, Origin"
+  }
+}
+```
 
 ## Useful commands
 

diff --git a/bin/middy_cors_1263.ts b/bin/middy_cors_1263.ts
@@ -1,20 +1,17 @@
 #!/usr/bin/env node
-import * as cdk from 'aws-cdk-lib';
-import { MiddyCors1263Stack } from '../lib/middy_cors_1263-stack';
+import * as cdk from "aws-cdk-lib";
+import { MiddyCors1263Stack } from "../lib/middy_cors_1263-stack";
 
 const app = new cdk.App();
-new MiddyCors1263Stack(app, 'MiddyCors1263Stack', {
-  /* If you don't specify 'env', this stack will be environment-agnostic.
-   * Account/Region-dependent features and context lookups will not work,
-   * but a single synthesized template can be deployed anywhere. */
-
-  /* Uncomment the next line to specialize this stack for the AWS Account
-   * and Region that are implied by the current CLI configuration. */
-  // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
-
-  /* Uncomment the next line if you know exactly what Account and Region you
-   * want to deploy the stack to. */
-  // env: { account: '123456789012', region: 'us-east-1' },
-
-  /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */
-});
+new MiddyCors1263Stack(app, "MiddyCors1263Stack", {
+	/* If you don't specify 'env', this stack will be environment-agnostic.
+	 * Account/Region-dependent features and context lookups will not work,
+	 * but a single synthesized template can be deployed anywhere. */
+	/* Uncomment the next line to specialize this stack for the AWS Account
+	 * and Region that are implied by the current CLI configuration. */
+	// env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
+	/* Uncomment the next line if you know exactly what Account and Region you
+	 * want to deploy the stack to. */
+	// env: { account: '123456789012', region: 'us-east-1' },
+	/* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */
+});
diff --git a/biome.json b/biome.json
@@ -0,0 +1,30 @@
+{
+	"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+	"vcs": {
+		"enabled": true,
+		"clientKind": "git",
+		"useIgnoreFile": true
+	},
+	"files": {
+		"ignoreUnknown": false,
+		"ignore": []
+	},
+	"formatter": {
+		"enabled": true,
+		"indentStyle": "tab"
+	},
+	"organizeImports": {
+		"enabled": true
+	},
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true
+		}
+	},
+	"javascript": {
+		"formatter": {
+			"quoteStyle": "double"
+		}
+	}
+}
diff --git a/cdk.json b/cdk.json
@@ -1,81 +1,76 @@
 {
-  "app": "npx ts-node --prefer-ts-exts bin/middy_cors_1263.ts",
-  "watch": {
-    "include": [
-      "**"
-    ],
-    "exclude": [
-      "README.md",
-      "cdk*.json",
-      "**/*.d.ts",
-      "**/*.js",
-      "tsconfig.json",
-      "package*.json",
-      "yarn.lock",
-      "node_modules",
-      "test"
-    ]
-  },
-  "context": {
-    "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
-    "@aws-cdk/core:checkSecretUsage": true,
-    "@aws-cdk/core:target-partitions": [
-      "aws",
-      "aws-cn"
-    ],
-    "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
-    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
-    "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
-    "@aws-cdk/aws-iam:minimizePolicies": true,
-    "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
-    "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
-    "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
-    "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
-    "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
-    "@aws-cdk/core:enablePartitionLiterals": true,
-    "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
-    "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
-    "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
-    "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
-    "@aws-cdk/aws-route53-patters:useCertificate": true,
-    "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
-    "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
-    "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
-    "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
-    "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
-    "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
-    "@aws-cdk/aws-redshift:columnId": true,
-    "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true,
-    "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
-    "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
-    "@aws-cdk/aws-kms:aliasNameRef": true,
-    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
-    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
-    "@aws-cdk/aws-efs:denyAnonymousAccess": true,
-    "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": true,
-    "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": true,
-    "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true,
-    "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": true,
-    "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": true,
-    "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
-    "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
-    "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": true,
-    "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": true,
-    "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
-    "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true,
-    "@aws-cdk/aws-eks:nodegroupNameAttribute": true,
-    "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
-    "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
-    "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
-    "@aws-cdk/aws-s3:keepNotificationInImportedBucket": false,
-    "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true,
-    "@aws-cdk/aws-dynamodb:resourcePolicyPerReplica": true,
-    "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true,
-    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true,
-    "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true,
-    "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": true,
-    "@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": true,
-    "@aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy": true,
-    "@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault": true
-  }
+	"app": "npx ts-node --prefer-ts-exts bin/middy_cors_1263.ts",
+	"watch": {
+		"include": ["**"],
+		"exclude": [
+			"README.md",
+			"cdk*.json",
+			"**/*.d.ts",
+			"**/*.js",
+			"tsconfig.json",
+			"package*.json",
+			"yarn.lock",
+			"node_modules",
+			"test"
+		]
+	},
+	"context": {
+		"@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+		"@aws-cdk/core:checkSecretUsage": true,
+		"@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
+		"@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+		"@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+		"@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+		"@aws-cdk/aws-iam:minimizePolicies": true,
+		"@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+		"@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+		"@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+		"@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+		"@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+		"@aws-cdk/core:enablePartitionLiterals": true,
+		"@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+		"@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+		"@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+		"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+		"@aws-cdk/aws-route53-patters:useCertificate": true,
+		"@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+		"@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+		"@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+		"@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+		"@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+		"@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+		"@aws-cdk/aws-redshift:columnId": true,
+		"@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true,
+		"@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+		"@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
+		"@aws-cdk/aws-kms:aliasNameRef": true,
+		"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
+		"@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+		"@aws-cdk/aws-efs:denyAnonymousAccess": true,
+		"@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": true,
+		"@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": true,
+		"@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true,
+		"@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": true,
+		"@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": true,
+		"@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
+		"@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
+		"@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": true,
+		"@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": true,
+		"@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
+		"@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true,
+		"@aws-cdk/aws-eks:nodegroupNameAttribute": true,
+		"@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
+		"@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
+		"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
+		"@aws-cdk/aws-s3:keepNotificationInImportedBucket": false,
+		"@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true,
+		"@aws-cdk/aws-dynamodb:resourcePolicyPerReplica": true,
+		"@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true,
+		"@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true,
+		"@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": true,
+		"@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": true,
+		"@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": true,
+		"@aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy": true,
+		"@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault": true
+	}
 }
diff --git a/jest.config.js b/jest.config.js
@@ -1,8 +1,8 @@
 module.exports = {
-  testEnvironment: 'node',
-  roots: ['<rootDir>/test'],
-  testMatch: ['**/*.test.ts'],
-  transform: {
-    '^.+\\.tsx?$': 'ts-jest'
-  }
+	testEnvironment: "node",
+	roots: ["<rootDir>/test"],
+	testMatch: ["**/*.test.ts"],
+	transform: {
+		"^.+\\.tsx?$": "ts-jest",
+	},
 };
diff --git a/lib/handler.ts b/lib/handler.ts
@@ -0,0 +1,25 @@
+import middy, { type MiddyfiedHandler } from "@middy/core";
+import cors from "@middy/http-cors";
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
+
+const CONTENT_TYPE_JSON_HEADER: Record<string, string> = {
+	"Content-Type": "application/json",
+};
+
+const origins = ["http://localhost:3000", "https://example.org"];
+
+const lambdaHandler = async (
+	event: APIGatewayProxyEvent,
+): Promise<APIGatewayProxyResult> => {
+	console.log("Received event", event);
+	return {
+		statusCode: 200,
+		body: JSON.stringify({ hi: "there" }),
+		headers: CONTENT_TYPE_JSON_HEADER,
+	};
+};
+
+export const handler: MiddyfiedHandler<
+	APIGatewayProxyEvent,
+	APIGatewayProxyResult
+> = middy().use(cors({ origins })).handler(lambdaHandler);
diff --git a/lib/middy_cors_1263-stack.ts b/lib/middy_cors_1263-stack.ts
@@ -1,16 +1,20 @@
-import * as cdk from 'aws-cdk-lib';
-import { Construct } from 'constructs';
-// import * as sqs from 'aws-cdk-lib/aws-sqs';
+import { resolve } from "node:path";
+import * as cdk from "aws-cdk-lib";
+import { Runtime } from "aws-cdk-lib/aws-lambda";
+import { NodejsFunction } from "aws-cdk-lib/aws-lambda-nodejs";
+import type { Construct } from "constructs";
 
 export class MiddyCors1263Stack extends cdk.Stack {
-  constructor(scope: Construct, id: string, props?: cdk.StackProps) {
-    super(scope, id, props);
+	constructor(scope: Construct, id: string, props?: cdk.StackProps) {
+		super(scope, id, props);
 
-    // The code that defines your stack goes here
+		const lambda = new NodejsFunction(this, "MiddyCors1263Handler", {
+			entry: resolve("lib", "handler.ts"),
+			runtime: Runtime.NODEJS_22_X,
+		});
 
-    // example resource
-    // const queue = new sqs.Queue(this, 'MiddyCors1263Queue', {
-    //   visibilityTimeout: cdk.Duration.seconds(300)
-    // });
-  }
+		new cdk.CfnOutput(this, "MiddyCors1263HandlerFunctionName", {
+			value: lambda.functionName,
+		});
+	}
 }