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

package/lib/services/aws-sagemaker/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-sagemaker";
 /**
@@ -13,12 +13,16 @@ import * as service from "aws-cdk-lib/aws-sagemaker";
 export declare class CfnWorkteamActivityLogs {
     /**
      * 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): CfnWorkteamLogsMixin;
+    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: CfnWorkteamActivityLogsS3Props): CfnWorkteamLogsMixin;
     /**
      * 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): CfnWorkteamLogsMixin;
+    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef, props?: CfnWorkteamActivityLogsLogGroupProps): CfnWorkteamLogsMixin;
     /**
      * Delivers logs to a pre-created delivery destination
      *
@@ -40,7 +44,7 @@ export declare class CfnWorkteamActivityLogs {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html
  */
-export declare class CfnWorkteamLogsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnWorkteamLogsMixin extends cdk.Mixin implements constructs.IMixin {
     static readonly ACTIVITY_LOGS: CfnWorkteamActivityLogs;
     protected readonly logType: string;
     protected readonly logDelivery: logsDelivery.ILogsDelivery;
@@ -60,3 +64,36 @@ export declare class CfnWorkteamLogsMixin extends core.Mixin implements core.IMi
      */
     applyTo(resource: constructs.IConstruct): void;
 }
+/**
+ * Output Format options for each destination of CfnWorkteamActivityLogs.
+ */
+export declare class CfnWorkteamActivityLogsOutputFormat {
+}
+export declare namespace CfnWorkteamActivityLogsOutputFormat {
+    enum S3 {
+        JSON = "json",
+        PLAIN = "plain",
+        W3C = "w3c",
+        PARQUET = "parquet"
+    }
+    enum LogGroup {
+        PLAIN = "plain",
+        JSON = "json"
+    }
+}
+export interface CfnWorkteamActivityLogsS3Props {
+    /**
+     * Encrpytion key for your delivery bucket
+     */
+    readonly encryptionKey?: interfaces.aws_kms.IKeyRef;
+    /**
+     * Format for log output, options are json,plain,w3c,parquet
+     */
+    readonly outputFormat?: CfnWorkteamActivityLogsOutputFormat.S3;
+}
+export interface CfnWorkteamActivityLogsLogGroupProps {
+    /**
+     * Format for log output, options are plain,json
+     */
+    readonly outputFormat?: CfnWorkteamActivityLogsOutputFormat.LogGroup;
+}

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

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CfnWorkteamLogsMixin = exports.CfnWorkteamActivityLogs = void 0;
+exports.CfnWorkteamActivityLogsOutputFormat = exports.CfnWorkteamLogsMixin = exports.CfnWorkteamActivityLogs = 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-sagemaker");
 /**
@@ -16,13 +15,15 @@ const service = require("aws-cdk-lib/aws-sagemaker");
  * @stability external
  */
 class CfnWorkteamActivityLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamActivityLogs", version: "2.240.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamActivityLogs", 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_sagemaker_mixins_CfnWorkteamActivityLogsS3Props(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -33,16 +34,34 @@ class CfnWorkteamActivityLogs {
         {
             return new CfnWorkteamLogsMixin("ACTIVITY_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
                 permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V1,
-                kmsKey: (props && props.encryptionKey) ? props.encryptionKey : undefined
+                kmsKey: props?.encryptionKey,
+                outputFormat: props?.outputFormat,
+                providedFields: undefined,
+                mandatoryFields: undefined
             }));
         }
     }
     /**
      * 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_sagemaker_mixins_CfnWorkteamActivityLogsLogGroupProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toLogGroup);
+            }
+            throw error;
+        }
         {
-            return new CfnWorkteamLogsMixin("ACTIVITY_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup));
+            return new CfnWorkteamLogsMixin("ACTIVITY_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
+                outputFormat: props?.outputFormat,
+                providedFields: undefined,
+                mandatoryFields: undefined
+            }));
         }
     }
     /**
@@ -54,7 +73,10 @@ class CfnWorkteamActivityLogs {
      */
     toDestination(destination) {
         {
-            return new CfnWorkteamLogsMixin("ACTIVITY_LOGS", new logsDelivery.DestinationLogsDelivery(destination));
+            return new CfnWorkteamLogsMixin("ACTIVITY_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: undefined,
+                mandatoryFields: undefined
+            }));
         }
     }
 }
@@ -71,8 +93,8 @@ exports.CfnWorkteamActivityLogs = CfnWorkteamActivityLogs;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html
  */
-class CfnWorkteamLogsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamLogsMixin", version: "2.240.0-alpha.0" };
+class CfnWorkteamLogsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamLogsMixin", version: "2.242.0-alpha.0" };
     static ACTIVITY_LOGS = new CfnWorkteamActivityLogs();
     logType;
     logDelivery;
@@ -114,3 +136,24 @@ class CfnWorkteamLogsMixin extends core.Mixin {
     }
 }
 exports.CfnWorkteamLogsMixin = CfnWorkteamLogsMixin;
