mixin

Author: mrgrain

packages/@aws-cdk/mixins-preview/lib/services/aws-s3/bucket.ts

@@ -1,6 +1,6 @@
 import type { IConstruct } from 'constructs';
 import * as s3 from 'aws-cdk-lib/aws-s3';
-import { CustomResource, Stack, Tags } from 'aws-cdk-lib';
+import { CfnResource, CustomResource, Tags } from 'aws-cdk-lib';
 import { AutoDeleteObjectsProvider } from '../../custom-resource-handlers/aws-s3/auto-delete-objects-provider';
 import type { IMixin } from '../../core';
 
@@ -9,30 +9,30 @@ const AUTO_DELETE_OBJECTS_TAG = 'aws-cdk:auto-delete-objects';
 
 /**
  * S3-specific mixin for auto-deleting objects.
+ * @mixin true
  */
 export class AutoDeleteObjects implements IMixin {
-  supports(construct: IConstruct): boolean {
-    return construct instanceof s3.CfnBucket;
+  supports(construct: IConstruct): construct is s3.CfnBucket {
+    return CfnResource.isCfnResource(construct) && construct.cfnResourceType === s3.CfnBucket.CFN_RESOURCE_TYPE_NAME;
   }
 
   applyTo(construct: IConstruct): IConstruct {
-    if (!(construct instanceof s3.CfnBucket)) {
+    if (!this.supports(construct)) {
       return construct;
     }
 
-    const stack = Stack.of(construct);
-    const bucketName = construct.ref;
+    const ref = construct.bucketRef;
 
     const provider = AutoDeleteObjectsProvider.getOrCreateProvider(construct, AUTO_DELETE_OBJECTS_RESOURCE_TYPE, {
       useCfnResponseWrapper: false,
-      description: `Lambda function for auto-deleting objects in ${bucketName} S3 bucket.`,
+      description: `Lambda function for auto-deleting objects in ${ref.bucketName} S3 bucket.`,
     });
 
     // Get or create bucket policy
     let policy = construct.node.tryFindChild('Policy') as s3.CfnBucketPolicy | undefined;
     if (!policy) {
       policy = new s3.CfnBucketPolicy(construct, 'Policy', {
-        bucket: bucketName,
+        bucket: ref.bucketName,
         policyDocument: {
           Statement: [],
         },
@@ -54,16 +54,16 @@ export class AutoDeleteObjects implements IMixin {
         's3:DeleteObject*',
       ],
       Resource: [
-        stack.resolve(`arn:aws:s3:::${bucketName}`),
-        stack.resolve(`arn:aws:s3:::${bucketName}/*`),
+        ref.bucketArn,
+        `${ref.bucketArn}/*`,
       ],
     });
 
     const customResource = new CustomResource(construct, 'AutoDeleteObjectsCustomResource', {
       resourceType: AUTO_DELETE_OBJECTS_RESOURCE_TYPE,
       serviceToken: provider.serviceToken,
       properties: {
-        BucketName: bucketName,
+        BucketName: ref.bucketName,
       },
     });
 

packages/@aws-cdk/mixins-preview/test/integration.test.ts

@@ -1,4 +1,5 @@
 import { Stack, App } from 'aws-cdk-lib';
+import { Template } from 'aws-cdk-lib/assertions';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as logs from 'aws-cdk-lib/aws-logs';
 import {
@@ -33,10 +34,11 @@ describe('Integration Tests', () => {
       ConstructSelector.resourcesOfType(s3.CfnBucket),
     ).apply(new s3Mixins.EnableVersioning());
 
-    // Verify encryption only applied to prod bucket
-    expect(prodBucket.node.metadata.find(m => m.type === 'autoDeleteObjects')).toBeDefined();
-    expect(devBucket.node.metadata.find(m => m.type === 'autoDeleteObjects')).toBeUndefined();
-    expect(logGroup.node.metadata.find(m => m.type === 'autoDeleteObjects')).toBeUndefined();
+    // Verify auto-delete only applied to prod bucket
+    const template = Template.fromStack(stack);
+    const resources = template.findResources('Custom::S3AutoDeleteObjects');
+    expect(Object.keys(resources).length).toBe(1);
+    expect(resources[Object.keys(resources)[0]].Properties.BucketName.Ref).toBe('ProdBucket');
 
     // Verify versioning applied to both buckets
     expect((prodBucket.versioningConfiguration as any)?.status).toBe('Enabled');
@@ -51,7 +53,10 @@ describe('Integration Tests', () => {
       .apply(new s3Mixins.AutoDeleteObjects())
       .apply(new s3Mixins.EnableVersioning());
 
-    expect(bucket.node.metadata.find(m => m.type === 'autoDeleteObjects')).toBeDefined();
+    const template = Template.fromStack(stack);
+    template.hasResourceProperties('Custom::S3AutoDeleteObjects', {
+      BucketName: { Ref: 'Bucket1' },
+    });
     expect((bucket.versioningConfiguration as any)?.status).toBe('Enabled');
   });
 });

packages/@aws-cdk/mixins-preview/test/mixins/extensions.test.ts

@@ -1,4 +1,5 @@
 import { Stack, App } from 'aws-cdk-lib';
+import { Template } from 'aws-cdk-lib/assertions';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as sns from 'aws-cdk-lib/aws-sns';
 import '../../lib/extensions';
@@ -21,7 +22,11 @@ describe('Mixin Extensions', () => {
 
       const versionConfig = bucket.versioningConfiguration as any;
       expect(versionConfig?.status).toBe('Enabled');
-      expect(bucket.node.metadata.find(m => m.type === 'autoDeleteObjects')).toBeDefined();
+
+      const template = Template.fromStack(stack);
+      template.hasResourceProperties('Custom::S3AutoDeleteObjects', {
+        BucketName: { Ref: 'Bucket' },
+      });
     });
 
     test('returns the same construct', () => {