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

package/lib/services/aws-route53/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-route53";
+import { aws_cloudwatch as cloudWatchRefs, aws_ec2 as ec2Refs, aws_logs as logsRefs, aws_route53 as route53Refs, aws_route53recoverycontrol as route53RecoveryControlRefs } from "aws-cdk-lib/interfaces";
 /**
  * Creates a CIDR collection in the current AWS account.
  *
@@ -11,10 +11,10 @@ import * as service from "aws-cdk-lib/aws-route53";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-cidrcollection.html
  */
-export declare class CfnCidrCollectionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnCidrCollectionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCidrCollectionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::CidrCollection`.
      *
@@ -83,10 +83,10 @@ export interface CfnCidrCollectionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-dnssec.html
  */
-export declare class CfnDNSSECPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnDNSSECPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDNSSECMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::DNSSEC`.
      *
@@ -144,10 +144,10 @@ export interface CfnDNSSECMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html
  */
-export declare class CfnHealthCheckPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnHealthCheckPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHealthCheckMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::HealthCheck`.
      *
@@ -184,7 +184,7 @@ export declare namespace CfnHealthCheckPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-childhealthchecks
          */
-        readonly childHealthChecks?: Array<string>;
+        readonly childHealthChecks?: Array<route53Refs.IHealthCheckRef | string>;
         /**
          * Specify whether you want Amazon Route 53 to send the value of `FullyQualifiedDomainName` to the endpoint in the `client_hello` message during TLS negotiation.
          *
@@ -291,7 +291,7 @@ export declare namespace CfnHealthCheckPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-ipaddress
          */
-        readonly ipAddress?: string;
+        readonly ipAddress?: ec2Refs.IEIPRef | string;
         /**
          * Specify whether you want Amazon Route 53 to measure the latency between health checkers in multiple AWS regions and your endpoint, and to display CloudWatch latency graphs on the *Health Checks* page in the Route 53 console.
          *
@@ -349,7 +349,7 @@ export declare namespace CfnHealthCheckPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-routingcontrolarn
          */
-        readonly routingControlArn?: string;
+        readonly routingControlArn?: route53RecoveryControlRefs.IRoutingControlRef | string;
         /**
          * If the value of Type is `HTTP_STR_MATCH` or `HTTPS_STR_MATCH` , the string that you want Amazon Route 53 to search for in the response body from the specified resource.
          *
@@ -407,7 +407,7 @@ export declare namespace CfnHealthCheckPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-name
          */
-        readonly name?: string;
+        readonly name?: cloudWatchRefs.IAlarmRef | string;
         /**
          * For the CloudWatch alarm that you want Route 53 health checkers to use to determine whether this health check is healthy, the region that the alarm was created in.
          *
@@ -503,10 +503,10 @@ export interface CfnHealthCheckMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html
  */
-export declare class CfnHostedZonePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnHostedZonePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHostedZoneMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::HostedZone`.
      *
@@ -572,7 +572,7 @@ export declare namespace CfnHostedZonePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-vpc.html#cfn-route53-hostedzone-vpc-vpcid
          */
-        readonly vpcId?: string;
+        readonly vpcId?: ec2Refs.IVPCRef | string;
         /**
          * *Private hosted zones only:* The region that an Amazon VPC was created in.
          *
@@ -612,7 +612,7 @@ export declare namespace CfnHostedZonePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-queryloggingconfig.html#cfn-route53-hostedzone-queryloggingconfig-cloudwatchlogsloggrouparn
          */
-        readonly cloudWatchLogsLogGroupArn?: string;
+        readonly cloudWatchLogsLogGroupArn?: logsRefs.ILogGroupRef | string;
     }
     /**
      * Represents the features configuration for a hosted zone, including the status of various features and any associated failure reasons.
@@ -742,10 +742,10 @@ export interface CfnHostedZoneMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html
  */
-export declare class CfnKeySigningKeyPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnKeySigningKeyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnKeySigningKeyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::KeySigningKey`.
      *
@@ -821,10 +821,10 @@ export interface CfnKeySigningKeyMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordset.html
  */
-export declare class CfnRecordSetPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnRecordSetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRecordSetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::RecordSet`.
      *
@@ -1413,10 +1413,10 @@ export interface CfnRecordSetMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html
  */
