@aws-cdk/mixins-preview 2.241.0-alpha.0 → 2.242.0-alpha.0

package/scripts/spec2eventbridge/generate.d.ts

@@ -1,6 +1,6 @@
 import type { GenerateOptions as Spec2CdkOptions } from '@aws-cdk/spec2cdk';
 import { EventBridgeBuilder } from './builder';
-import { type ModuleMap } from '@aws-cdk/spec2cdk/lib/module-topology';
+import type { GeneratorResult } from '@aws-cdk/spec2cdk/lib/module-topology';
 type GenerateOptions = Pick<Spec2CdkOptions<typeof EventBridgeBuilder>, 'outputPath' | 'clearOutput' | 'debug'>;
-export declare function generateAll(options: GenerateOptions): Promise<ModuleMap>;
+export declare function generateAll(options: GenerateOptions): Promise<GeneratorResult>;
 export {};

package/scripts/spec2eventbridge/generate.js

@@ -25,15 +25,22 @@ async function generateAll(options) {
         db,
         astBuilder: builder_1.EventBridgeBuilder,
     });
-    return Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
-        moduleName,
-        {
-            files: moduleInfo.outputFiles,
-            name: moduleName,
-            resources: moduleInfo.resources,
-            scopes: moduleMap[moduleName]?.scopes ?? [],
-            definition: moduleMap[moduleName]?.definition,
-            targets: moduleMap[moduleName]?.targets,
-        },
-    ]));
+    return {
+        moduleMap: Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
+            moduleName,
+            {
+                files: moduleInfo.outputFiles,
+                name: moduleName,
+                resources: moduleInfo.resources,
+                scopes: moduleMap[moduleName]?.scopes ?? [],
+                definition: moduleMap[moduleName]?.definition,
+                targets: moduleMap[moduleName]?.targets,
+            },
+        ])),
+        contributions: [{
+                barrelFile: 'events.ts',
+                exportLines: ["export * from './events.generated';"],
+                jsiircNamespace: 'events',
+            }],
+    };
 }

package/scripts/spec2logs/generate.d.ts

@@ -1,6 +1,6 @@
 import type { GenerateOptions as Spec2CdkOptions } from '@aws-cdk/spec2cdk';
 import { LogsDeliveryBuilder } from './builder';
-import { type ModuleMap } from '@aws-cdk/spec2cdk/lib/module-topology';
+import type { GeneratorResult } from '@aws-cdk/spec2cdk/lib/module-topology';
 type GenerateOptions = Pick<Spec2CdkOptions<typeof LogsDeliveryBuilder>, 'outputPath' | 'clearOutput' | 'debug'>;
-export declare function generateAll(options: GenerateOptions): Promise<ModuleMap>;
+export declare function generateAll(options: GenerateOptions): Promise<GeneratorResult>;
 export {};

package/scripts/spec2logs/generate.js

@@ -12,7 +12,6 @@ async function generateAll(options) {
         packageBases: config_1.MIXINS_PREVIEW_BASE_NAMES,
     });
     const moduleRequests = {};
-    // request all known services
     for (const service of services) {
         if (moduleMap[service.name]) {
             moduleRequests[service.name] = {
@@ -25,15 +24,22 @@ async function generateAll(options) {
         db,
         astBuilder: builder_1.LogsDeliveryBuilder,
     });
-    return Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
-        moduleName,
-        {
-            files: moduleInfo.outputFiles,
-            name: moduleName,
-            resources: moduleInfo.resources,
-            scopes: moduleMap[moduleName]?.scopes ?? [],
-            definition: moduleMap[moduleName]?.definition,
-            targets: moduleMap[moduleName]?.targets,
-        },
-    ]));
+    return {
+        moduleMap: Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
+            moduleName,
+            {
+                files: moduleInfo.outputFiles,
+                name: moduleName,
+                resources: moduleInfo.resources,
+                scopes: moduleMap[moduleName]?.scopes ?? [],
+                definition: moduleMap[moduleName]?.definition,
+                targets: moduleMap[moduleName]?.targets,
+            },
+        ])),
+        contributions: [{
+                barrelFile: 'mixins.ts',
+                exportLines: ["export * from './logs-delivery-mixins.generated';"],
+                jsiircNamespace: 'mixins',
+            }],
+    };
 }