+/**
+ * Output Format options for each destination of CfnWorkteamActivityLogs.
+ */
+class CfnWorkteamActivityLogsOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamActivityLogsOutputFormat", version: "2.242.0-alpha.0" };
+}
+exports.CfnWorkteamActivityLogsOutputFormat = CfnWorkteamActivityLogsOutputFormat;
+(function (CfnWorkteamActivityLogsOutputFormat) {
+    let S3;
+    (function (S3) {
+        S3["JSON"] = "json";
+        S3["PLAIN"] = "plain";
+        S3["W3C"] = "w3c";
+        S3["PARQUET"] = "parquet";
+    })(S3 = CfnWorkteamActivityLogsOutputFormat.S3 || (CfnWorkteamActivityLogsOutputFormat.S3 = {}));
+    let LogGroup;
+    (function (LogGroup) {
+        LogGroup["PLAIN"] = "plain";
+        LogGroup["JSON"] = "json";
+    })(LogGroup = CfnWorkteamActivityLogsOutputFormat.LogGroup || (CfnWorkteamActivityLogsOutputFormat.LogGroup = {}));
+})(CfnWorkteamActivityLogsOutputFormat || (exports.CfnWorkteamActivityLogsOutputFormat = CfnWorkteamActivityLogsOutputFormat = {}));

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

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

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

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

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

@@ -1,6 +1,5 @@
 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-sam";
 /**
@@ -11,10 +10,10 @@ import * as service from "aws-cdk-lib/aws-sam";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-function.html
  */
-export declare class CfnFunctionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnFunctionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFunctionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::Function`.
      *
@@ -1308,10 +1307,10 @@ export interface CfnFunctionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-api.html
  */
-export declare class CfnApiPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnApiPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnApiMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::Api`.
      *
@@ -1642,10 +1641,10 @@ export interface CfnApiMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-httpapi.html
  */
-export declare class CfnHttpApiPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnHttpApiPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHttpApiMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::HttpApi`.
      *
@@ -1921,10 +1920,10 @@ export interface CfnHttpApiMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-application.html
  */
-export declare class CfnApplicationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnApplicationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnApplicationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::Application`.
      *
@@ -1995,10 +1994,10 @@ export interface CfnApplicationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-simpletable.html
  */
-export declare class CfnSimpleTablePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnSimpleTablePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSimpleTableMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::SimpleTable`.
      *
@@ -2095,10 +2094,10 @@ export interface CfnSimpleTableMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-layerversion.html
  */
-export declare class CfnLayerVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLayerVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLayerVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::LayerVersion`.
      *
@@ -2177,10 +2176,10 @@ export interface CfnLayerVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-statemachine.html
  */
