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

package/lib/services/aws-s3/logs-delivery-mixins.generated.d.ts

@@ -1,6 +1,6 @@
+import * as cdk from "aws-cdk-lib/core";
 import * as interfaces from "aws-cdk-lib/interfaces";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as logsDelivery from "../aws-logs/logs-delivery";
 import * as service from "aws-cdk-lib/aws-s3";
 /**
@@ -13,24 +13,32 @@ import * as service from "aws-cdk-lib/aws-s3";
 export declare class CfnBucketS3ServerAccessLogs {
     /**
      * Send logs to an S3 Bucket
+     *
+     * @param props Additional properties that are optionally used in log delivery for S3 destinations
      */
-    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: logsDelivery.IS3LogsDestinationProps): CfnBucketLogsMixin;
+    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: CfnBucketS3ServerAccessLogsS3Props): CfnBucketLogsMixin;
     /**
      * Send logs to a CloudWatch Log Group
+     *
+     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
      */
-    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef): CfnBucketLogsMixin;
+    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef, props?: CfnBucketS3ServerAccessLogsLogGroupProps): CfnBucketLogsMixin;
     /**
      * Send logs to a Firehose Delivery Stream
+     *
+     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
      */
-    toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef): CfnBucketLogsMixin;
+    toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef, props?: CfnBucketS3ServerAccessLogsFirehoseProps): CfnBucketLogsMixin;
     /**
      * Delivers logs to a pre-created delivery destination
      *
      * Supported destinations are S3, CWL, FH
      * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
      * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
      */
-    toDestination(destination: interfaces.aws_logs.IDeliveryDestinationRef): CfnBucketLogsMixin;
+    toDestination(destination: interfaces.aws_logs.IDeliveryDestinationRef, props?: CfnBucketS3ServerAccessLogsDestProps): CfnBucketLogsMixin;
 }
 /**
  * The `AWS::S3::Bucket` resource creates an Amazon S3 bucket in the same AWS Region where you create the AWS CloudFormation stack.
@@ -44,7 +52,7 @@ export declare class CfnBucketS3ServerAccessLogs {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-bucket.html
  */
-export declare class CfnBucketLogsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnBucketLogsMixin extends cdk.Mixin implements constructs.IMixin {
     static readonly S3_SERVER_ACCESS_LOGS: CfnBucketS3ServerAccessLogs;
     protected readonly logType: string;
     protected readonly logDelivery: logsDelivery.ILogsDelivery;
@@ -64,3 +72,91 @@ export declare class CfnBucketLogsMixin extends core.Mixin implements core.IMixi
      */
     applyTo(resource: constructs.IConstruct): void;
 }