package/scripts/spec2mixins/index.d.ts

@@ -1,2 +1,6 @@
-export * from './builder';
-export * from './generate';
+import { cfnPropMixins } from '@aws-cdk/spec2cdk';
+import type { GeneratorResult } from '@aws-cdk/spec2cdk/lib/module-topology';
+export { MixinsBuilder } from '@aws-cdk/spec2cdk/lib/cfn-prop-mixins';
+export type { MixinsBuilderProps } from '@aws-cdk/spec2cdk/lib/cfn-prop-mixins';
+type GenerateOptions = Pick<cfnPropMixins.MixinsGenerateOptions, 'outputPath' | 'clearOutput' | 'debug'>;
+export declare function generateAll(options: GenerateOptions): Promise<GeneratorResult>;

package/scripts/spec2mixins/index.js

@@ -1,18 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./builder"), exports);
-__exportStar(require("./generate"), exports);
+exports.MixinsBuilder = void 0;
+exports.generateAll = generateAll;
+// Thin wrapper — the implementation lives in @aws-cdk/spec2cdk
+const spec2cdk_1 = require("@aws-cdk/spec2cdk");
+const config_1 = require("../config");
+var cfn_prop_mixins_1 = require("@aws-cdk/spec2cdk/lib/cfn-prop-mixins");
+Object.defineProperty(exports, "MixinsBuilder", { enumerable: true, get: function () { return cfn_prop_mixins_1.MixinsBuilder; } });
+async function generateAll(options) {
+    return spec2cdk_1.cfnPropMixins.generateAll({ ...options, packageBases: config_1.MIXINS_PREVIEW_BASE_NAMES });
+}

package/lib/custom-resource-handlers/aws-s3/auto-delete-objects-provider.d.ts

@@ -1,8 +0,0 @@
-import type { Construct } from 'constructs';
-import type { CustomResourceProviderOptions } from 'aws-cdk-lib/core';
-import { CustomResourceProviderBase } from 'aws-cdk-lib/core';
-export declare class AutoDeleteObjectsProvider extends CustomResourceProviderBase {
-    static getOrCreate(scope: Construct, uniqueid: string, props?: CustomResourceProviderOptions): string;
-    static getOrCreateProvider(scope: Construct, uniqueid: string, props?: CustomResourceProviderOptions): AutoDeleteObjectsProvider;
-    private constructor();
-}

package/lib/custom-resource-handlers/aws-s3/auto-delete-objects-provider.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AutoDeleteObjectsProvider = void 0;
-const path = require("path");
-const core_1 = require("aws-cdk-lib/core");
-class AutoDeleteObjectsProvider extends core_1.CustomResourceProviderBase {
-    static getOrCreate(scope, uniqueid, props) {
-        return this.getOrCreateProvider(scope, uniqueid, props).serviceToken;
-    }
-    static getOrCreateProvider(scope, uniqueid, props) {
-        const id = `${uniqueid}CustomResourceProvider`;
-        const stack = core_1.Stack.of(scope);
-        const existing = stack.node.tryFindChild(id);
-        return existing ?? new AutoDeleteObjectsProvider(stack, id, props);
-    }
-    constructor(scope, id, props) {
-        super(scope, id, {
-            ...props,
-            codeDirectory: path.join(__dirname, '..', 'dist', 'aws-s3', 'auto-delete-objects-handler'),
-            runtimeName: (0, core_1.determineLatestNodeRuntimeName)(scope),
-        });
-        this.node.addMetadata('aws:cdk:is-custom-resource-handler-customResourceProvider', true);
-    }
-}
-exports.AutoDeleteObjectsProvider = AutoDeleteObjectsProvider;

package/lib/custom-resource-handlers/dist/aws-s3/auto-delete-objects-handler/index.js

