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

package/lib/services/aws-deadline/events.generated.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FleetSizeRecommendationChange = void 0;
+const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
+const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
+/**
+ * EventBridge event pattern for aws.deadline@FleetSizeRecommendationChange
+ */
+class FleetSizeRecommendationChange {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_deadline.events.FleetSizeRecommendationChange", version: "2.242.0-alpha.0" };
+    /**
+     * EventBridge event pattern for Fleet Size Recommendation Change
+     */
+    static fleetSizeRecommendationChangePattern(options) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_deadline_events_FleetSizeRecommendationChange_FleetSizeRecommendationChangeProps(options);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.fleetSizeRecommendationChangePattern);
+            }
+            throw error;
+        }
+        return {
+            source: ["aws.deadline"],
+            detailType: ["Fleet Size Recommendation Change"],
+            detail: convertFleetSizeRecommendationChangeDetailToEventPattern(options),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+}
+exports.FleetSizeRecommendationChange = FleetSizeRecommendationChange;
+// @ts-ignore TS6133
+function convertFleetSizeRecommendationChangeDetailToEventPattern(obj) {
+    const ret = {
+        farmId: obj?.farmId,
+        fleetId: obj?.fleetId,
+        newFleetSize: obj?.newFleetSize,
+        oldFleetSize: obj?.oldFleetSize
+    };
+    for (const [key, value] of Object.entries(ret)) {
+        if ((value === undefined))
+            delete ret[key];
+    }
+    if (Object.keys(ret).length === 0)
+        return undefined;
+    ;
+    return ret;
+}

package/lib/services/aws-deadline/events.js

@@ -0,0 +1,17 @@
+"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("./events.generated"), exports);

package/lib/services/aws-deadline/index.d.ts

@@ -1 +1,2 @@
+export * as events from './events';
 export * as mixins from './mixins';

package/lib/services/aws-deadline/index.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixins = void 0;
+exports.mixins = exports.events = void 0;
+exports.events = require("./events");
 exports.mixins = require("./mixins");

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

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

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

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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-detective";
 export declare class CfnGraphPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGraphMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Detective::Graph`.
      *
@@ -69,7 +69,7 @@ export interface CfnGraphMixinProps {
 export declare class CfnMemberInvitationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMemberInvitationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Detective::MemberInvitation`.
      *