+/**
+ * Output Format options for each destination of CfnBucketS3ServerAccessLogs.
+ */
+export declare class CfnBucketS3ServerAccessLogsOutputFormat {
+}
+export declare namespace CfnBucketS3ServerAccessLogsOutputFormat {
+    enum S3 {
+        JSON = "json",
+        PARQUET = "parquet"
+    }
+    enum LogGroup {
+        JSON = "json"
+    }
+    enum Firehose {
+        JSON = "json"
+    }
+}
+export declare enum CfnBucketS3ServerAccessLogsRecordFields {
+    BUCKET_NAME = "bucket_name",
+    SCHEMA_VERSION_ID = "schema_version_id",
+    BUCKET_ARN = "bucket_arn",
+    REQUEST_TIME = "request_time",
+    BUCKET_OWNER_ID = "bucket_owner_id",
+    REMOTE_IP = "remote_ip",
+    REQUESTER = "requester",
+    REQUEST_ID = "request_id",
+    OPERATION = "operation",
+    KEY_NAME = "key_name",
+    REQUEST_URI = "request_uri",
+    HTTP_STATUS = "http_status",
+    ERROR_CODE = "error_code",
+    BYTES_SENT = "bytes_sent",
+    OBJECT_SIZE = "object_size",
+    TOTAL_DURATION = "total_duration",
+    TURN_AROUND_DURATION = "turn_around_duration",
+    REFERER = "referer",
+    USER_AGENT = "user_agent",
+    VERSION_ID = "version_id",
+    HOST_ID = "host_id",
+    SIGNATURE_VERSION = "signature_version",
+    CIPHER_SUITE = "cipher_suite",
+    AUTHENTICATION_TYPE = "authentication_type",
+    HOST_HEADER = "host_header",
+    TLS_VERSION = "tls_version",
+    ACCESS_POINT_ARN = "access_point_arn",
+    ACL_REQUIRED = "acl_required",
+    SOURCE_REGION = "source_region"
+}
+export interface CfnBucketS3ServerAccessLogsS3Props {
+    /**
+     * Encrpytion key for your delivery bucket
+     */
+    readonly encryptionKey?: interfaces.aws_kms.IKeyRef;
+    /**
+     * Format for log output, options are json,parquet
+     */
+    readonly outputFormat?: CfnBucketS3ServerAccessLogsOutputFormat.S3;
+    /**
+     * Record fields that can be provided to a log delivery
+     */
+    readonly recordFields?: Array<CfnBucketS3ServerAccessLogsRecordFields>;
+}
+export interface CfnBucketS3ServerAccessLogsLogGroupProps {
+    /**
+     * Format for log output, options are json
+     */
+    readonly outputFormat?: CfnBucketS3ServerAccessLogsOutputFormat.LogGroup;
+    /**
+     * Record fields that can be provided to a log delivery
+     */
+    readonly recordFields?: Array<CfnBucketS3ServerAccessLogsRecordFields>;
+}
+export interface CfnBucketS3ServerAccessLogsFirehoseProps {
+    /**
+     * Format for log output, options are json
+     */
+    readonly outputFormat?: CfnBucketS3ServerAccessLogsOutputFormat.Firehose;
+    /**
+     * Record fields that can be provided to a log delivery
+     */
+    readonly recordFields?: Array<CfnBucketS3ServerAccessLogsRecordFields>;
+}
+export interface CfnBucketS3ServerAccessLogsDestProps {
+    /**
+     * Record fields that can be provided to a log delivery
+     */
+    readonly recordFields?: Array<CfnBucketS3ServerAccessLogsRecordFields>;
+}

package/lib/services/aws-s3/logs-delivery-mixins.generated.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CfnBucketLogsMixin = exports.CfnBucketS3ServerAccessLogs = void 0;
+exports.CfnBucketS3ServerAccessLogsRecordFields = exports.CfnBucketS3ServerAccessLogsOutputFormat = exports.CfnBucketLogsMixin = exports.CfnBucketS3ServerAccessLogs = void 0;
 const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const logsDelivery = require("../aws-logs/logs-delivery");
 const service = require("aws-cdk-lib/aws-s3");
 /**
@@ -16,13 +15,15 @@ const service = require("aws-cdk-lib/aws-s3");
  * @stability external
  */
 class CfnBucketS3ServerAccessLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketS3ServerAccessLogs", version: "2.240.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketS3ServerAccessLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
+     *
+     * @param props Additional properties that are optionally used in log delivery for S3 destinations
      */
     toS3(bucket, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_logs_IS3LogsDestinationProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_s3_mixins_CfnBucketS3ServerAccessLogsS3Props(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -33,24 +34,57 @@ class CfnBucketS3ServerAccessLogs {
         {
             return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
                 permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
-                kmsKey: (props && props.encryptionKey) ? props.encryptionKey : undefined
+                kmsKey: props?.encryptionKey,
+                outputFormat: props?.outputFormat,
+                providedFields: props?.recordFields,
+                mandatoryFields: ["schema_version_id", "bucket_arn", "request_time", "bucket_owner_id", "remote_ip", "requester", "request_id", "operation", "key_name", "request_uri", "http_status", "error_code", "bytes_sent", "object_size", "total_duration", "turn_around_duration", "referer", "user_agent", "version_id", "host_id", "signature_version", "cipher_suite", "authentication_type", "host_header", "tls_version", "access_point_arn", "acl_required", "source_region"]
             }));
         }
     }
     /**
      * Send logs to a CloudWatch Log Group
+     *
+     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
      */