@@ -1 +0,0 @@
-"use strict";var f=Object.create;var i=Object.defineProperty;var I=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var A=(t,e)=>{for(var o in e)i(t,o,{get:e[o],enumerable:!0})},d=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of C(e))!P.call(t,s)&&s!==o&&i(t,s,{get:()=>e[s],enumerable:!(r=I(e,s))||r.enumerable});return t};var l=(t,e,o)=>(o=t!=null?f(w(t)):{},d(e||!t||!t.__esModule?i(o,"default",{value:t,enumerable:!0}):o,t)),B=t=>d(i({},"__esModule",{value:!0}),t);var q={};A(q,{autoDeleteHandler:()=>S,handler:()=>H});module.exports=B(q);var h=require("@aws-sdk/client-s3");var y=l(require("https")),m=l(require("url")),a={sendHttpRequest:D,log:T,includeStackTraces:!0,userHandlerIndex:"./index"},p="AWSCDK::CustomResourceProviderFramework::CREATE_FAILED",L="AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID";function R(t){return async(e,o)=>{let r={...e,ResponseURL:"..."};if(a.log(JSON.stringify(r,void 0,2)),e.RequestType==="Delete"&&e.PhysicalResourceId===p){a.log("ignoring DELETE event caused by a failed CREATE event"),await u("SUCCESS",e);return}try{let s=await t(r,o),n=k(e,s);await u("SUCCESS",n)}catch(s){let n={...e,Reason:a.includeStackTraces?s.stack:s.message};n.PhysicalResourceId||(e.RequestType==="Create"?(a.log("CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored"),n.PhysicalResourceId=p):a.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(e)}`)),await u("FAILED",n)}}}function k(t,e={}){let o=e.PhysicalResourceId??t.PhysicalResourceId??t.RequestId;if(t.RequestType==="Delete"&&o!==t.PhysicalResourceId)throw new Error(`DELETE: cannot change the physical resource ID from "${t.PhysicalResourceId}" to "${e.PhysicalResourceId}" during deletion`);return{...t,...e,PhysicalResourceId:o}}async function u(t,e){let o={Status:t,Reason:e.Reason??t,StackId:e.StackId,RequestId:e.RequestId,PhysicalResourceId:e.PhysicalResourceId||L,LogicalResourceId:e.LogicalResourceId,NoEcho:e.NoEcho,Data:e.Data},r=m.parse(e.ResponseURL),s=`${r.protocol}//${r.hostname}/${r.pathname}?***`;a.log("submit response to cloudformation",s,o);let n=JSON.stringify(o),E={hostname:r.hostname,path:r.path,method:"PUT",headers:{"content-type":"","content-length":Buffer.byteLength(n,"utf8")}};await O({attempts:5,sleep:1e3},a.sendHttpRequest)(E,n)}async function D(t,e){return new Promise((o,r)=>{try{let s=y.request(t,n=>{n.resume(),!n.statusCode||n.statusCode>=400?r(new Error(`Unsuccessful HTTP response: ${n.statusCode}`)):o()});s.on("error",r),s.write(e),s.end()}catch(s){r(s)}})}function T(t,...e){console.log(t,...e)}function O(t,e){return async(...o)=>{let r=t.attempts,s=t.sleep;for(;;)try{return await e(...o)}catch(n){if(r--<=0)throw n;await b(Math.floor(Math.random()*s)),s*=2}}}async function b(t){return new Promise(e=>setTimeout(e,t))}var g="aws-cdk:auto-delete-objects",x=JSON.stringify({Version:"2012-10-17",Statement:[]}),c=new h.S3({}),H=R(S);async function S(t){switch(t.RequestType){case"Create":return;case"Update":return{PhysicalResourceId:(await F(t)).PhysicalResourceId};case"Delete":return N(t.ResourceProperties?.BucketName)}}async function F(t){let e=t,o=e.OldResourceProperties?.BucketName;return{PhysicalResourceId:e.ResourceProperties?.BucketName??o}}async function _(t){try{let e=(await c.getBucketPolicy({Bucket:t}))?.Policy??x,o=JSON.parse(e);o.Statement.push({Principal:"*",Effect:"Deny",Action:["s3:PutObject"],Resource:[`arn:aws:s3:::${t}/*`]}),await c.putBucketPolicy({Bucket:t,Policy:JSON.stringify(o)})}catch(e){if(e.name==="NoSuchBucket")throw e;console.log(`Could not set new object deny policy on bucket '${t}' prior to deletion.`)}}async function U(t){let e;do{e=await c.listObjectVersions({Bucket:t});let o=[...e.Versions??[],...e.DeleteMarkers??[]];if(o.length===0)return;let r=o.map(s=>({Key:s.Key,VersionId:s.VersionId}));await c.deleteObjects({Bucket:t,Delete:{Objects:r}})}while(e?.IsTruncated)}async function N(t){if(!t)throw new Error("No BucketName was provided.");try{if(!await W(t)){console.log(`Bucket does not have '${g}' tag, skipping cleaning.`);return}await _(t),await U(t)}catch(e){if(e.name==="NoSuchBucket"){console.log(`Bucket '${t}' does not exist.`);return}throw e}}async function W(t){return(await c.getBucketTagging({Bucket:t})).TagSet?.some(o=>o.Key===g&&o.Value==="true")}0&&(module.exports={autoDeleteHandler,handler});

package/lib/mixins/private/reflections.d.ts

@@ -1,29 +0,0 @@
-import type { IConstruct } from 'constructs';
-import { CfnResource } from 'aws-cdk-lib/core';
-import type { CfnBucket } from 'aws-cdk-lib/aws-s3';
-import { type IBucketRef, type CfnBucketPolicy } from 'aws-cdk-lib/aws-s3';
-import type { CfnDeliverySource } from 'aws-cdk-lib/aws-logs';
-import type { CfnKey, IKeyRef } from 'aws-cdk-lib/aws-kms';
-/**
- * Attempts to find an existing bucket policy for the specified S3 bucket.
- * Finds the closest matching policy to the specified bucket.
- *
- * @param bucket - The S3 bucket reference to search for an associated bucket policy
- * @returns The bucket policy if found, undefined otherwise
- */
-export declare function tryFindBucketPolicyForBucket(bucket: IBucketRef): CfnBucketPolicy | undefined;
-export declare function tryFindDeliverySourceForResource(source: IConstruct, sourceArn: string, logType: string): CfnDeliverySource | undefined;
-export declare function tryFindKmsKeyforBucket(bucket: IBucketRef): CfnKey | undefined;
-/**
- * Attempts to find the L1 CfnResource for a given Ref interface.
- * Searches children first (for L2 wrappers), then the construct tree.
- *
- * @param ref - The Ref interface (e.g., IKeyRef, IBucketRef)
- * @param cfnResourceType - The CloudFormation resource type (e.g., 'AWS::KMS::Key')
- * @param extractId - Function to extract the identifying property from the ref
- * @param extractCfnId - Function to extract the identifying property from the CfnResource
- * @returns The L1 CfnResource if found, undefined otherwise
- */
-export declare function findL1FromRef<TRef extends IConstruct, TCfn extends CfnResource>(ref: TRef, cfnResourceType: string, compareIdToCfnId: (cfn: TCfn, ref: TRef) => boolean): TCfn | undefined;
-export declare function tryFindKmsKeyConstruct(kmsKey: IKeyRef): CfnKey | undefined;
-export declare function tryFindBucketConstruct(bucket: IBucketRef): CfnBucket | undefined;

package/lib/mixins/private/reflections.js

@@ -1,122 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryFindBucketPolicyForBucket = tryFindBucketPolicyForBucket;
-exports.tryFindDeliverySourceForResource = tryFindDeliverySourceForResource;
-exports.tryFindKmsKeyforBucket = tryFindKmsKeyforBucket;
-exports.findL1FromRef = findL1FromRef;
-exports.tryFindKmsKeyConstruct = tryFindKmsKeyConstruct;
-exports.tryFindBucketConstruct = tryFindBucketConstruct;
-const core_1 = require("aws-cdk-lib/core");
-/**
- * Finds the closest related resource in the construct tree.
- * Searches children first (depth-first), then ancestors (breadth-first).
- *
- * @param primary - The construct to search a related resource for
- * @param relatedCfnResourceType - The CloudFormation resource type to search for
- * @param isConnected - Predicate to determine if a candidate is related to the primary
- * @returns The closest matching resource, or undefined if none found
- */
-function findClosestRelatedResource(primary, relatedCfnResourceType, isConnected) {
-    let closestMatch;
-    let closestDistance = Infinity;
-    const visited = new Set();
-    const isRelatedResource = (child) => {
-        return core_1.CfnResource.isCfnResource(child) && child.cfnResourceType === relatedCfnResourceType;
-    };
-    const checkCandidate = (candidate, distance) => {
-        // Check if candidate is the right type, connected to primary, and closer than current match
-        if (isRelatedResource(candidate) && isConnected(primary, candidate) && distance < closestDistance) {
-            closestMatch = candidate;
-            closestDistance = distance;
-        }
-    };
-    // Search all descendants depth-first
-    const searchChildren = (parent, distance) => {
-        // Stop searching if we're already farther than the closest match
-        if (distance >= closestDistance) {
-            return;
-        }
-        // Check each child and recursively search its descendants
-        for (const child of parent.node.children) {
-            // Skip if already visited
-            if (visited.has(child)) {
-                continue;
-            }
-            visited.add(child);
-            checkCandidate(child, distance);
-            searchChildren(child, distance + 1);
-        }
-    };
-    searchChildren(primary, 1);
-    // Search ancestors and their descendants breadth-first
-    let ancestor = primary.node.scope;
-    let ancestorDistance = 1;
-    // Walk up the tree while we have ancestors and haven't exceeded closest distance
-    while (ancestor && ancestorDistance < closestDistance) {
-        // Check all siblings and their descendants at this ancestor level
-        for (const sibling of ancestor.node.children) {
-            searchChildren(sibling, ancestorDistance);
-        }
-        ancestor = ancestor.node.scope;
-        ancestorDistance++;
-    }
-    return closestMatch;
-}
-/**
- * Attempts to find an existing bucket policy for the specified S3 bucket.
- * Finds the closest matching policy to the specified bucket.
- *
- * @param bucket - The S3 bucket reference to search for an associated bucket policy
- * @returns The bucket policy if found, undefined otherwise
- */
-function tryFindBucketPolicyForBucket(bucket) {
-    return findClosestRelatedResource(bucket, 'AWS::S3::BucketPolicy', (b, policy) => {
-        const possibleRefs = new Set([b.ref, b.bucketName, b.bucketArn, b.bucketRef?.bucketName, b.bucketRef?.bucketArn].filter(Boolean));
-        return possibleRefs.has(policy.bucket) || String(policy.bucket).includes(b.node.id);
-    });
-}
-function tryFindDeliverySourceForResource(source, sourceArn, logType) {
-    return findClosestRelatedResource(source, 'AWS::Logs::DeliverySource', (_, deliverySource) => deliverySource.resourceArn === sourceArn && deliverySource.logType === logType);
-}
-function tryFindKmsKeyforBucket(bucket) {
-    const cfnBucket = tryFindBucketConstruct(bucket);
-    const kmsMasterKeyId = cfnBucket && Array.isArray(cfnBucket.bucketEncryption?.serverSideEncryptionConfiguration) ?
-        cfnBucket.bucketEncryption.serverSideEncryptionConfiguration[0]?.serverSideEncryptionByDefault?.kmsMasterKeyId
-        : undefined;
-    if (!kmsMasterKeyId) {
-        return undefined;
-    }
-    return findClosestRelatedResource(bucket, 'AWS::KMS::Key', (_, key) => key.ref === kmsMasterKeyId || key.attrKeyId === kmsMasterKeyId || key.attrArn === kmsMasterKeyId);
-}
-/**
- * Attempts to find the L1 CfnResource for a given Ref interface.
- * Searches children first (for L2 wrappers), then the construct tree.
- *
- * @param ref - The Ref interface (e.g., IKeyRef, IBucketRef)
- * @param cfnResourceType - The CloudFormation resource type (e.g., 'AWS::KMS::Key')
- * @param extractId - Function to extract the identifying property from the ref
- * @param extractCfnId - Function to extract the identifying property from the CfnResource
- * @returns The L1 CfnResource if found, undefined otherwise
- */
-function findL1FromRef(ref, cfnResourceType, compareIdToCfnId) {
-    // Helper to check if a CfnResource matches our criteria
-    const isCfnMatch = (construct) => {
-        return core_1.CfnResource.isCfnResource(construct) && construct.cfnResourceType === cfnResourceType;
-    };
-    // First check if ref itself is the L1 construct
-    if (isCfnMatch(ref)) {
-        return ref;
-    }
-    // Check if ref is an L2 construct with a defaultChild
-    if (ref.node.defaultChild && isCfnMatch(ref.node.defaultChild)) {
-        return ref.node.defaultChild;
-    }
-    // Finally search the broader construct tree
-    return findClosestRelatedResource(ref, cfnResourceType, (_, candidate) => compareIdToCfnId(candidate, ref));
-}
-function tryFindKmsKeyConstruct(kmsKey) {
-    return findL1FromRef(kmsKey, 'AWS::KMS::Key', (cfn, ref) => ref.keyRef === cfn.keyRef);
-}
-function tryFindBucketConstruct(bucket) {
-    return findL1FromRef(bucket, 'AWS::S3::Bucket', (cfn, ref) => ref.bucketRef == cfn.bucketRef);
-}

package/lib/services/aws-ecs/cluster.d.ts

@@ -1,15 +0,0 @@
-import { Mixin } from 'aws-cdk-lib/core';
-import { CfnCluster } from 'aws-cdk-lib/aws-ecs';
-import type { IConstruct } from 'constructs/lib/construct';
-/**
- * Applies one or more cluster settings to an ECS cluster.
- *
- * If a setting with the same name already exists, its value is replaced.
- * @mixin true
- */
-export declare class ClusterSettings extends Mixin {
-    private readonly settings;
-    constructor(settings: CfnCluster.ClusterSettingsProperty[]);
-    supports(construct: IConstruct): construct is CfnCluster;
-    applyTo(cluster: IConstruct): void;
-}

package/lib/services/aws-ecs/cluster.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClusterSettings = void 0;
-const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
-const core_1 = require("aws-cdk-lib/core");
-const aws_ecs_1 = require("aws-cdk-lib/aws-ecs");
-/**
- * Applies one or more cluster settings to an ECS cluster.
- *
- * If a setting with the same name already exists, its value is replaced.
- * @mixin true
- */
-class ClusterSettings extends core_1.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecs.mixins.ClusterSettings", version: "2.241.0-alpha.0" };
-    settings;
-    constructor(settings) {
-        super();
-        this.settings = settings;
-    }
-    supports(construct) {
-        return aws_ecs_1.CfnCluster.isCfnCluster(construct);
-    }
-    applyTo(cluster) {
-        if (!this.supports(cluster)) {
-            return;
-        }
-        const clusterSettings = Array.isArray(cluster.clusterSettings)
-            ? [...cluster.clusterSettings]
-            : cluster.clusterSettings === undefined
-                ? []
-                : [cluster.clusterSettings];
-        for (const setting of this.settings) {
-            const existingIndex = clusterSettings.findIndex((currentSetting) => currentSetting?.name === setting.name);
-            if (existingIndex >= 0) {
-                clusterSettings[existingIndex] = setting;
-            }
-            else {
-                clusterSettings.push(setting);
-            }
-        }
-        cluster.clusterSettings = clusterSettings;
-    }
-}
-exports.ClusterSettings = ClusterSettings;

package/lib/services/aws-s3/bucket-policy.d.ts

@@ -1,19 +0,0 @@
-import type { IConstruct } from 'constructs/lib/construct';
-import { Mixin } from 'aws-cdk-lib/core';
-import type { PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { CfnBucketPolicy } from 'aws-cdk-lib/aws-s3';
-/**
- * Adds statements to a bucket policy
- * @mixin true
- */
-export declare class BucketPolicyStatementsMixin extends Mixin {
-    private readonly statements;
-    constructor(statements: PolicyStatement[]);
-    supports(construct: IConstruct): construct is CfnBucketPolicy;
-    applyTo(policy: IConstruct): void;
-    /**
-     * CfnBucketPolicy.policyDocument sometimes is a PolicyDocument object
-     * and sometimes is a plain object. We need to handle both cases.
-     */
-    private getPolicyDocument;
-}

package/lib/services/aws-s3/bucket-policy.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BucketPolicyStatementsMixin = void 0;
-const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
-const core_1 = require("aws-cdk-lib/core");
-const aws_iam_1 = require("aws-cdk-lib/aws-iam");
-const aws_s3_1 = require("aws-cdk-lib/aws-s3");
-/**
- * Adds statements to a bucket policy
- * @mixin true
- */
-class BucketPolicyStatementsMixin extends core_1.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.BucketPolicyStatementsMixin", version: "2.241.0-alpha.0" };
-    statements;
-    constructor(statements) {
-        super();
-        this.statements = statements;
-    }
-    supports(construct) {
-        return aws_s3_1.CfnBucketPolicy.isCfnBucketPolicy(construct);
-    }
-    applyTo(policy) {
-        if (!this.supports(policy)) {
-            return;
-        }
-        const policyDocument = this.getPolicyDocument(policy);
-        policyDocument.addStatements(...this.statements);
-        policy.policyDocument = policyDocument;
-    }
-    /**
-     * CfnBucketPolicy.policyDocument sometimes is a PolicyDocument object
-     * and sometimes is a plain object. We need to handle both cases.
-     */
-    getPolicyDocument(policy) {
-        if (policy.policyDocument instanceof aws_iam_1.PolicyDocument) {
-            return policy.policyDocument;
-        }
-        return aws_iam_1.PolicyDocument.fromJson(policy.policyDocument);
-    }
-}
-exports.BucketPolicyStatementsMixin = BucketPolicyStatementsMixin;

package/lib/services/aws-s3/bucket.d.ts

@@ -1,30 +0,0 @@
-import type { IConstruct } from 'constructs';
-import * as s3 from 'aws-cdk-lib/aws-s3';
-import type { IMixin } from 'constructs';
-/**
- * S3-specific mixin for auto-deleting objects.
- * @mixin true
- */
-export declare class AutoDeleteObjects implements IMixin {
-    supports(construct: IConstruct): construct is s3.CfnBucket;
-    applyTo(construct: IConstruct): void;
-}
-/**
- * S3-specific mixin for enabling versioning.
- */
-export declare class BucketVersioning implements IMixin {
-    private readonly enabled;
-    constructor(enabled?: boolean);
-    supports(construct: IConstruct): boolean;
-    applyTo(construct: IConstruct): void;
-}
-/**
- * S3-specific mixin for blocking public-access.
- * @mixin true
- */
-export declare class BucketBlockPublicAccess implements IMixin {
-    private readonly configOptions;
-    constructor(publicAccessConfig?: s3.BlockPublicAccess);
-    supports(construct: IConstruct): construct is s3.CfnBucket;
-    applyTo(construct: IConstruct): void;
-}

package/lib/services/aws-s3/bucket.js

@@ -1,122 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BucketBlockPublicAccess = exports.BucketVersioning = exports.AutoDeleteObjects = void 0;
-const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
-const s3 = require("aws-cdk-lib/aws-s3");
-const core_1 = require("aws-cdk-lib/core");
-const auto_delete_objects_provider_1 = require("../../custom-resource-handlers/aws-s3/auto-delete-objects-provider");
-const reflections_1 = require("../../mixins/private/reflections");
-const AUTO_DELETE_OBJECTS_RESOURCE_TYPE = 'Custom::S3AutoDeleteObjects';
-const AUTO_DELETE_OBJECTS_TAG = 'aws-cdk:auto-delete-objects';
-/**
- * S3-specific mixin for auto-deleting objects.
- * @mixin true
- */
-class AutoDeleteObjects {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.AutoDeleteObjects", version: "2.241.0-alpha.0" };
-    supports(construct) {
-        return core_1.CfnResource.isCfnResource(construct) && construct.cfnResourceType === s3.CfnBucket.CFN_RESOURCE_TYPE_NAME;
-    }
-    applyTo(construct) {
-        if (!this.supports(construct)) {
-            return;
-        }
-        const ref = construct.bucketRef;
-        const provider = auto_delete_objects_provider_1.AutoDeleteObjectsProvider.getOrCreateProvider(construct, AUTO_DELETE_OBJECTS_RESOURCE_TYPE, {
-            useCfnResponseWrapper: false,
-            description: `Lambda function for auto-deleting objects in ${ref.bucketName} S3 bucket.`,
-        });
-        // Get or create bucket policy
-        let policy = (0, reflections_1.tryFindBucketPolicyForBucket)(construct);
-        if (!policy) {
-            policy = new s3.CfnBucketPolicy(construct, 'Policy', {
-                bucket: ref.bucketName,
-                policyDocument: {
-                    Statement: [],
-                },
-            });
-        }
-        // Add policy statement to allow the custom resource to delete objects
-        const policyDoc = policy.policyDocument;
-        if (!policyDoc.Statement) {
-            policyDoc.Statement = [];
-        }
-        policyDoc.Statement.push({
-            Effect: 'Allow',
-            Principal: { AWS: provider.roleArn },
-            Action: [
-                's3:PutBucketPolicy',
-                's3:GetBucket*',
-                's3:List*',
-                's3:DeleteObject*',
-            ],
-            Resource: [
-                ref.bucketArn,
-                `${ref.bucketArn}/*`,
-            ],
-        });
-        const customResource = new core_1.CustomResource(construct, 'AutoDeleteObjectsCustomResource', {
-            resourceType: AUTO_DELETE_OBJECTS_RESOURCE_TYPE,
-            serviceToken: provider.serviceToken,
-            properties: {
-                BucketName: ref.bucketName,
-            },
-        });
-        // Ensure bucket policy is deleted AFTER the custom resource
-        customResource.node.addDependency(policy);
-        // Tag the bucket to record that we want it autodeleted
-        core_1.Tags.of(construct).add(AUTO_DELETE_OBJECTS_TAG, 'true');
-    }
-}
-exports.AutoDeleteObjects = AutoDeleteObjects;
-/**
- * S3-specific mixin for enabling versioning.
- */
-class BucketVersioning {
-    enabled;
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.BucketVersioning", version: "2.241.0-alpha.0" };
-    constructor(enabled = true) {
-        this.enabled = enabled;
-    }
-    supports(construct) {
-        return construct instanceof s3.CfnBucket;
-    }
-    applyTo(construct) {
-        if (construct instanceof s3.CfnBucket) {
-            construct.versioningConfiguration = {
-                status: this.enabled ? 'Enabled' : 'Suspended',
-            };
-        }
-    }
-}
-exports.BucketVersioning = BucketVersioning;
-/**
- * S3-specific mixin for blocking public-access.
- * @mixin true
- */
-class BucketBlockPublicAccess {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.BucketBlockPublicAccess", version: "2.241.0-alpha.0" };
-    configOptions;
-    constructor(publicAccessConfig = s3.BlockPublicAccess.BLOCK_ALL) {
-        this.configOptions = {
-            blockPublicAcls: publicAccessConfig.blockPublicAcls,
-            blockPublicPolicy: publicAccessConfig.blockPublicPolicy,
-            ignorePublicAcls: publicAccessConfig.ignorePublicAcls,
-            restrictPublicBuckets: publicAccessConfig.restrictPublicBuckets,
-        };
-    }
-    supports(construct) {
-        return s3.CfnBucket.isCfnBucket(construct);
-    }
-    applyTo(construct) {
-        if (!this.supports(construct))
-            return;
-        construct.publicAccessBlockConfiguration = {
-            blockPublicAcls: this.configOptions.blockPublicAcls ?? true,
-            blockPublicPolicy: this.configOptions.blockPublicPolicy ?? true,
-            ignorePublicAcls: this.configOptions.ignorePublicAcls ?? true,
-            restrictPublicBuckets: this.configOptions.restrictPublicBuckets ?? true,
-        };
-    }
-}
-exports.BucketBlockPublicAccess = BucketBlockPublicAccess;

package/lib/util/property-mixins.d.ts

@@ -1,14 +0,0 @@
-/**
- * Deep merge utility for nested objects
- * @param target The target object to merge into
- * @param source The source object to merge from
- * @param mergeOnly The explicit list of property keys to copy from source
- */
-export declare function deepMerge(target: any, source: any, mergeOnly: string[]): any;
-/**
- * Shallow assign utility that explicitly assigns each property
- * @param target The target object to assign properties to
- * @param source The source object to read properties from
- * @param assignOnly The explicit list of property keys that are allowed to be assigned
- */
-export declare function shallowAssign(target: any, source: any, assignOnly: string[]): any;