-export declare class CfnStateMachinePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnStateMachinePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStateMachineMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Serverless::StateMachine`.
      *

package/lib/services/aws-sam/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-sam");
 /**
  * https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction.
@@ -17,8 +15,8 @@ const service = require("aws-cdk-lib/aws-sam");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-function.html
  */
-class CfnFunctionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnFunctionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnFunctionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnFunctionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["architectures", "assumeRolePolicyDocument", "autoPublishAlias", "autoPublishCodeSha256", "codeSigningConfigArn", "codeUri", "deadLetterQueue", "deploymentPreference", "description", "environment", "ephemeralStorage", "eventInvokeConfig", "events", "fileSystemConfigs", "functionName", "functionUrlConfig", "handler", "imageConfig", "imageUri", "inlineCode", "kmsKeyArn", "layers", "memorySize", "packageType", "permissionsBoundary", "policies", "provisionedConcurrencyConfig", "reservedConcurrentExecutions", "role", "runtime", "tags", "timeout", "tracing", "versionDescription", "vpcConfig"];
     props;
     strategy;
@@ -41,7 +39,7 @@ class CfnFunctionPropsMixin 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
@@ -54,12 +52,7 @@ class CfnFunctionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFunctionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFunctionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFunctionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,8 +65,8 @@ exports.CfnFunctionPropsMixin = CfnFunctionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-api.html
  */
-class CfnApiPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnApiPropsMixin", version: "2.240.0-alpha.0" };
+class CfnApiPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnApiPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessLogSetting", "alwaysDeploy", "auth", "binaryMediaTypes", "cacheClusterEnabled", "cacheClusterSize", "canarySetting", "cors", "definitionBody", "definitionUri", "description", "disableExecuteApiEndpoint", "domain", "endpointConfiguration", "gatewayResponses", "methodSettings", "minimumCompressionSize", "models", "name", "openApiVersion", "stageName", "tags", "tracingEnabled", "variables"];
     props;
     strategy;
@@ -96,7 +89,7 @@ class CfnApiPropsMixin 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
@@ -109,12 +102,7 @@ class CfnApiPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApiPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -127,8 +115,8 @@ exports.CfnApiPropsMixin = CfnApiPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-httpapi.html
  */
-class CfnHttpApiPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnHttpApiPropsMixin", version: "2.240.0-alpha.0" };
+class CfnHttpApiPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnHttpApiPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessLogSetting", "auth", "corsConfiguration", "defaultRouteSettings", "definitionBody", "definitionUri", "description", "disableExecuteApiEndpoint", "domain", "failOnWarnings", "routeSettings", "stageName", "stageVariables", "tags"];
     props;
     strategy;
@@ -151,7 +139,7 @@ class CfnHttpApiPropsMixin 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
@@ -164,12 +152,7 @@ class CfnHttpApiPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHttpApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHttpApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHttpApiPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -182,8 +165,8 @@ exports.CfnHttpApiPropsMixin = CfnHttpApiPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-application.html
  */
-class CfnApplicationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnApplicationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnApplicationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnApplicationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["location", "notificationArns", "parameters", "tags", "timeoutInMinutes"];
     props;
     strategy;
@@ -206,7 +189,7 @@ class CfnApplicationPropsMixin 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
@@ -219,12 +202,7 @@ class CfnApplicationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApplicationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApplicationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApplicationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -237,8 +215,8 @@ exports.CfnApplicationPropsMixin = CfnApplicationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-simpletable.html
  */
-class CfnSimpleTablePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnSimpleTablePropsMixin", version: "2.240.0-alpha.0" };
+class CfnSimpleTablePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnSimpleTablePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["primaryKey", "provisionedThroughput", "sseSpecification", "tableName", "tags"];
     props;
     strategy;
@@ -261,7 +239,7 @@ class CfnSimpleTablePropsMixin 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
@@ -274,12 +252,7 @@ class CfnSimpleTablePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSimpleTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSimpleTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSimpleTablePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -292,8 +265,8 @@ exports.CfnSimpleTablePropsMixin = CfnSimpleTablePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-layerversion.html
  */
-class CfnLayerVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnLayerVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLayerVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnLayerVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["compatibleRuntimes", "contentUri", "description", "layerName", "licenseInfo", "retentionPolicy"];
     props;
     strategy;
@@ -316,7 +289,7 @@ class CfnLayerVersionPropsMixin 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
@@ -329,12 +302,7 @@ class CfnLayerVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLayerVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLayerVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLayerVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -347,8 +315,8 @@ exports.CfnLayerVersionPropsMixin = CfnLayerVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-serverless-statemachine.html
  */
-class CfnStateMachinePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnStateMachinePropsMixin", version: "2.240.0-alpha.0" };
+class CfnStateMachinePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sam.mixins.CfnStateMachinePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["definition", "definitionSubstitutions", "definitionUri", "events", "logging", "name", "permissionsBoundaries", "policies", "role", "tags", "tracing", "type"];
     props;
     strategy;
@@ -371,7 +339,7 @@ class CfnStateMachinePropsMixin 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
@@ -384,12 +352,7 @@ class CfnStateMachinePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStateMachinePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStateMachinePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStateMachinePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

package/lib/services/aws-scheduler/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-scheduler";
+import { aws_iam as iamRefs, aws_kms as kmsRefs, aws_lambda as lambdaRefs, aws_sqs as sqsRefs, aws_stepfunctions as stepFunctionsRefs } from "aws-cdk-lib/interfaces";
 /**
  * A *schedule* is the main resource you create, configure, and manage using Amazon EventBridge Scheduler.
  *
@@ -17,10 +17,10 @@ import * as service from "aws-cdk-lib/aws-scheduler";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-scheduler-schedule.html
  */
-export declare class CfnSchedulePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnSchedulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScheduleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Scheduler::Schedule`.
      *
@@ -53,7 +53,7 @@ export declare namespace CfnSchedulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-scheduler-schedule-target.html#cfn-scheduler-schedule-target-arn
          */
-        readonly arn?: string;
+        readonly arn?: lambdaRefs.IFunctionRef | sqsRefs.IQueueRef | stepFunctionsRefs.IStateMachineRef | string;
         /**
          * An object that contains information about an Amazon SQS queue that EventBridge Scheduler uses as a dead-letter queue for your schedule.
          *
@@ -99,7 +99,7 @@ export declare namespace CfnSchedulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-scheduler-schedule-target.html#cfn-scheduler-schedule-target-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
         /**
          * The templated target type for the Amazon SageMaker [`StartPipelineExecution`](https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_StartPipelineExecution.html) API operation.
          *
@@ -143,7 +143,7 @@ export declare namespace CfnSchedulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-scheduler-schedule-deadletterconfig.html#cfn-scheduler-schedule-deadletterconfig-arn
          */
-        readonly arn?: string;
+        readonly arn?: sqsRefs.IQueueRef | string;
     }
     /**
      * The templated target type for the Amazon ECS [`RunTask`](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_RunTask.html) API operation.
@@ -558,7 +558,7 @@ export interface CfnScheduleMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-scheduler-schedule.html#cfn-scheduler-schedule-kmskeyarn
      */
-    readonly kmsKeyArn?: string;
+    readonly kmsKeyArn?: kmsRefs.IKeyRef | string;
     /**
      * The name of the schedule.
      *
@@ -625,10 +625,10 @@ export interface CfnScheduleMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-scheduler-schedulegroup.html
  */
-export declare class CfnScheduleGroupPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnScheduleGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScheduleGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Scheduler::ScheduleGroup`.
      *