-    toLogGroup(logGroup) {
+    toLogGroup(logGroup, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_s3_mixins_CfnBucketS3ServerAccessLogsLogGroupProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toLogGroup);
+            }
+            throw error;
+        }
         {
-            return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup));
+            return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
+                outputFormat: props?.outputFormat,
+                providedFields: props?.recordFields,
+                mandatoryFields: ["schema_version_id", "bucket_arn", "request_time", "bucket_owner_id", "remote_ip", "requester", "request_id", "operation", "key_name", "request_uri", "http_status", "error_code", "bytes_sent", "object_size", "total_duration", "turn_around_duration", "referer", "user_agent", "version_id", "host_id", "signature_version", "cipher_suite", "authentication_type", "host_header", "tls_version", "access_point_arn", "acl_required", "source_region"]
+            }));
         }
     }
     /**
      * Send logs to a Firehose Delivery Stream
+     *
+     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
      */
-    toFirehose(deliveryStream) {
+    toFirehose(deliveryStream, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_s3_mixins_CfnBucketS3ServerAccessLogsFirehoseProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toFirehose);
+            }
+            throw error;
+        }
         {
-            return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream));
+            return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
+                outputFormat: props?.outputFormat,
+                providedFields: props?.recordFields,
+                mandatoryFields: ["schema_version_id", "bucket_arn", "request_time", "bucket_owner_id", "remote_ip", "requester", "request_id", "operation", "key_name", "request_uri", "http_status", "error_code", "bytes_sent", "object_size", "total_duration", "turn_around_duration", "referer", "user_agent", "version_id", "host_id", "signature_version", "cipher_suite", "authentication_type", "host_header", "tls_version", "access_point_arn", "acl_required", "source_region"]
+            }));
         }
     }
     /**
@@ -59,10 +93,24 @@ class CfnBucketS3ServerAccessLogs {
      * Supported destinations are S3, CWL, FH
      * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
      * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
      */
-    toDestination(destination) {
+    toDestination(destination, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_s3_mixins_CfnBucketS3ServerAccessLogsDestProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toDestination);
+            }
+            throw error;
+        }
         {
-            return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.DestinationLogsDelivery(destination));
+            return new CfnBucketLogsMixin("S3_SERVER_ACCESS_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: props?.recordFields,
+                mandatoryFields: ["schema_version_id", "bucket_arn", "request_time", "bucket_owner_id", "remote_ip", "requester", "request_id", "operation", "key_name", "request_uri", "http_status", "error_code", "bytes_sent", "object_size", "total_duration", "turn_around_duration", "referer", "user_agent", "version_id", "host_id", "signature_version", "cipher_suite", "authentication_type", "host_header", "tls_version", "access_point_arn", "acl_required", "source_region"]
+            }));
         }
     }
 }
@@ -79,8 +127,8 @@ exports.CfnBucketS3ServerAccessLogs = CfnBucketS3ServerAccessLogs;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-bucket.html
  */
-class CfnBucketLogsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketLogsMixin", version: "2.240.0-alpha.0" };
+class CfnBucketLogsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketLogsMixin", version: "2.242.0-alpha.0" };
     static S3_SERVER_ACCESS_LOGS = new CfnBucketS3ServerAccessLogs();
     logType;
     logDelivery;
@@ -122,3 +170,57 @@ class CfnBucketLogsMixin extends core.Mixin {
     }
 }
 exports.CfnBucketLogsMixin = CfnBucketLogsMixin;
