chore(ses): migrate drop spam handler (#27827)

This PR moves the drop spam handler from aws-cdk-lib to our new centralized location for custom resource handlers in the https://github.com/aws-cdk package. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Nov 10, 2023 · 31a449e · 31a449e
1 parent 73f256d
commit 31a449e
Show file tree

Hide file tree

Showing 16 changed files with 181 additions and 64 deletions.
diff --git a/....snapshot/asset.19044c50ec489a0413f51a8e60d6272e5746e9b5a0356ed15c12de97c3ca93ec/index.js b/....snapshot/asset.19044c50ec489a0413f51a8e60d6272e5746e9b5a0356ed15c12de97c3ca93ec/index.js
diff --git a/...napshot/asset.96d0b6be9a64ae309bf89a86f5515453f0fa1d07b4f6b37198051cc98e251f34/index.d.ts b/...napshot/asset.96d0b6be9a64ae309bf89a86f5515453f0fa1d07b4f6b37198051cc98e251f34/index.d.ts
diff --git a/....snapshot/asset.96d0b6be9a64ae309bf89a86f5515453f0fa1d07b4f6b37198051cc98e251f34/index.js b/....snapshot/asset.96d0b6be9a64ae309bf89a86f5515453f0fa1d07b4f6b37198051cc98e251f34/index.js
diff --git a/...amework-integ/test/aws-ses/test/integ.receipt.js.snapshot/aws-cdk-ses-receipt.assets.json b/...amework-integ/test/aws-ses/test/integ.receipt.js.snapshot/aws-cdk-ses-receipt.assets.json
diff --git a/...ework-integ/test/aws-ses/test/integ.receipt.js.snapshot/aws-cdk-ses-receipt.template.json b/...ework-integ/test/aws-ses/test/integ.receipt.js.snapshot/aws-cdk-ses-receipt.template.json
@@ -100,7 +100,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "96d0b6be9a64ae309bf89a86f5515453f0fa1d07b4f6b37198051cc98e251f34.zip"
+     "S3Key": "19044c50ec489a0413f51a8e60d6272e5746e9b5a0356ed15c12de97c3ca93ec.zip"
     },
     "Handler": "index.handler",
     "Role": {

diff --git a/...t/integ.receipt.js.snapshot/cdksesreceiptintegDefaultTestDeployAssertA2776C75.assets.json b/...t/integ.receipt.js.snapshot/cdksesreceiptintegDefaultTestDeployAssertA2776C75.assets.json
diff --git a/...integ.receipt.js.snapshot/cdksesreceiptintegDefaultTestDeployAssertA2776C75.template.json b/...integ.receipt.js.snapshot/cdksesreceiptintegDefaultTestDeployAssertA2776C75.template.json
diff --git a/...s/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.js.snapshot/integ.json b/...s/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.js.snapshot/integ.json
diff --git a/...aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.js.snapshot/manifest.json b/...aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.js.snapshot/manifest.json
diff --git a/...es/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.js.snapshot/tree.json b/...es/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.js.snapshot/tree.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-ses/test/integ.receipt.ts
@@ -1,5 +1,6 @@
 import * as cdk from 'aws-cdk-lib';
 import * as ses from 'aws-cdk-lib/aws-ses';
+import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 
 const app = new cdk.App();
 
@@ -23,3 +24,8 @@ new ses.AllowListReceiptFilter(stack, 'Allowlist', {
     '10.0.0.0/16',
   ],
 });
+
+new IntegTest(app, 'cdk-ses-receipt-integ', {
+  testCases: [stack],
+  diffAssets: true,
+});
diff --git a/...f0fa1d07b4f6b37198051cc98e251f34/index.ts → ...rs/lib/aws-ses/drop-spam-handler/index.ts b/...f0fa1d07b4f6b37198051cc98e251f34/index.ts → ...rs/lib/aws-ses/drop-spam-handler/index.ts
diff --git a/...op-spam-handler/drop-spam-handler.test.ts → ...rs/test/aws-ses/drop-spam-handler.test.ts b/...op-spam-handler/drop-spam-handler.test.ts → ...rs/test/aws-ses/drop-spam-handler.test.ts
@@ -1,4 +1,4 @@
-import { handler } from '../../lib/drop-spam-handler/index';
+import { handler } from '../../lib/aws-ses/drop-spam-handler/index';
 
 describe('handler', () => {
   test.each(['spf', 'dkim', 'spam', 'virus'])('drop spam when %s status is FAIL', async (key) => {

diff --git a/packages/aws-cdk-lib/aws-ses/lib/drop-spam-handler/.is_custom_resource b/packages/aws-cdk-lib/aws-ses/lib/drop-spam-handler/.is_custom_resource
diff --git a/packages/aws-cdk-lib/aws-ses/lib/drop-spam-handler/index.ts b/packages/aws-cdk-lib/aws-ses/lib/drop-spam-handler/index.ts
diff --git a/packages/aws-cdk-lib/aws-ses/lib/receipt-rule.ts b/packages/aws-cdk-lib/aws-ses/lib/receipt-rule.ts
@@ -174,7 +174,7 @@ export class DropSpamReceiptRule extends Construct {
     const fn = new lambda.SingletonFunction(this, 'Function', {
       runtime: lambda.Runtime.NODEJS_18_X,
       handler: 'index.handler',
-      code: lambda.Code.fromAsset(path.join(__dirname, 'drop-spam-handler')),
+      code: lambda.Code.fromAsset(path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-ses', 'drop-spam-handler')),
       uuid: '224e77f9-a32e-4b4d-ac32-983477abba16',
     });