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

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

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

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

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

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

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

package/lib/services/aws-route53resolver/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-route53resolver";
+import { aws_ec2 as ec2Refs, aws_logs as logsRefs, aws_route53resolver as route53ResolverRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * High-level information about a list of firewall domains for use in a [AWS::Route53Resolver::FirewallRule](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-rule.html) . This is returned by [GetFirewallDomainList](https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_GetFirewallDomainList.html) .
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-route53resolver";
 export declare class CfnFirewallDomainListPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFirewallDomainListMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::FirewallDomainList`.
      *
@@ -80,7 +81,7 @@ export interface CfnFirewallDomainListMixinProps {
 export declare class CfnFirewallRuleGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFirewallRuleGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::FirewallRuleGroup`.
      *
@@ -182,7 +183,7 @@ export declare namespace CfnFirewallRuleGroupPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-firewalldomainlistid
          */
-        readonly firewallDomainListId?: string;
+        readonly firewallDomainListId?: route53ResolverRefs.IFirewallDomainListRef | string;
         /**
          * How you want the the rule to evaluate DNS redirection in the DNS redirection chain, such as CNAME, or DNAME.
          *
@@ -268,7 +269,7 @@ export interface CfnFirewallRuleGroupMixinProps {
 export declare class CfnFirewallRuleGroupAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFirewallRuleGroupAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::FirewallRuleGroupAssociation`.
      *
@@ -298,7 +299,7 @@ export interface CfnFirewallRuleGroupAssociationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-firewallrulegroupid
      */
-    readonly firewallRuleGroupId?: string;
+    readonly firewallRuleGroupId?: route53ResolverRefs.IFirewallRuleGroupRef | string;
     /**
      * If enabled, this setting disallows modification or removal of the association, to help prevent against accidentally altering DNS firewall protections.
      *
@@ -334,7 +335,7 @@ export interface CfnFirewallRuleGroupAssociationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-vpcid
      */
-    readonly vpcId?: string;
+    readonly vpcId?: ec2Refs.IVPCRef | string;
 }
 /**
  * Creates a Amazon Route 53 Resolver on an Outpost.
@@ -347,7 +348,7 @@ export interface CfnFirewallRuleGroupAssociationMixinProps {
 export declare class CfnOutpostResolverPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnOutpostResolverMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::OutpostResolver`.
      *
@@ -416,7 +417,7 @@ export interface CfnOutpostResolverMixinProps {
 export declare class CfnResolverConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverConfig`.
      *
@@ -467,7 +468,7 @@ export interface CfnResolverConfigMixinProps {
 export declare class CfnResolverDNSSECConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverDNSSECConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverDNSSECConfig`.
      *
@@ -516,7 +517,7 @@ export interface CfnResolverDNSSECConfigMixinProps {
 export declare class CfnResolverEndpointPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverEndpointMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverEndpoint`.
      *
@@ -680,7 +681,7 @@ export interface CfnResolverEndpointMixinProps {
 export declare class CfnResolverQueryLoggingConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverQueryLoggingConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverQueryLoggingConfig`.
      *
@@ -710,7 +711,7 @@ export interface CfnResolverQueryLoggingConfigMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfig.html#cfn-route53resolver-resolverqueryloggingconfig-destinationarn
      */
-    readonly destinationArn?: string;
+    readonly destinationArn?: logsRefs.ILogGroupRef | s3Refs.IBucketRef | string;
     /**
      * The name of the query logging configuration.
      *
@@ -737,7 +738,7 @@ export interface CfnResolverQueryLoggingConfigMixinProps {
 export declare class CfnResolverQueryLoggingConfigAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverQueryLoggingConfigAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation`.
      *
@@ -767,13 +768,13 @@ export interface CfnResolverQueryLoggingConfigAssociationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html#cfn-route53resolver-resolverqueryloggingconfigassociation-resolverquerylogconfigid
      */