+/**
+ * Output Format options for each destination of CfnBucketS3ServerAccessLogs.
+ */
+class CfnBucketS3ServerAccessLogsOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketS3ServerAccessLogsOutputFormat", version: "2.242.0-alpha.0" };
+}
+exports.CfnBucketS3ServerAccessLogsOutputFormat = CfnBucketS3ServerAccessLogsOutputFormat;
+(function (CfnBucketS3ServerAccessLogsOutputFormat) {
+    let S3;
+    (function (S3) {
+        S3["JSON"] = "json";
+        S3["PARQUET"] = "parquet";
+    })(S3 = CfnBucketS3ServerAccessLogsOutputFormat.S3 || (CfnBucketS3ServerAccessLogsOutputFormat.S3 = {}));
+    let LogGroup;
+    (function (LogGroup) {
+        LogGroup["JSON"] = "json";
+    })(LogGroup = CfnBucketS3ServerAccessLogsOutputFormat.LogGroup || (CfnBucketS3ServerAccessLogsOutputFormat.LogGroup = {}));
+    let Firehose;
+    (function (Firehose) {
+        Firehose["JSON"] = "json";
+    })(Firehose = CfnBucketS3ServerAccessLogsOutputFormat.Firehose || (CfnBucketS3ServerAccessLogsOutputFormat.Firehose = {}));
+})(CfnBucketS3ServerAccessLogsOutputFormat || (exports.CfnBucketS3ServerAccessLogsOutputFormat = CfnBucketS3ServerAccessLogsOutputFormat = {}));
+var CfnBucketS3ServerAccessLogsRecordFields;
+(function (CfnBucketS3ServerAccessLogsRecordFields) {
+    CfnBucketS3ServerAccessLogsRecordFields["BUCKET_NAME"] = "bucket_name";
+    CfnBucketS3ServerAccessLogsRecordFields["SCHEMA_VERSION_ID"] = "schema_version_id";
+    CfnBucketS3ServerAccessLogsRecordFields["BUCKET_ARN"] = "bucket_arn";
+    CfnBucketS3ServerAccessLogsRecordFields["REQUEST_TIME"] = "request_time";
+    CfnBucketS3ServerAccessLogsRecordFields["BUCKET_OWNER_ID"] = "bucket_owner_id";
+    CfnBucketS3ServerAccessLogsRecordFields["REMOTE_IP"] = "remote_ip";
+    CfnBucketS3ServerAccessLogsRecordFields["REQUESTER"] = "requester";
+    CfnBucketS3ServerAccessLogsRecordFields["REQUEST_ID"] = "request_id";
+    CfnBucketS3ServerAccessLogsRecordFields["OPERATION"] = "operation";
+    CfnBucketS3ServerAccessLogsRecordFields["KEY_NAME"] = "key_name";
+    CfnBucketS3ServerAccessLogsRecordFields["REQUEST_URI"] = "request_uri";
+    CfnBucketS3ServerAccessLogsRecordFields["HTTP_STATUS"] = "http_status";
+    CfnBucketS3ServerAccessLogsRecordFields["ERROR_CODE"] = "error_code";
+    CfnBucketS3ServerAccessLogsRecordFields["BYTES_SENT"] = "bytes_sent";
+    CfnBucketS3ServerAccessLogsRecordFields["OBJECT_SIZE"] = "object_size";
+    CfnBucketS3ServerAccessLogsRecordFields["TOTAL_DURATION"] = "total_duration";
+    CfnBucketS3ServerAccessLogsRecordFields["TURN_AROUND_DURATION"] = "turn_around_duration";
+    CfnBucketS3ServerAccessLogsRecordFields["REFERER"] = "referer";
+    CfnBucketS3ServerAccessLogsRecordFields["USER_AGENT"] = "user_agent";
+    CfnBucketS3ServerAccessLogsRecordFields["VERSION_ID"] = "version_id";
+    CfnBucketS3ServerAccessLogsRecordFields["HOST_ID"] = "host_id";
+    CfnBucketS3ServerAccessLogsRecordFields["SIGNATURE_VERSION"] = "signature_version";
+    CfnBucketS3ServerAccessLogsRecordFields["CIPHER_SUITE"] = "cipher_suite";
+    CfnBucketS3ServerAccessLogsRecordFields["AUTHENTICATION_TYPE"] = "authentication_type";
+    CfnBucketS3ServerAccessLogsRecordFields["HOST_HEADER"] = "host_header";
+    CfnBucketS3ServerAccessLogsRecordFields["TLS_VERSION"] = "tls_version";
+    CfnBucketS3ServerAccessLogsRecordFields["ACCESS_POINT_ARN"] = "access_point_arn";
+    CfnBucketS3ServerAccessLogsRecordFields["ACL_REQUIRED"] = "acl_required";
+    CfnBucketS3ServerAccessLogsRecordFields["SOURCE_REGION"] = "source_region";
+})(CfnBucketS3ServerAccessLogsRecordFields || (exports.CfnBucketS3ServerAccessLogsRecordFields = CfnBucketS3ServerAccessLogsRecordFields = {}));

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