@@ -143,7 +143,7 @@ export interface CfnMemberInvitationMixinProps {
 export declare class CfnOrganizationAdminPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnOrganizationAdminMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Detective::OrganizationAdmin`.
      *

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-detective");
 /**
  * The `AWS::Detective::Graph` resource is an Amazon Detective resource type that creates a Detective behavior graph.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-detective");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-graph.html
  */
 class CfnGraphPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_detective.mixins.CfnGraphPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_detective.mixins.CfnGraphPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoEnableMembers", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnGraphPropsMixin extends cdk.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
@@ -55,12 +54,7 @@ class CfnGraphPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGraphPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGraphPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGraphPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnGraphPropsMixin = CfnGraphPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html
  */
 class CfnMemberInvitationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_detective.mixins.CfnMemberInvitationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_detective.mixins.CfnMemberInvitationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["disableEmailNotification", "graphArn", "memberEmailAddress", "memberId", "message"];
     props;
     strategy;
@@ -99,7 +93,7 @@ class CfnMemberInvitationPropsMixin extends cdk.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
@@ -112,12 +106,7 @@ class CfnMemberInvitationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMemberInvitationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMemberInvitationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMemberInvitationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,7 +122,7 @@ exports.CfnMemberInvitationPropsMixin = CfnMemberInvitationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-organizationadmin.html
  */
 class CfnOrganizationAdminPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_detective.mixins.CfnOrganizationAdminPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_detective.mixins.CfnOrganizationAdminPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountId"];
     props;
     strategy;
@@ -156,7 +145,7 @@ class CfnOrganizationAdminPropsMixin extends cdk.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
@@ -169,12 +158,7 @@ class CfnOrganizationAdminPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOrganizationAdminPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOrganizationAdminPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOrganizationAdminPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-devicefarm";
 export declare class CfnDevicePoolPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDevicePoolMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DeviceFarm::DevicePool`.
      *
@@ -167,7 +167,7 @@ export interface CfnDevicePoolMixinProps {
 export declare class CfnInstanceProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInstanceProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DeviceFarm::InstanceProfile`.
      *
@@ -248,7 +248,7 @@ export interface CfnInstanceProfileMixinProps {
 export declare class CfnNetworkProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnNetworkProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DeviceFarm::NetworkProfile`.
      *
@@ -359,7 +359,7 @@ export interface CfnNetworkProfileMixinProps {
 export declare class CfnProjectPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProjectMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DeviceFarm::Project`.
      *
@@ -484,7 +484,7 @@ export interface CfnProjectMixinProps {
 export declare class CfnTestGridProjectPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTestGridProjectMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DeviceFarm::TestGridProject`.
      *
@@ -582,7 +582,7 @@ export interface CfnTestGridProjectMixinProps {
 export declare class CfnVPCEConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnVPCEConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DeviceFarm::VPCEConfiguration`.
      *

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-devicefarm");
 /**
  * Represents a request to the create device pool operation.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-devicefarm");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devicefarm-devicepool.html
  */
 class CfnDevicePoolPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnDevicePoolPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnDevicePoolPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "maxDevices", "name", "projectArn", "rules", "tags"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnDevicePoolPropsMixin extends cdk.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
@@ -53,12 +52,7 @@ class CfnDevicePoolPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDevicePoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDevicePoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDevicePoolPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,7 +66,7 @@ exports.CfnDevicePoolPropsMixin = CfnDevicePoolPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devicefarm-instanceprofile.html
  */
 class CfnInstanceProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnInstanceProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnInstanceProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "excludeAppPackagesFromCleanup", "name", "packageCleanup", "rebootAfterUse", "tags"];
     props;
     strategy;
@@ -95,7 +89,7 @@ class CfnInstanceProfilePropsMixin extends cdk.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
@@ -108,12 +102,7 @@ class CfnInstanceProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -127,7 +116,7 @@ exports.CfnInstanceProfilePropsMixin = CfnInstanceProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devicefarm-networkprofile.html
  */
 class CfnNetworkProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnNetworkProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnNetworkProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "downlinkBandwidthBits", "downlinkDelayMs", "downlinkJitterMs", "downlinkLossPercent", "name", "projectArn", "tags", "uplinkBandwidthBits", "uplinkDelayMs", "uplinkJitterMs", "uplinkLossPercent"];
     props;
     strategy;
@@ -150,7 +139,7 @@ class CfnNetworkProfilePropsMixin extends cdk.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
@@ -163,12 +152,7 @@ class CfnNetworkProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -182,7 +166,7 @@ exports.CfnNetworkProfilePropsMixin = CfnNetworkProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devicefarm-project.html
  */
 class CfnProjectPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnProjectPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnProjectPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["defaultJobTimeoutMinutes", "environmentVariables", "executionRoleArn", "name", "tags", "vpcConfig"];
     props;
     strategy;
@@ -205,7 +189,7 @@ class CfnProjectPropsMixin extends cdk.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
@@ -218,12 +202,7 @@ class CfnProjectPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -239,7 +218,7 @@ exports.CfnProjectPropsMixin = CfnProjectPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devicefarm-testgridproject.html
  */
 class CfnTestGridProjectPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnTestGridProjectPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnTestGridProjectPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "name", "tags", "vpcConfig"];
     props;
     strategy;
@@ -262,7 +241,7 @@ class CfnTestGridProjectPropsMixin extends cdk.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
@@ -275,12 +254,7 @@ class CfnTestGridProjectPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTestGridProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTestGridProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTestGridProjectPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -294,7 +268,7 @@ exports.CfnTestGridProjectPropsMixin = CfnTestGridProjectPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devicefarm-vpceconfiguration.html
  */
 class CfnVPCEConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnVPCEConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_devicefarm.mixins.CfnVPCEConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["serviceDnsName", "tags", "vpceConfigurationDescription", "vpceConfigurationName", "vpceServiceName"];
     props;
     strategy;
@@ -317,7 +291,7 @@ class CfnVPCEConfigurationPropsMixin extends cdk.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
@@ -330,12 +304,7 @@ class CfnVPCEConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCEConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCEConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCEConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-devopsagent";
 export declare class CfnAgentSpacePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAgentSpaceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DevOpsAgent::AgentSpace`.
      *
@@ -129,7 +129,7 @@ export interface CfnAgentSpaceMixinProps {
 export declare class CfnAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DevOpsAgent::Association`.
      *
@@ -775,7 +775,7 @@ export interface CfnAssociationMixinProps {
 export declare class CfnServicePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DevOpsAgent::Service`.
      *