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

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

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

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

@@ -30,7 +30,7 @@ import * as service from "aws-cdk-lib/aws-greengrassv2";
 export declare class CfnComponentVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnComponentVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GreengrassV2::ComponentVersion`.
      *
@@ -464,7 +464,7 @@ export interface CfnComponentVersionMixinProps {
 export declare class CfnDeploymentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDeploymentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GreengrassV2::Deployment`.
      *

package/lib/services/aws-greengrassv2/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-greengrassv2");
 /**
  * Creates a component.
@@ -34,7 +33,7 @@ const service = require("aws-cdk-lib/aws-greengrassv2");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-componentversion.html
  */
 class CfnComponentVersionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_greengrassv2.mixins.CfnComponentVersionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_greengrassv2.mixins.CfnComponentVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["inlineRecipe", "lambdaFunction", "tags"];
     props;
     strategy;
@@ -57,7 +56,7 @@ class CfnComponentVersionPropsMixin 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
@@ -70,12 +69,7 @@ class CfnComponentVersionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnComponentVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnComponentVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnComponentVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -103,7 +97,7 @@ exports.CfnComponentVersionPropsMixin = CfnComponentVersionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-deployment.html
  */
 class CfnDeploymentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_greengrassv2.mixins.CfnDeploymentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_greengrassv2.mixins.CfnDeploymentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["components", "deploymentName", "deploymentPolicies", "iotJobConfiguration", "parentTargetArn", "tags", "targetArn"];
     props;
     strategy;