@@ -1,4 +1,2 @@
-export * from './bucket';
-export * from './bucket-policy';
 export * from './cfn-props-mixins.generated';
 export * from './logs-delivery-mixins.generated';

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

@@ -14,7 +14,5 @@ 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("./bucket"), exports);
-__exportStar(require("./bucket-policy"), exports);
 __exportStar(require("./cfn-props-mixins.generated"), exports);
 __exportStar(require("./logs-delivery-mixins.generated"), exports);

package/lib/services/aws-s3express/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.s3express"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3Express",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.S3Express"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3Express"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_s3express"

package/lib/services/aws-s3express/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.s3express.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3Express.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.S3Express.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3Express.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_s3express.mixins"

package/lib/services/aws-s3express/cfn-props-mixins.generated.d.ts

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-s3express";
+import { aws_kms as kmsRefs } from "aws-cdk-lib/interfaces";
 /**
  * Access points simplify managing data access at scale for shared datasets in Amazon S3 .
  *
@@ -13,10 +13,10 @@ import * as service from "aws-cdk-lib/aws-s3express";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-accesspoint.html
  */
-export declare class CfnAccessPointPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnAccessPointPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccessPointMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::S3Express::AccessPoint`.
      *
@@ -232,10 +232,10 @@ export interface CfnAccessPointMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-bucketpolicy.html
  */
-export declare class CfnBucketPolicyPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnBucketPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBucketPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::S3Express::BucketPolicy`.
      *
@@ -321,10 +321,10 @@ export interface CfnBucketPolicyMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-directorybucket.html
  */