-export declare class CfnRecordSetGroupPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnRecordSetGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRecordSetGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53::RecordSetGroup`.
      *

package/lib/services/aws-route53/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-route53");
 /**
  * Creates a CIDR collection in the current AWS account.
@@ -17,8 +15,8 @@ const service = require("aws-cdk-lib/aws-route53");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-cidrcollection.html
  */
-class CfnCidrCollectionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnCidrCollectionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCidrCollectionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnCidrCollectionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["locations", "name"];
     props;
     strategy;
@@ -41,7 +39,7 @@ class CfnCidrCollectionPropsMixin 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 CfnCidrCollectionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCidrCollectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCidrCollectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCidrCollectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,8 +65,8 @@ exports.CfnCidrCollectionPropsMixin = CfnCidrCollectionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-dnssec.html
  */
-class CfnDNSSECPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnDNSSECPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDNSSECPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnDNSSECPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["hostedZoneId"];
     props;
     strategy;
@@ -96,7 +89,7 @@ class CfnDNSSECPropsMixin 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 CfnDNSSECPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDNSSECPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDNSSECPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDNSSECPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -143,8 +131,8 @@ exports.CfnDNSSECPropsMixin = CfnDNSSECPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html
  */
-class CfnHealthCheckPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnHealthCheckPropsMixin", version: "2.240.0-alpha.0" };
+class CfnHealthCheckPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnHealthCheckPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["healthCheckConfig", "healthCheckTags"];
     props;
     strategy;
@@ -166,8 +154,11 @@ class CfnHealthCheckPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnHealthCheckMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -180,16 +171,51 @@ class CfnHealthCheckPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHealthCheckPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHealthCheckPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHealthCheckPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnHealthCheckPropsMixin = CfnHealthCheckPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnHealthCheckPropsMixinAlarmIdentifierProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        name: (!props.name ? undefined : cdk.getRefProperty(props.name?.alarmRef, 'alarmName') ?? cdk.ensureStringOrUndefined(props.name, "name", "cloudwatch.IAlarmRef | string")),
+        region: (!props.region ? undefined : props.region)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnHealthCheckPropsMixinHealthCheckConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        alarmIdentifier: (!props.alarmIdentifier ? undefined : (!props.alarmIdentifier ? undefined : flattenCfnHealthCheckPropsMixinAlarmIdentifierProperty(props.alarmIdentifier))),
+        childHealthChecks: (!props.childHealthChecks ? undefined : cdk.mapArrayInPlace(props.childHealthChecks, (item) => cdk.getRefProperty(item?.healthCheckRef, 'healthCheckId') ?? cdk.ensureStringOrUndefined(item, "childHealthChecks", "route53.IHealthCheckRef | string"))),
+        enableSni: (!props.enableSni ? undefined : props.enableSni),
+        failureThreshold: (!props.failureThreshold ? undefined : props.failureThreshold),
+        fullyQualifiedDomainName: (!props.fullyQualifiedDomainName ? undefined : props.fullyQualifiedDomainName),
+        healthThreshold: (!props.healthThreshold ? undefined : props.healthThreshold),
+        insufficientDataHealthStatus: (!props.insufficientDataHealthStatus ? undefined : props.insufficientDataHealthStatus),
+        inverted: (!props.inverted ? undefined : props.inverted),
+        ipAddress: (!props.ipAddress ? undefined : cdk.getRefProperty(props.ipAddress?.eipRef, 'publicIp') ?? cdk.getRefProperty(props.ipAddress?.eipRef, 'allocationId') ?? cdk.ensureStringOrUndefined(props.ipAddress, "ipAddress", "ec2.IEIPRef | string")),
+        measureLatency: (!props.measureLatency ? undefined : props.measureLatency),
+        port: (!props.port ? undefined : props.port),
+        regions: (!props.regions ? undefined : props.regions),
+        requestInterval: (!props.requestInterval ? undefined : props.requestInterval),
+        resourcePath: (!props.resourcePath ? undefined : props.resourcePath),
+        routingControlArn: (!props.routingControlArn ? undefined : cdk.getRefProperty(props.routingControlArn?.routingControlRef, 'routingControlArn') ?? cdk.ensureStringOrUndefined(props.routingControlArn, "routingControlArn", "route53recoverycontrol.IRoutingControlRef | string")),
+        searchString: (!props.searchString ? undefined : props.searchString),
+        type: (!props.type ? undefined : props.type)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnHealthCheckMixinProps(props) {
+    const ret = {};
+    if ((props.healthCheckConfig !== undefined))
+        ret.healthCheckConfig = flattenCfnHealthCheckPropsMixinHealthCheckConfigProperty(props.healthCheckConfig);
+    return ret;
+}
 /**
  * Creates a new public or private hosted zone.
  *
@@ -223,8 +249,8 @@ exports.CfnHealthCheckPropsMixin = CfnHealthCheckPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html
  */
-class CfnHostedZonePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnHostedZonePropsMixin", version: "2.240.0-alpha.0" };
+class CfnHostedZonePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnHostedZonePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["hostedZoneConfig", "hostedZoneFeatures", "hostedZoneTags", "name", "queryLoggingConfig", "vpcs"];
     props;
     strategy;
@@ -246,8 +272,11 @@ class CfnHostedZonePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnHostedZoneMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -260,16 +289,37 @@ class CfnHostedZonePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHostedZonePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHostedZonePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHostedZonePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnHostedZonePropsMixin = CfnHostedZonePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnHostedZonePropsMixinVPCProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        vpcId: (!props.vpcId ? undefined : cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string")),
+        vpcRegion: (!props.vpcRegion ? undefined : props.vpcRegion)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnHostedZonePropsMixinQueryLoggingConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cloudWatchLogsLogGroupArn: (!props.cloudWatchLogsLogGroupArn ? undefined : cdk.getRefProperty(props.cloudWatchLogsLogGroupArn?.logGroupRef, 'logGroupArn') ?? cdk.ensureStringOrUndefined(props.cloudWatchLogsLogGroupArn, "cloudWatchLogsLogGroupArn", "logs.ILogGroupRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnHostedZoneMixinProps(props) {
+    const ret = {};
+    if ((props.queryLoggingConfig !== undefined))
+        ret.queryLoggingConfig = flattenCfnHostedZonePropsMixinQueryLoggingConfigProperty(props.queryLoggingConfig);
+    if ((props.vpcs !== undefined))
+        ret.vpcs = (cdk.isResolvableObject(props.vpcs) ? props.vpcs : cdk.mapArrayInPlace(props.vpcs, (item) => flattenCfnHostedZonePropsMixinVPCProperty(item)));
+    return ret;
+}
 /**
  * The `AWS::Route53::KeySigningKey` resource creates a new key-signing key (KSK) in a hosted zone.
  *
@@ -280,8 +330,8 @@ exports.CfnHostedZonePropsMixin = CfnHostedZonePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html
  */
-class CfnKeySigningKeyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnKeySigningKeyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnKeySigningKeyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnKeySigningKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["hostedZoneId", "keyManagementServiceArn", "name", "status"];
     props;
     strategy;
@@ -304,7 +354,7 @@ class CfnKeySigningKeyPropsMixin 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
@@ -317,12 +367,7 @@ class CfnKeySigningKeyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnKeySigningKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnKeySigningKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnKeySigningKeyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -339,8 +384,8 @@ exports.CfnKeySigningKeyPropsMixin = CfnKeySigningKeyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordset.html
  */
-class CfnRecordSetPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnRecordSetPropsMixin", version: "2.240.0-alpha.0" };
+class CfnRecordSetPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnRecordSetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["aliasTarget", "cidrRoutingConfig", "comment", "failover", "geoLocation", "geoProximityLocation", "healthCheckId", "hostedZoneId", "hostedZoneName", "multiValueAnswer", "name", "region", "resourceRecords", "setIdentifier", "ttl", "type", "weight"];
     props;
     strategy;
@@ -363,7 +408,7 @@ class CfnRecordSetPropsMixin 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
@@ -376,12 +421,7 @@ class CfnRecordSetPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRecordSetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRecordSetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRecordSetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -394,8 +434,8 @@ exports.CfnRecordSetPropsMixin = CfnRecordSetPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html
  */
-class CfnRecordSetGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnRecordSetGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnRecordSetGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53.mixins.CfnRecordSetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["comment", "hostedZoneId", "hostedZoneName", "recordSets"];
     props;
     strategy;
@@ -418,7 +458,7 @@ class CfnRecordSetGroupPropsMixin 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
@@ -431,12 +471,7 @@ class CfnRecordSetGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRecordSetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRecordSetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRecordSetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

package/lib/services/aws-route53profiles/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-route53profiles";
 /**
@@ -11,10 +10,10 @@ import * as service from "aws-cdk-lib/aws-route53profiles";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profile.html
  */
-export declare class CfnProfilePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Profiles::Profile`.
      *