-    readonly resolverQueryLogConfigId?: string;
+    readonly resolverQueryLogConfigId?: route53ResolverRefs.IResolverQueryLoggingConfigRef | string;
     /**
      * The ID of the Amazon VPC that is associated with the query logging configuration.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html#cfn-route53resolver-resolverqueryloggingconfigassociation-resourceid
      */
-    readonly resourceId?: string;
+    readonly resourceId?: ec2Refs.IVPCRef | string;
 }
 /**
  * For DNS queries that originate in your VPCs, specifies which Resolver endpoint the queries pass through, one domain name that you want to forward to your network, and the IP addresses of the DNS resolvers in your network.
@@ -786,7 +787,7 @@ export interface CfnResolverQueryLoggingConfigAssociationMixinProps {
 export declare class CfnResolverRulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverRuleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverRule`.
      *
@@ -926,7 +927,7 @@ export interface CfnResolverRuleMixinProps {
 export declare class CfnResolverRuleAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResolverRuleAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Route53Resolver::ResolverRuleAssociation`.
      *
@@ -964,11 +965,11 @@ export interface CfnResolverRuleAssociationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-resolverruleid
      */
-    readonly resolverRuleId?: string;
+    readonly resolverRuleId?: route53ResolverRefs.IResolverRuleRef | string;
     /**
      * The ID of the VPC that you associated the Resolver rule with.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-vpcid
      */
-    readonly vpcId?: string;
+    readonly vpcId?: ec2Refs.IVPCRef | string;
 }

package/lib/services/aws-route53resolver/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-route53resolver");
 /**
  * High-level information about a list of firewall domains for use in a [AWS::Route53Resolver::FirewallRule](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-rule.html) . This is returned by [GetFirewallDomainList](https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_GetFirewallDomainList.html) .
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-route53resolver");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html
  */
 class CfnFirewallDomainListPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnFirewallDomainListPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnFirewallDomainListPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["domainFileUrl", "domains", "name", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnFirewallDomainListPropsMixin 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 CfnFirewallDomainListPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFirewallDomainListPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFirewallDomainListPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFirewallDomainListPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnFirewallDomainListPropsMixin = CfnFirewallDomainListPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroup.html
  */
 class CfnFirewallRuleGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnFirewallRuleGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnFirewallRuleGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["firewallRules", "name", "tags"];
     props;
     strategy;
@@ -98,8 +92,11 @@ class CfnFirewallRuleGroupPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFirewallRuleGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -112,16 +109,37 @@ class CfnFirewallRuleGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFirewallRuleGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFirewallRuleGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFirewallRuleGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFirewallRuleGroupPropsMixin = CfnFirewallRuleGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFirewallRuleGroupPropsMixinFirewallRuleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        action: (!props.action ? undefined : props.action),
+        blockOverrideDnsType: (!props.blockOverrideDnsType ? undefined : props.blockOverrideDnsType),
+        blockOverrideDomain: (!props.blockOverrideDomain ? undefined : props.blockOverrideDomain),
+        blockOverrideTtl: (!props.blockOverrideTtl ? undefined : props.blockOverrideTtl),
+        blockResponse: (!props.blockResponse ? undefined : props.blockResponse),
+        confidenceThreshold: (!props.confidenceThreshold ? undefined : props.confidenceThreshold),
+        dnsThreatProtection: (!props.dnsThreatProtection ? undefined : props.dnsThreatProtection),
+        firewallDomainListId: (!props.firewallDomainListId ? undefined : cdk.getRefProperty(props.firewallDomainListId?.firewallDomainListRef, 'firewallDomainListId') ?? cdk.ensureStringOrUndefined(props.firewallDomainListId, "firewallDomainListId", "route53resolver.IFirewallDomainListRef | string")),
+        firewallDomainRedirectionAction: (!props.firewallDomainRedirectionAction ? undefined : props.firewallDomainRedirectionAction),
+        firewallThreatProtectionId: (!props.firewallThreatProtectionId ? undefined : props.firewallThreatProtectionId),
+        priority: (!props.priority ? undefined : props.priority),
+        qtype: (!props.qtype ? undefined : props.qtype)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFirewallRuleGroupMixinProps(props) {
+    const ret = {};
+    if ((props.firewallRules !== undefined))
+        ret.firewallRules = (cdk.isResolvableObject(props.firewallRules) ? props.firewallRules : cdk.mapArrayInPlace(props.firewallRules, (item) => flattenCfnFirewallRuleGroupPropsMixinFirewallRuleProperty(item)));
+    return ret;
+}
 /**
  * An association between a firewall rule group and a VPC, which enables DNS filtering for the VPC.
  *
@@ -131,7 +149,7 @@ exports.CfnFirewallRuleGroupPropsMixin = CfnFirewallRuleGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html
  */
 class CfnFirewallRuleGroupAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnFirewallRuleGroupAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnFirewallRuleGroupAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["firewallRuleGroupId", "mutationProtection", "name", "priority", "tags", "vpcId"];
     props;
     strategy;
@@ -153,8 +171,11 @@ class CfnFirewallRuleGroupAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFirewallRuleGroupAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -167,16 +188,20 @@ class CfnFirewallRuleGroupAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFirewallRuleGroupAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFirewallRuleGroupAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFirewallRuleGroupAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFirewallRuleGroupAssociationPropsMixin = CfnFirewallRuleGroupAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFirewallRuleGroupAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.firewallRuleGroupId !== undefined))
+        ret.firewallRuleGroupId = cdk.getRefProperty(props.firewallRuleGroupId?.firewallRuleGroupRef, 'firewallRuleGroupId') ?? cdk.ensureStringOrUndefined(props.firewallRuleGroupId, "firewallRuleGroupId", "route53resolver.IFirewallRuleGroupRef | string");
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Creates a Amazon Route 53 Resolver on an Outpost.
  *