-export declare class CfnDirectoryBucketPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnDirectoryBucketPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDirectoryBucketMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::S3Express::DirectoryBucket`.
      *
@@ -414,7 +414,7 @@ export declare namespace CfnDirectoryBucketPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionbydefault.html#cfn-s3express-directorybucket-serversideencryptionbydefault-kmsmasterkeyid
          */
-        readonly kmsMasterKeyId?: string;
+        readonly kmsMasterKeyId?: kmsRefs.IKeyRef | string;
         /**
          * Server-side encryption algorithm to use for the default encryption.
          *

package/lib/services/aws-s3express/cfn-props-mixins.generated.js

@@ -5,9 +5,7 @@ const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-s3express");
 /**
  * Access points simplify managing data access at scale for shared datasets in Amazon S3 .
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-s3express");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-accesspoint.html
  */
-class CfnAccessPointPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3express.mixins.CfnAccessPointPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAccessPointPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3express.mixins.CfnAccessPointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bucket", "bucketAccountId", "name", "policy", "publicAccessBlockConfiguration", "scope", "tags", "vpcConfiguration"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnAccessPointPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,12 +54,7 @@ class CfnAccessPointPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -109,8 +102,8 @@ exports.CfnAccessPointPropsMixin = CfnAccessPointPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-bucketpolicy.html
  */
-class CfnBucketPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3express.mixins.CfnBucketPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnBucketPolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3express.mixins.CfnBucketPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bucket", "policyDocument"];
     props;
     strategy;
@@ -133,7 +126,7 @@ class CfnBucketPolicyPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -146,12 +139,7 @@ class CfnBucketPolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBucketPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBucketPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBucketPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -202,8 +190,8 @@ exports.CfnBucketPolicyPropsMixin = CfnBucketPolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-directorybucket.html
  */
-class CfnDirectoryBucketPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3express.mixins.CfnDirectoryBucketPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDirectoryBucketPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3express.mixins.CfnDirectoryBucketPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bucketEncryption", "bucketName", "dataRedundancy", "lifecycleConfiguration", "locationName", "tags"];
     props;
     strategy;
@@ -225,8 +213,11 @@ class CfnDirectoryBucketPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDirectoryBucketMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -239,13 +230,41 @@ class CfnDirectoryBucketPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDirectoryBucketPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDirectoryBucketPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDirectoryBucketPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDirectoryBucketPropsMixin = CfnDirectoryBucketPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDirectoryBucketPropsMixinServerSideEncryptionByDefaultProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        kmsMasterKeyId: (!props.kmsMasterKeyId ? undefined : cdk.getRefProperty(props.kmsMasterKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsMasterKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsMasterKeyId, "kmsMasterKeyId", "kms.IKeyRef | string")),
+        sseAlgorithm: (!props.sseAlgorithm ? undefined : props.sseAlgorithm)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDirectoryBucketPropsMixinServerSideEncryptionRuleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketKeyEnabled: (!props.bucketKeyEnabled ? undefined : props.bucketKeyEnabled),
+        serverSideEncryptionByDefault: (!props.serverSideEncryptionByDefault ? undefined : (!props.serverSideEncryptionByDefault ? undefined : flattenCfnDirectoryBucketPropsMixinServerSideEncryptionByDefaultProperty(props.serverSideEncryptionByDefault)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDirectoryBucketPropsMixinBucketEncryptionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        serverSideEncryptionConfiguration: (!props.serverSideEncryptionConfiguration ? undefined : (cdk.isResolvableObject(props.serverSideEncryptionConfiguration) ? props.serverSideEncryptionConfiguration : cdk.mapArrayInPlace(props.serverSideEncryptionConfiguration, (item) => flattenCfnDirectoryBucketPropsMixinServerSideEncryptionRuleProperty(item))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDirectoryBucketMixinProps(props) {
+    const ret = {};
+    if ((props.bucketEncryption !== undefined))
+        ret.bucketEncryption = flattenCfnDirectoryBucketPropsMixinBucketEncryptionProperty(props.bucketEncryption);
+    return ret;
+}

package/lib/services/aws-s3objectlambda/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.s3objectlambda"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3ObjectLambda",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.S3ObjectLambda"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3ObjectLambda"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_s3objectlambda"

package/lib/services/aws-s3objectlambda/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.s3objectlambda.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3ObjectLambda.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.S3ObjectLambda.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.S3ObjectLambda.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_s3objectlambda.mixins"

package/lib/services/aws-s3objectlambda/cfn-props-mixins.generated.d.ts

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-s3objectlambda";
+import { aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::S3ObjectLambda::AccessPoint` resource specifies an Object Lambda Access Point used to access a bucket.
  *
@@ -11,10 +11,10 @@ import * as service from "aws-cdk-lib/aws-s3objectlambda";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspoint.html
  */
-export declare class CfnAccessPointPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnAccessPointPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccessPointMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::S3ObjectLambda::AccessPoint`.
      *
@@ -59,7 +59,7 @@ export declare namespace CfnAccessPointPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-objectlambdaconfiguration.html#cfn-s3objectlambda-accesspoint-objectlambdaconfiguration-supportingaccesspoint
          */
-        readonly supportingAccessPoint?: string;
+        readonly supportingAccessPoint?: s3Refs.IAccessPointRef | string;
         /**
          * A container for transformation configurations for an Object Lambda Access Point.
          *
@@ -227,10 +227,10 @@ export interface CfnAccessPointMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspointpolicy.html
  */
-export declare class CfnAccessPointPolicyPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnAccessPointPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccessPointPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::S3ObjectLambda::AccessPointPolicy`.
      *