@@ -60,10 +59,10 @@ export interface CfnProfileMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profileassociation.html
  */
-export declare class CfnProfileAssociationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnProfileAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProfileAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Profiles::ProfileAssociation`.
      *
@@ -129,10 +128,10 @@ export interface CfnProfileAssociationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profileresourceassociation.html
  */
-export declare class CfnProfileResourceAssociationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnProfileResourceAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProfileResourceAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Profiles::ProfileResourceAssociation`.
      *

package/lib/services/aws-route53profiles/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-route53profiles");
 /**
  * A complex type that includes settings for a Route 53 Profile.
@@ -17,8 +15,8 @@ const service = require("aws-cdk-lib/aws-route53profiles");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profile.html
  */
-class CfnProfilePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53profiles.mixins.CfnProfilePropsMixin", version: "2.240.0-alpha.0" };
+class CfnProfilePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53profiles.mixins.CfnProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "tags"];
     props;
     strategy;
@@ -41,7 +39,7 @@ class CfnProfilePropsMixin 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 CfnProfilePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,8 +65,8 @@ exports.CfnProfilePropsMixin = CfnProfilePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profileassociation.html
  */
-class CfnProfileAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53profiles.mixins.CfnProfileAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnProfileAssociationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53profiles.mixins.CfnProfileAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["arn", "name", "profileId", "resourceId", "tags"];
     props;
     strategy;
@@ -96,7 +89,7 @@ class CfnProfileAssociationPropsMixin 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 CfnProfileAssociationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProfileAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProfileAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProfileAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -127,8 +115,8 @@ exports.CfnProfileAssociationPropsMixin = CfnProfileAssociationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profileresourceassociation.html
  */
-class CfnProfileResourceAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53profiles.mixins.CfnProfileResourceAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnProfileResourceAssociationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53profiles.mixins.CfnProfileResourceAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "profileId", "resourceArn", "resourceProperties"];
     props;
     strategy;
@@ -151,7 +139,7 @@ class CfnProfileResourceAssociationPropsMixin 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 CfnProfileResourceAssociationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProfileResourceAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProfileResourceAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProfileResourceAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }