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

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

@@ -1,88 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FirewallDomainListEvents = void 0;
+exports.DNSFirewallBlock = exports.FirewallDomainListEvents = exports.DNSFirewallAlert = void 0;
 const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /**
- * EventBridge event patterns for FirewallDomainList
+ * EventBridge event pattern for aws.route53resolver@DNSFirewallAlert
  */
-class FirewallDomainListEvents {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.events.FirewallDomainListEvents", version: "2.241.0-alpha.0" };
-    /**
-     * Create FirewallDomainListEvents from a FirewallDomainList reference
-     */
-    static fromFirewallDomainList(firewallDomainListRef) {
-        return new FirewallDomainListEvents(firewallDomainListRef);
-    }
-    /**
-     * Reference to the FirewallDomainList construct
-     */
-    firewallDomainListRef;
-    constructor(firewallDomainListRef) {
-        this.firewallDomainListRef = firewallDomainListRef;
-    }
+class DNSFirewallAlert {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.events.DNSFirewallAlert", version: "2.242.0-alpha.0" };
     /**
-     * EventBridge event pattern for FirewallDomainList DNS Firewall Alert
+     * EventBridge event pattern for DNS Firewall Alert
      */
-    dNSFirewallAlertPattern(options) {
+    static dnsFirewallAlertPattern(options) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_route53resolver_events_FirewallDomainListEvents_DNSFirewallAlert_DNSFirewallAlertProps(options);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_route53resolver_events_DNSFirewallAlert_DNSFirewallAlertProps(options);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.dNSFirewallAlertPattern);
+                Error.captureStackTrace(error, this.dnsFirewallAlertPattern);
             }
             throw error;
         }
         return {
             source: ["aws.route53resolver"],
             detailType: ["DNS Firewall Alert"],
-            detail: convertDNSFirewallAlertDetailToEventPattern(options, this.firewallDomainListRef),
-            version: options?.eventMetadata?.version,
-            resources: options?.eventMetadata?.resources,
-            region: options?.eventMetadata?.region
-        };
-    }
-    /**
-     * EventBridge event pattern for FirewallDomainList DNS Firewall Block
-     */
-    dNSFirewallBlockPattern(options) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_route53resolver_events_FirewallDomainListEvents_DNSFirewallBlock_DNSFirewallBlockProps(options);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.dNSFirewallBlockPattern);
-            }
-            throw error;
-        }
-        return {
-            source: ["aws.route53resolver"],
-            detailType: ["DNS Firewall Block"],
-            detail: convertDNSFirewallBlockDetailToEventPattern(options, this.firewallDomainListRef),
+            detail: convertDNSFirewallAlertDetailToEventPattern(options),
             version: options?.eventMetadata?.version,
             resources: options?.eventMetadata?.resources,
             region: options?.eventMetadata?.region
         };
     }
 }
-exports.FirewallDomainListEvents = FirewallDomainListEvents;
-(function (FirewallDomainListEvents) {
-    /**
-     * aws.route53resolver@DNSFirewallAlert event types for FirewallDomainList
-     */
-    class DNSFirewallAlert {
-        static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.events.FirewallDomainListEvents.DNSFirewallAlert", version: "2.241.0-alpha.0" };
-    }
-    FirewallDomainListEvents.DNSFirewallAlert = DNSFirewallAlert;
-    /**
-     * aws.route53resolver@DNSFirewallBlock event types for FirewallDomainList
-     */
-    class DNSFirewallBlock {
-        static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.events.FirewallDomainListEvents.DNSFirewallBlock", version: "2.241.0-alpha.0" };
-    }
-    FirewallDomainListEvents.DNSFirewallBlock = DNSFirewallBlock;
-})(FirewallDomainListEvents || (exports.FirewallDomainListEvents = FirewallDomainListEvents = {}));
+exports.DNSFirewallAlert = DNSFirewallAlert;
 // @ts-ignore TS6133
 function convertDNSFirewallAlertResolverEndpointDetailsToEventPattern(obj, iRef) {
     const ret = {
@@ -131,7 +80,7 @@ function convertDNSFirewallAlertDnsFirewallAlertItemToEventPattern(obj, iRef) {
 function convertDNSFirewallAlertDetailToEventPattern(obj, iRef) {
     const ret = {
         "account-id": obj?.accountId,
-        "firewall-domain-list-id": (obj?.firewallDomainListId ?? [iRef.firewallDomainListRef.firewallDomainListId]),
+        "firewall-domain-list-id": (obj?.firewallDomainListId ?? [iRef?.firewallDomainListRef.firewallDomainListId]),
         "firewall-rule-action": obj?.firewallRuleAction,
         "firewall-rule-group-id": obj?.firewallRuleGroupId,
         "last-observed-at": obj?.lastObservedAt,
@@ -153,6 +102,99 @@ function convertDNSFirewallAlertDetailToEventPattern(obj, iRef) {
     ;
     return ret;
 }
+/**
+ * EventBridge event patterns for FirewallDomainList
+ */
+class FirewallDomainListEvents {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.events.FirewallDomainListEvents", version: "2.242.0-alpha.0" };
+    /**
+     * Create FirewallDomainListEvents from a FirewallDomainList reference
+     */
+    static fromFirewallDomainList(firewallDomainListRef) {
+        return new FirewallDomainListEvents(firewallDomainListRef);
+    }
+    /**
+     * Reference to the FirewallDomainList construct
+     */
+    firewallDomainListRef;
+    constructor(firewallDomainListRef) {
+        this.firewallDomainListRef = firewallDomainListRef;
+    }
+    /**
+     * EventBridge event pattern for FirewallDomainList DNS Firewall Alert
+     */
+    dnsFirewallAlertPattern(options) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_route53resolver_events_DNSFirewallAlert_DNSFirewallAlertProps(options);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.dnsFirewallAlertPattern);
+            }
+            throw error;
+        }
+        return {
+            source: ["aws.route53resolver"],
+            detailType: ["DNS Firewall Alert"],
+            detail: convertDNSFirewallAlertDetailToEventPattern(options, this.firewallDomainListRef),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+    /**
+     * EventBridge event pattern for FirewallDomainList DNS Firewall Block
+     */
+    dnsFirewallBlockPattern(options) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_route53resolver_events_DNSFirewallBlock_DNSFirewallBlockProps(options);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.dnsFirewallBlockPattern);
+            }
+            throw error;
+        }
+        return {
+            source: ["aws.route53resolver"],
+            detailType: ["DNS Firewall Block"],
+            detail: convertDNSFirewallBlockDetailToEventPattern(options, this.firewallDomainListRef),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+}
+exports.FirewallDomainListEvents = FirewallDomainListEvents;
+/**
+ * EventBridge event pattern for aws.route53resolver@DNSFirewallBlock
+ */
+class DNSFirewallBlock {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_route53resolver.events.DNSFirewallBlock", version: "2.242.0-alpha.0" };
+    /**
+     * EventBridge event pattern for DNS Firewall Block
+     */
+    static dnsFirewallBlockPattern(options) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_route53resolver_events_DNSFirewallBlock_DNSFirewallBlockProps(options);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.dnsFirewallBlockPattern);
+            }
+            throw error;
+        }
+        return {
+            source: ["aws.route53resolver"],
+            detailType: ["DNS Firewall Block"],
+            detail: convertDNSFirewallBlockDetailToEventPattern(options),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+}
+exports.DNSFirewallBlock = DNSFirewallBlock;
 // @ts-ignore TS6133
 function convertDNSFirewallBlockResolverEndpointDetailsToEventPattern(obj, iRef) {
     const ret = {
@@ -201,7 +243,7 @@ function convertDNSFirewallBlockDnsFirewallBlockItemToEventPattern(obj, iRef) {
 function convertDNSFirewallBlockDetailToEventPattern(obj, iRef) {
     const ret = {
         "account-id": obj?.accountId,
-        "firewall-domain-list-id": (obj?.firewallDomainListId ?? [iRef.firewallDomainListRef.firewallDomainListId]),
+        "firewall-domain-list-id": (obj?.firewallDomainListId ?? [iRef?.firewallDomainListRef.firewallDomainListId]),
         "firewall-rule-action": obj?.firewallRuleAction,
         "firewall-rule-group-id": obj?.firewallRuleGroupId,
         "last-observed-at": obj?.lastObservedAt,

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

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

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

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

package/lib/services/aws-rtbfabric/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-rtbfabric";
+import { aws_ec2 as ec2Refs } from "aws-cdk-lib/interfaces";
 /**
  * Resource Type definition for AWS::RTBFabric::InboundExternalLink Resource Type.
  *
@@ -13,7 +14,7 @@ import * as service from "aws-cdk-lib/aws-rtbfabric";
 export declare class CfnInboundExternalLinkPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInboundExternalLinkMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RTBFabric::InboundExternalLink`.
      *
@@ -147,7 +148,7 @@ export interface CfnInboundExternalLinkMixinProps {
 export declare class CfnLinkPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLinkMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RTBFabric::Link`.
      *
@@ -538,7 +539,7 @@ export interface CfnLinkMixinProps {
 export declare class CfnOutboundExternalLinkPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnOutboundExternalLinkMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RTBFabric::OutboundExternalLink`.
      *
@@ -674,7 +675,7 @@ export interface CfnOutboundExternalLinkMixinProps {
 export declare class CfnRequesterGatewayPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRequesterGatewayMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RTBFabric::RequesterGateway`.
      *
@@ -710,13 +711,13 @@ export interface CfnRequesterGatewayMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-requestergateway.html#cfn-rtbfabric-requestergateway-securitygroupids
      */
-    readonly securityGroupIds?: Array<string>;
+    readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
     /**
      * The unique identifiers of the subnets.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-requestergateway.html#cfn-rtbfabric-requestergateway-subnetids
      */
-    readonly subnetIds?: Array<string>;
+    readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * A map of the key-value pairs of the tag or tags to assign to the resource.
      *
@@ -728,7 +729,7 @@ export interface CfnRequesterGatewayMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-requestergateway.html#cfn-rtbfabric-requestergateway-vpcid
      */
-    readonly vpcId?: string;
+    readonly vpcId?: ec2Refs.IVPCRef | string;
 }
 /**
  * Creates a responder gateway.
@@ -743,7 +744,7 @@ export interface CfnRequesterGatewayMixinProps {
 export declare class CfnResponderGatewayPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResponderGatewayMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RTBFabric::ResponderGateway`.
      *
@@ -907,13 +908,13 @@ export interface CfnResponderGatewayMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-respondergateway.html#cfn-rtbfabric-respondergateway-securitygroupids
      */
-    readonly securityGroupIds?: Array<string>;
+    readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
     /**
      * The unique identifiers of the subnets.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-respondergateway.html#cfn-rtbfabric-respondergateway-subnetids
      */
-    readonly subnetIds?: Array<string>;
+    readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * A map of the key-value pairs of the tag or tags to assign to the resource.
      *
@@ -931,5 +932,5 @@ export interface CfnResponderGatewayMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-respondergateway.html#cfn-rtbfabric-respondergateway-vpcid
      */
-    readonly vpcId?: string;
+    readonly vpcId?: ec2Refs.IVPCRef | string;
 }

package/lib/services/aws-rtbfabric/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-rtbfabric");
 /**
  * Resource Type definition for AWS::RTBFabric::InboundExternalLink Resource Type.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-rtbfabric");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-inboundexternallink.html
  */
 class CfnInboundExternalLinkPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnInboundExternalLinkPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnInboundExternalLinkPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["gatewayId", "linkAttributes", "linkLogSettings", "tags"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnInboundExternalLinkPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -53,12 +52,7 @@ class CfnInboundExternalLinkPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInboundExternalLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInboundExternalLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInboundExternalLinkPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -74,7 +68,7 @@ exports.CfnInboundExternalLinkPropsMixin = CfnInboundExternalLinkPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-link.html
  */
 class CfnLinkPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnLinkPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnLinkPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["gatewayId", "httpResponderAllowed", "linkAttributes", "linkLogSettings", "moduleConfigurationList", "peerGatewayId", "tags"];
     props;
     strategy;
@@ -97,7 +91,7 @@ class CfnLinkPropsMixin 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
@@ -110,12 +104,7 @@ class CfnLinkPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLinkPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -129,7 +118,7 @@ exports.CfnLinkPropsMixin = CfnLinkPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-outboundexternallink.html
  */
 class CfnOutboundExternalLinkPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnOutboundExternalLinkPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnOutboundExternalLinkPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["gatewayId", "linkAttributes", "linkLogSettings", "publicEndpoint", "tags"];
     props;
     strategy;
@@ -152,7 +141,7 @@ class CfnOutboundExternalLinkPropsMixin 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
@@ -165,12 +154,7 @@ class CfnOutboundExternalLinkPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOutboundExternalLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOutboundExternalLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOutboundExternalLinkPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -184,7 +168,7 @@ exports.CfnOutboundExternalLinkPropsMixin = CfnOutboundExternalLinkPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-requestergateway.html
  */
 class CfnRequesterGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnRequesterGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnRequesterGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "securityGroupIds", "subnetIds", "tags", "vpcId"];
     props;
     strategy;
@@ -206,8 +190,11 @@ class CfnRequesterGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRequesterGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -220,16 +207,22 @@ class CfnRequesterGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRequesterGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRequesterGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRequesterGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRequesterGatewayPropsMixin = CfnRequesterGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRequesterGatewayMixinProps(props) {
+    const ret = {};
+    if ((props.securityGroupIds !== undefined))
+        ret.securityGroupIds = cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"));
+    if ((props.subnetIds !== undefined))
+        ret.subnetIds = cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | 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 responder gateway.
  *
@@ -241,7 +234,7 @@ exports.CfnRequesterGatewayPropsMixin = CfnRequesterGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rtbfabric-respondergateway.html
  */
 class CfnResponderGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnResponderGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rtbfabric.mixins.CfnResponderGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "domainName", "managedEndpointConfiguration", "port", "protocol", "securityGroupIds", "subnetIds", "tags", "trustStoreConfiguration", "vpcId"];
     props;
     strategy;
@@ -263,8 +256,11 @@ class CfnResponderGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResponderGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -277,13 +273,19 @@ class CfnResponderGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResponderGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResponderGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResponderGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResponderGatewayPropsMixin = CfnResponderGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResponderGatewayMixinProps(props) {
+    const ret = {};
+    if ((props.securityGroupIds !== undefined))
+        ret.securityGroupIds = cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"));
+    if ((props.subnetIds !== undefined))
+        ret.subnetIds = cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string"));
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}

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

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

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

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

package/lib/services/aws-rum/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-rum";
+import { aws_cognito as cognitoRefs, aws_iam as iamRefs } from "aws-cdk-lib/interfaces";
 /**
  * Creates a CloudWatch RUM app monitor, which you can use to collect telemetry data from your application and send it to CloudWatch RUM.
  *
@@ -17,7 +18,7 @@ import * as service from "aws-cdk-lib/aws-rum";
 export declare class CfnAppMonitorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAppMonitorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RUM::AppMonitor`.
      *
@@ -95,13 +96,13 @@ export declare namespace CfnAppMonitorPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-guestrolearn
          */
-        readonly guestRoleArn?: string;
+        readonly guestRoleArn?: iamRefs.IRoleRef | string;
         /**
          * The ID of the Amazon Cognito identity pool that is used to authorize the sending of data to CloudWatch RUM.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-identitypoolid
          */
-        readonly identityPoolId?: string;
+        readonly identityPoolId?: cognitoRefs.IIdentityPoolRef | string;
         /**
          * If this app monitor is to collect data from only certain pages in your application, this structure lists those pages.
          *

package/lib/services/aws-rum/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-rum");
 /**
  * Creates a CloudWatch RUM app monitor, which you can use to collect telemetry data from your application and send it to CloudWatch RUM.
@@ -21,7 +20,7 @@ const service = require("aws-cdk-lib/aws-rum");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html
  */
 class CfnAppMonitorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rum.mixins.CfnAppMonitorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rum.mixins.CfnAppMonitorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["appMonitorConfiguration", "customEvents", "cwLogEnabled", "deobfuscationConfiguration", "domain", "domainList", "name", "platform", "resourcePolicy", "tags"];
     props;
     strategy;
@@ -43,8 +42,11 @@ class CfnAppMonitorPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAppMonitorMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -57,13 +59,32 @@ class CfnAppMonitorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAppMonitorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAppMonitorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAppMonitorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAppMonitorPropsMixin = CfnAppMonitorPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAppMonitorPropsMixinAppMonitorConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        allowCookies: (!props.allowCookies ? undefined : props.allowCookies),
+        enableXRay: (!props.enableXRay ? undefined : props.enableXRay),
+        excludedPages: (!props.excludedPages ? undefined : props.excludedPages),
+        favoritePages: (!props.favoritePages ? undefined : props.favoritePages),
+        guestRoleArn: (!props.guestRoleArn ? undefined : cdk.getRefProperty(props.guestRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.guestRoleArn, "guestRoleArn", "iam.IRoleRef | string")),
+        identityPoolId: (!props.identityPoolId ? undefined : cdk.getRefProperty(props.identityPoolId?.identityPoolRef, 'identityPoolId') ?? cdk.ensureStringOrUndefined(props.identityPoolId, "identityPoolId", "cognito.IIdentityPoolRef | string")),
+        includedPages: (!props.includedPages ? undefined : props.includedPages),
+        metricDestinations: (!props.metricDestinations ? undefined : props.metricDestinations),
+        sessionSampleRate: (!props.sessionSampleRate ? undefined : props.sessionSampleRate),
+        telemetries: (!props.telemetries ? undefined : props.telemetries)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnAppMonitorMixinProps(props) {
+    const ret = {};
+    if ((props.appMonitorConfiguration !== undefined))
+        ret.appMonitorConfiguration = flattenCfnAppMonitorPropsMixinAppMonitorConfigurationProperty(props.appMonitorConfiguration);
+    return ret;
+}