@@ -186,7 +211,7 @@ exports.CfnFirewallRuleGroupAssociationPropsMixin = CfnFirewallRuleGroupAssociat
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-outpostresolver.html
  */
 class CfnOutpostResolverPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnOutpostResolverPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnOutpostResolverPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["instanceCount", "name", "outpostArn", "preferredInstanceType", "tags"];
     props;
     strategy;
@@ -209,7 +234,7 @@ class CfnOutpostResolverPropsMixin 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
@@ -222,12 +247,7 @@ class CfnOutpostResolverPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOutpostResolverPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOutpostResolverPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOutpostResolverPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -241,7 +261,7 @@ exports.CfnOutpostResolverPropsMixin = CfnOutpostResolverPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverconfig.html
  */
 class CfnResolverConfigPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverConfigPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autodefinedReverseFlag", "resourceId"];
     props;
     strategy;
@@ -264,7 +284,7 @@ class CfnResolverConfigPropsMixin 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
@@ -277,12 +297,7 @@ class CfnResolverConfigPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -296,7 +311,7 @@ exports.CfnResolverConfigPropsMixin = CfnResolverConfigPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverdnssecconfig.html
  */
 class CfnResolverDNSSECConfigPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverDNSSECConfigPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverDNSSECConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["resourceId"];
     props;
     strategy;
@@ -319,7 +334,7 @@ class CfnResolverDNSSECConfigPropsMixin 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
@@ -332,12 +347,7 @@ class CfnResolverDNSSECConfigPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverDNSSECConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverDNSSECConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverDNSSECConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -357,7 +367,7 @@ exports.CfnResolverDNSSECConfigPropsMixin = CfnResolverDNSSECConfigPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html
  */
 class CfnResolverEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["direction", "ipAddresses", "name", "outpostArn", "preferredInstanceType", "protocols", "resolverEndpointType", "rniEnhancedMetricsEnabled", "securityGroupIds", "tags", "targetNameServerMetricsEnabled"];
     props;
     strategy;
@@ -380,7 +390,7 @@ class CfnResolverEndpointPropsMixin 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
@@ -393,12 +403,7 @@ class CfnResolverEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -412,7 +417,7 @@ exports.CfnResolverEndpointPropsMixin = CfnResolverEndpointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfig.html
  */
 class CfnResolverQueryLoggingConfigPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverQueryLoggingConfigPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverQueryLoggingConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destinationArn", "name", "tags"];
     props;
     strategy;