@@ -126,7 +120,7 @@ class CfnDeploymentPropsMixin 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
@@ -139,12 +133,7 @@ class CfnDeploymentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-groundstation";
+import { aws_groundstation as groundStationRefs, aws_iam as iamRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * Creates a `Config` with the specified parameters.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-groundstation";
 export declare class CfnConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GroundStation::Config`.
      *
@@ -414,7 +415,7 @@ export declare namespace CfnConfigPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-s3recordingconfig.html#cfn-groundstation-config-s3recordingconfig-bucketarn
          */
-        readonly bucketArn?: string;
+        readonly bucketArn?: s3Refs.IBucketRef | string;
         /**
          * The prefix of the S3 data object.
          *
@@ -430,7 +431,7 @@ export declare namespace CfnConfigPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-s3recordingconfig.html#cfn-groundstation-config-s3recordingconfig-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
     }
     /**
      * @struct
@@ -518,7 +519,7 @@ export interface CfnConfigMixinProps {
 export declare class CfnDataflowEndpointGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDataflowEndpointGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GroundStation::DataflowEndpointGroup`.
      *
@@ -820,7 +821,7 @@ export interface CfnDataflowEndpointGroupMixinProps {
 export declare class CfnMissionProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMissionProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GroundStation::MissionProfile`.
      *
@@ -880,7 +881,7 @@ export declare namespace CfnMissionProfilePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-missionprofile-dataflowedge.html#cfn-groundstation-missionprofile-dataflowedge-destination
          */
-        readonly destination?: string;
+        readonly destination?: groundStationRefs.IConfigRef | string;
         /**
          * The ARN of the source for this dataflow edge.
          *
@@ -888,7 +889,7 @@ export declare namespace CfnMissionProfilePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-missionprofile-dataflowedge.html#cfn-groundstation-missionprofile-dataflowedge-source
          */
-        readonly source?: string;
+        readonly source?: groundStationRefs.IConfigRef | string;
     }
 }
 /**
@@ -962,7 +963,7 @@ export interface CfnMissionProfileMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-trackingconfigarn
      */
-    readonly trackingConfigArn?: string;
+    readonly trackingConfigArn?: groundStationRefs.IConfigRef | string;
 }
 /**
  * Creates a `DataflowEndpoint` group containing the specified list of Ground Station Agent based endpoints.
@@ -979,7 +980,7 @@ export interface CfnMissionProfileMixinProps {
 export declare class CfnDataflowEndpointGroupV2PropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDataflowEndpointGroupV2MixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GroundStation::DataflowEndpointGroupV2`.
      *

package/lib/services/aws-groundstation/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-groundstation");
 /**
  * Creates a `Config` with the specified parameters.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-groundstation");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-config.html
  */
 class CfnConfigPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnConfigPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["configData", "name", "tags"];
     props;
     strategy;
@@ -41,8 +40,11 @@ class CfnConfigPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnConfigMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,16 +57,43 @@ class CfnConfigPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnConfigPropsMixin = CfnConfigPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnConfigPropsMixinS3RecordingConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketArn: (!props.bucketArn ? undefined : cdk.getRefProperty(props.bucketArn?.bucketRef, 'bucketArn') ?? cdk.ensureStringOrUndefined(props.bucketArn, "bucketArn", "s3.IBucketRef | string")),
+        prefix: (!props.prefix ? undefined : props.prefix),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnConfigPropsMixinConfigDataProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        antennaDownlinkConfig: (!props.antennaDownlinkConfig ? undefined : props.antennaDownlinkConfig),
+        antennaDownlinkDemodDecodeConfig: (!props.antennaDownlinkDemodDecodeConfig ? undefined : props.antennaDownlinkDemodDecodeConfig),
+        antennaUplinkConfig: (!props.antennaUplinkConfig ? undefined : props.antennaUplinkConfig),
+        dataflowEndpointConfig: (!props.dataflowEndpointConfig ? undefined : props.dataflowEndpointConfig),
+        s3RecordingConfig: (!props.s3RecordingConfig ? undefined : (!props.s3RecordingConfig ? undefined : flattenCfnConfigPropsMixinS3RecordingConfigProperty(props.s3RecordingConfig))),
+        telemetrySinkConfig: (!props.telemetrySinkConfig ? undefined : props.telemetrySinkConfig),
+        trackingConfig: (!props.trackingConfig ? undefined : props.trackingConfig),
+        uplinkEchoConfig: (!props.uplinkEchoConfig ? undefined : props.uplinkEchoConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnConfigMixinProps(props) {
+    const ret = {};
+    if ((props.configData !== undefined))
+        ret.configData = flattenCfnConfigPropsMixinConfigDataProperty(props.configData);
+    return ret;
+}
 /**
  * Creates a Dataflow Endpoint Group request.
  *
@@ -78,7 +107,7 @@ exports.CfnConfigPropsMixin = CfnConfigPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-dataflowendpointgroup.html
  */
 class CfnDataflowEndpointGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnDataflowEndpointGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnDataflowEndpointGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["contactPostPassDurationSeconds", "contactPrePassDurationSeconds", "endpointDetails", "tags"];
     props;
     strategy;
@@ -101,7 +130,7 @@ class CfnDataflowEndpointGroupPropsMixin 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
@@ -114,12 +143,7 @@ class CfnDataflowEndpointGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataflowEndpointGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataflowEndpointGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataflowEndpointGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,7 +157,7 @@ exports.CfnDataflowEndpointGroupPropsMixin = CfnDataflowEndpointGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html
  */
 class CfnMissionProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnMissionProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnMissionProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["contactPostPassDurationSeconds", "contactPrePassDurationSeconds", "dataflowEdges", "minimumViableContactDurationSeconds", "name", "streamsKmsKey", "streamsKmsRole", "tags", "telemetrySinkConfigArn", "trackingConfigArn"];
     props;
     strategy;
@@ -155,8 +179,11 @@ class CfnMissionProfilePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnMissionProfileMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -169,16 +196,29 @@ class CfnMissionProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMissionProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMissionProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMissionProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnMissionProfilePropsMixin = CfnMissionProfilePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnMissionProfilePropsMixinDataflowEdgeProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        destination: (!props.destination ? undefined : cdk.getRefProperty(props.destination?.configRef, 'configArn') ?? cdk.ensureStringOrUndefined(props.destination, "destination", "groundstation.IConfigRef | string")),
+        source: (!props.source ? undefined : cdk.getRefProperty(props.source?.configRef, 'configArn') ?? cdk.ensureStringOrUndefined(props.source, "source", "groundstation.IConfigRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnMissionProfileMixinProps(props) {
+    const ret = {};
+    if ((props.dataflowEdges !== undefined))
+        ret.dataflowEdges = (cdk.isResolvableObject(props.dataflowEdges) ? props.dataflowEdges : cdk.mapArrayInPlace(props.dataflowEdges, (item) => flattenCfnMissionProfilePropsMixinDataflowEdgeProperty(item)));
+    if ((props.trackingConfigArn !== undefined))
+        ret.trackingConfigArn = cdk.getRefProperty(props.trackingConfigArn?.configRef, 'configArn') ?? cdk.ensureStringOrUndefined(props.trackingConfigArn, "trackingConfigArn", "groundstation.IConfigRef | string");
+    return ret;
+}
 /**
  * Creates a `DataflowEndpoint` group containing the specified list of Ground Station Agent based endpoints.
  *
@@ -192,7 +232,7 @@ exports.CfnMissionProfilePropsMixin = CfnMissionProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-dataflowendpointgroupv2.html
  */
 class CfnDataflowEndpointGroupV2PropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnDataflowEndpointGroupV2PropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_groundstation.mixins.CfnDataflowEndpointGroupV2PropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["contactPostPassDurationSeconds", "contactPrePassDurationSeconds", "endpoints", "tags"];
     props;
     strategy;
@@ -215,7 +255,7 @@ class CfnDataflowEndpointGroupV2PropsMixin 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
@@ -228,12 +268,7 @@ class CfnDataflowEndpointGroupV2PropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataflowEndpointGroupV2PropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataflowEndpointGroupV2PropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataflowEndpointGroupV2PropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-guardduty/.events.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.guardduty.events"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.GuardDuty.Events",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.GuardDuty.Events"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.GuardDuty.Events"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_guardduty.events"

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

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

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

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

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

@@ -17,7 +17,7 @@ import * as service from "aws-cdk-lib/aws-guardduty";
 export declare class CfnDetectorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDetectorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::Detector`.
      *
@@ -265,7 +265,7 @@ export interface CfnDetectorMixinProps {
 export declare class CfnFilterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFilterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::Filter`.
      *
@@ -574,7 +574,7 @@ export interface CfnFilterMixinProps {
 export declare class CfnIPSetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIPSetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::IPSet`.
      *
@@ -670,7 +670,7 @@ export interface CfnIPSetMixinProps {
 export declare class CfnMasterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMasterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::Master`.
      *
@@ -732,7 +732,7 @@ export interface CfnMasterMixinProps {
 export declare class CfnMemberPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMemberMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::Member`.
      *
@@ -811,7 +811,7 @@ export interface CfnMemberMixinProps {
 export declare class CfnThreatIntelSetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnThreatIntelSetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::ThreatIntelSet`.
      *
@@ -907,7 +907,7 @@ export interface CfnThreatIntelSetMixinProps {
 export declare class CfnMalwareProtectionPlanPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMalwareProtectionPlanMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::MalwareProtectionPlan`.
      *
@@ -1098,7 +1098,7 @@ export interface CfnMalwareProtectionPlanMixinProps {
 export declare class CfnPublishingDestinationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPublishingDestinationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::PublishingDestination`.
      *
@@ -1209,7 +1209,7 @@ export interface CfnPublishingDestinationMixinProps {
 export declare class CfnThreatEntitySetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnThreatEntitySetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::ThreatEntitySet`.
      *
@@ -1333,7 +1333,7 @@ export interface CfnThreatEntitySetMixinProps {
 export declare class CfnTrustedEntitySetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTrustedEntitySetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GuardDuty::TrustedEntitySet`.
      *