@@ -434,8 +439,11 @@ class CfnResolverQueryLoggingConfigPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResolverQueryLoggingConfigMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -448,16 +456,18 @@ class CfnResolverQueryLoggingConfigPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverQueryLoggingConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverQueryLoggingConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverQueryLoggingConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResolverQueryLoggingConfigPropsMixin = CfnResolverQueryLoggingConfigPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResolverQueryLoggingConfigMixinProps(props) {
+    const ret = {};
+    if ((props.destinationArn !== undefined))
+        ret.destinationArn = cdk.getRefProperty(props.destinationArn?.logGroupRef, 'logGroupArn') ?? cdk.getRefProperty(props.destinationArn?.bucketRef, 'bucketArn') ?? cdk.ensureStringOrUndefined(props.destinationArn, "destinationArn", "logs.ILogGroupRef | s3.IBucketRef | string");
+    return ret;
+}
 /**
  * The AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation resource is a configuration for DNS query logging.
  *
@@ -469,7 +479,7 @@ exports.CfnResolverQueryLoggingConfigPropsMixin = CfnResolverQueryLoggingConfigP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html
  */
 class CfnResolverQueryLoggingConfigAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverQueryLoggingConfigAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverQueryLoggingConfigAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["resolverQueryLogConfigId", "resourceId"];
     props;
     strategy;
@@ -491,8 +501,11 @@ class CfnResolverQueryLoggingConfigAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResolverQueryLoggingConfigAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -505,16 +518,20 @@ class CfnResolverQueryLoggingConfigAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverQueryLoggingConfigAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverQueryLoggingConfigAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverQueryLoggingConfigAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResolverQueryLoggingConfigAssociationPropsMixin = CfnResolverQueryLoggingConfigAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResolverQueryLoggingConfigAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.resolverQueryLogConfigId !== undefined))
+        ret.resolverQueryLogConfigId = cdk.getRefProperty(props.resolverQueryLogConfigId?.resolverQueryLoggingConfigRef, 'resolverQueryLoggingConfigId') ?? cdk.ensureStringOrUndefined(props.resolverQueryLogConfigId, "resolverQueryLogConfigId", "route53resolver.IResolverQueryLoggingConfigRef | string");
+    if ((props.resourceId !== undefined))
+        ret.resourceId = cdk.getRefProperty(props.resourceId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.resourceId, "resourceId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * For DNS queries that originate in your VPCs, specifies which Resolver endpoint the queries pass through, one domain name that you want to forward to your network, and the IP addresses of the DNS resolvers in your network.
  *
@@ -524,7 +541,7 @@ exports.CfnResolverQueryLoggingConfigAssociationPropsMixin = CfnResolverQueryLog
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html
  */
 class CfnResolverRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["delegationRecord", "domainName", "name", "resolverEndpointId", "ruleType", "tags", "targetIps"];
     props;
     strategy;
@@ -547,7 +564,7 @@ class CfnResolverRulePropsMixin 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
@@ -560,12 +577,7 @@ class CfnResolverRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -579,7 +591,7 @@ exports.CfnResolverRulePropsMixin = CfnResolverRulePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html
  */
 class CfnResolverRuleAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverRuleAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.mixins.CfnResolverRuleAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "resolverRuleId", "vpcId"];
     props;
     strategy;
@@ -601,8 +613,11 @@ class CfnResolverRuleAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResolverRuleAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -615,13 +630,17 @@ class CfnResolverRuleAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverRuleAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverRuleAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverRuleAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResolverRuleAssociationPropsMixin = CfnResolverRuleAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResolverRuleAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.resolverRuleId !== undefined))
+        ret.resolverRuleId = cdk.getRefProperty(props.resolverRuleId?.resolverRuleRef, 'resolverRuleId') ?? cdk.ensureStringOrUndefined(props.resolverRuleId, "resolverRuleId", "route53resolver.IResolverRuleRef | string");
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}