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

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

@@ -17,7 +17,7 @@ import * as service from "aws-cdk-lib/aws-neptunegraph";
 export declare class CfnGraphPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGraphMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NeptuneGraph::Graph`.
      *
@@ -137,7 +137,7 @@ export interface CfnGraphMixinProps {
 export declare class CfnPrivateGraphEndpointPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPrivateGraphEndpointMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NeptuneGraph::PrivateGraphEndpoint`.
      *

package/lib/services/aws-neptunegraph/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-neptunegraph");
 /**
  * The `AWS ::NeptuneGraph::Graph` resource creates an  graph.
@@ -21,7 +20,7 @@ const service = require("aws-cdk-lib/aws-neptunegraph");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptunegraph-graph.html
  */
 class CfnGraphPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_neptunegraph.mixins.CfnGraphPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_neptunegraph.mixins.CfnGraphPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deletionProtection", "graphName", "provisionedMemory", "publicConnectivity", "replicaCount", "tags", "vectorSearchConfiguration"];
     props;
     strategy;
@@ -44,7 +43,7 @@ class CfnGraphPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -57,12 +56,7 @@ class CfnGraphPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGraphPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGraphPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGraphPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -80,7 +74,7 @@ exports.CfnGraphPropsMixin = CfnGraphPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptunegraph-privategraphendpoint.html
  */
 class CfnPrivateGraphEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_neptunegraph.mixins.CfnPrivateGraphEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_neptunegraph.mixins.CfnPrivateGraphEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["graphIdentifier", "securityGroupIds", "subnetIds", "vpcId"];
     props;
     strategy;
@@ -103,7 +97,7 @@ class CfnPrivateGraphEndpointPropsMixin 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
@@ -116,12 +110,7 @@ class CfnPrivateGraphEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPrivateGraphEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPrivateGraphEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPrivateGraphEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

package/lib/services/aws-networkfirewall/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-networkfirewall";
+import { aws_ec2 as ec2Refs, aws_networkfirewall as networkFirewallRefs } from "aws-cdk-lib/interfaces";
 /**
  * Use the firewall to provide stateful, managed, network firewall and intrusion detection and prevention filtering for your VPCs in Amazon VPC .
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-networkfirewall";
 export declare class CfnFirewallPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFirewallMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NetworkFirewall::Firewall`.
      *
@@ -56,7 +57,7 @@ export declare namespace CfnFirewallPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewall-subnetmapping.html#cfn-networkfirewall-firewall-subnetmapping-subnetid
          */
-        readonly subnetId?: string;
+        readonly subnetId?: ec2Refs.ISubnetRef | string;
     }
     /**
      * Defines the mapping between an Availability Zone and a firewall endpoint for a transit gateway-attached firewall.
@@ -139,7 +140,7 @@ export interface CfnFirewallMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-firewallpolicyarn
      */
-    readonly firewallPolicyArn?: string;
+    readonly firewallPolicyArn?: networkFirewallRefs.IFirewallPolicyRef | string;
     /**
      * A setting indicating whether the firewall is protected against a change to the firewall policy association.
      *
@@ -191,7 +192,7 @@ export interface CfnFirewallMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-vpcid
      */
-    readonly vpcId?: string;
+    readonly vpcId?: ec2Refs.IVPCRef | string;
 }
 /**
  * Use the firewall policy to define the stateless and stateful network traffic filtering behavior for your firewall.
@@ -206,7 +207,7 @@ export interface CfnFirewallMixinProps {
 export declare class CfnFirewallPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFirewallPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NetworkFirewall::FirewallPolicy`.
      *
@@ -347,7 +348,7 @@ export declare namespace CfnFirewallPolicyPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statelessrulegroupreference.html#cfn-networkfirewall-firewallpolicy-statelessrulegroupreference-resourcearn
          */
-        readonly resourceArn?: string;
+        readonly resourceArn?: networkFirewallRefs.IRuleGroupRef | string;
     }
     /**
      * Identifier for a single stateful rule group, used in a firewall policy to refer to a rule group.
@@ -390,7 +391,7 @@ export declare namespace CfnFirewallPolicyPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulrulegroupreference.html#cfn-networkfirewall-firewallpolicy-statefulrulegroupreference-resourcearn
          */
-        readonly resourceArn?: string;
+        readonly resourceArn?: networkFirewallRefs.IRuleGroupRef | string;
     }
     /**
      * The setting that allows the policy owner to change the behavior of the rule group within a policy.
@@ -645,7 +646,7 @@ export interface CfnFirewallPolicyMixinProps {
 export declare class CfnLoggingConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLoggingConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NetworkFirewall::LoggingConfiguration`.
      *
@@ -751,7 +752,7 @@ export interface CfnLoggingConfigurationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-loggingconfiguration.html#cfn-networkfirewall-loggingconfiguration-firewallarn
      */
-    readonly firewallArn?: string;
+    readonly firewallArn?: networkFirewallRefs.IFirewallRef | string;
     /**
      * The name of the firewall that the logging configuration is associated with.
      *
@@ -778,7 +779,7 @@ export interface CfnLoggingConfigurationMixinProps {
 export declare class CfnRuleGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRuleGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NetworkFirewall::RuleGroup`.
      *
@@ -1605,7 +1606,7 @@ export interface CfnRuleGroupMixinProps {
 export declare class CfnTLSInspectionConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTLSInspectionConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NetworkFirewall::TLSInspectionConfiguration`.
      *
@@ -1910,7 +1911,7 @@ export interface CfnTLSInspectionConfigurationMixinProps {
 export declare class CfnVpcEndpointAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnVpcEndpointAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::NetworkFirewall::VpcEndpointAssociation`.
      *

package/lib/services/aws-networkfirewall/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-networkfirewall");
 /**
  * Use the firewall to provide stateful, managed, network firewall and intrusion detection and prevention filtering for your VPCs in Amazon VPC .
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-networkfirewall");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html
  */
 class CfnFirewallPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZoneChangeProtection", "availabilityZoneMappings", "deleteProtection", "description", "enabledAnalysisTypes", "firewallName", "firewallPolicyArn", "firewallPolicyChangeProtection", "subnetChangeProtection", "subnetMappings", "tags", "transitGatewayId", "vpcId"];
     props;
     strategy;
@@ -41,8 +40,11 @@ class CfnFirewallPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFirewallMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,16 +57,31 @@ class CfnFirewallPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFirewallPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFirewallPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFirewallPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFirewallPropsMixin = CfnFirewallPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFirewallPropsMixinSubnetMappingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        ipAddressType: (!props.ipAddressType ? undefined : props.ipAddressType),
+        subnetId: (!props.subnetId ? undefined : cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFirewallMixinProps(props) {
+    const ret = {};
+    if ((props.firewallPolicyArn !== undefined))
+        ret.firewallPolicyArn = cdk.getRefProperty(props.firewallPolicyArn?.firewallPolicyRef, 'firewallPolicyArn') ?? cdk.ensureStringOrUndefined(props.firewallPolicyArn, "firewallPolicyArn", "networkfirewall.IFirewallPolicyRef | string");
+    if ((props.subnetMappings !== undefined))
+        ret.subnetMappings = (cdk.isResolvableObject(props.subnetMappings) ? props.subnetMappings : cdk.mapArrayInPlace(props.subnetMappings, (item) => flattenCfnFirewallPropsMixinSubnetMappingProperty(item)));
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Use the firewall policy to define the stateless and stateful network traffic filtering behavior for your firewall.
  *
@@ -76,7 +93,7 @@ exports.CfnFirewallPropsMixin = CfnFirewallPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html
  */
 class CfnFirewallPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "firewallPolicy", "firewallPolicyName", "tags"];
     props;
     strategy;
@@ -98,8 +115,11 @@ class CfnFirewallPolicyPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFirewallPolicyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -112,16 +132,55 @@ class CfnFirewallPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFirewallPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFirewallPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFirewallPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFirewallPolicyPropsMixin = CfnFirewallPolicyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFirewallPolicyPropsMixinStatelessRuleGroupReferenceProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        priority: (!props.priority ? undefined : props.priority),
+        resourceArn: (!props.resourceArn ? undefined : cdk.getRefProperty(props.resourceArn?.ruleGroupRef, 'ruleGroupArn') ?? cdk.ensureStringOrUndefined(props.resourceArn, "resourceArn", "networkfirewall.IRuleGroupRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFirewallPolicyPropsMixinStatefulRuleGroupReferenceProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deepThreatInspection: (!props.deepThreatInspection ? undefined : props.deepThreatInspection),
+        override: (!props.override ? undefined : props.override),
+        priority: (!props.priority ? undefined : props.priority),
+        resourceArn: (!props.resourceArn ? undefined : cdk.getRefProperty(props.resourceArn?.ruleGroupRef, 'ruleGroupArn') ?? cdk.ensureStringOrUndefined(props.resourceArn, "resourceArn", "networkfirewall.IRuleGroupRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFirewallPolicyPropsMixinFirewallPolicyProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        enableTlsSessionHolding: (!props.enableTlsSessionHolding ? undefined : props.enableTlsSessionHolding),
+        policyVariables: (!props.policyVariables ? undefined : props.policyVariables),
+        statefulDefaultActions: (!props.statefulDefaultActions ? undefined : props.statefulDefaultActions),
+        statefulEngineOptions: (!props.statefulEngineOptions ? undefined : props.statefulEngineOptions),
+        statefulRuleGroupReferences: (!props.statefulRuleGroupReferences ? undefined : (cdk.isResolvableObject(props.statefulRuleGroupReferences) ? props.statefulRuleGroupReferences : (!props.statefulRuleGroupReferences ? undefined : cdk.mapArrayInPlace(props.statefulRuleGroupReferences, (item) => flattenCfnFirewallPolicyPropsMixinStatefulRuleGroupReferenceProperty(item))))),
+        statelessCustomActions: (!props.statelessCustomActions ? undefined : props.statelessCustomActions),
+        statelessDefaultActions: (!props.statelessDefaultActions ? undefined : props.statelessDefaultActions),
+        statelessFragmentDefaultActions: (!props.statelessFragmentDefaultActions ? undefined : props.statelessFragmentDefaultActions),
+        statelessRuleGroupReferences: (!props.statelessRuleGroupReferences ? undefined : (cdk.isResolvableObject(props.statelessRuleGroupReferences) ? props.statelessRuleGroupReferences : (!props.statelessRuleGroupReferences ? undefined : cdk.mapArrayInPlace(props.statelessRuleGroupReferences, (item) => flattenCfnFirewallPolicyPropsMixinStatelessRuleGroupReferenceProperty(item))))),
+        tlsInspectionConfigurationArn: (!props.tlsInspectionConfigurationArn ? undefined : props.tlsInspectionConfigurationArn)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFirewallPolicyMixinProps(props) {
+    const ret = {};
+    if ((props.firewallPolicy !== undefined))
+        ret.firewallPolicy = flattenCfnFirewallPolicyPropsMixinFirewallPolicyProperty(props.firewallPolicy);
+    return ret;
+}
 /**
  * Use the logging configuration to define the destinations and logging options for an firewall.
  *
@@ -141,7 +200,7 @@ exports.CfnFirewallPolicyPropsMixin = CfnFirewallPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-loggingconfiguration.html
  */
 class CfnLoggingConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnLoggingConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnLoggingConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enableMonitoringDashboard", "firewallArn", "firewallName", "loggingConfiguration"];
     props;
     strategy;
@@ -163,8 +222,11 @@ class CfnLoggingConfigurationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLoggingConfigurationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -177,16 +239,18 @@ class CfnLoggingConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLoggingConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLoggingConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLoggingConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLoggingConfigurationPropsMixin = CfnLoggingConfigurationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLoggingConfigurationMixinProps(props) {
+    const ret = {};
+    if ((props.firewallArn !== undefined))
+        ret.firewallArn = cdk.getRefProperty(props.firewallArn?.firewallRef, 'firewallArn') ?? cdk.ensureStringOrUndefined(props.firewallArn, "firewallArn", "networkfirewall.IFirewallRef | string");
+    return ret;
+}
 /**
  * Use the [](https://docs.aws.amazon.com/RuleGroup) to define a reusable collection of stateless or stateful network traffic filtering rules. You use rule groups in an firewall policy to specify the filtering behavior of an firewall.
  *
@@ -196,7 +260,7 @@ exports.CfnLoggingConfigurationPropsMixin = CfnLoggingConfigurationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html
  */
 class CfnRuleGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnRuleGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnRuleGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["capacity", "description", "ruleGroup", "ruleGroupName", "summaryConfiguration", "tags", "type"];
     props;
     strategy;
@@ -219,7 +283,7 @@ class CfnRuleGroupPropsMixin 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
@@ -232,12 +296,7 @@ class CfnRuleGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRuleGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRuleGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRuleGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -255,7 +314,7 @@ exports.CfnRuleGroupPropsMixin = CfnRuleGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-tlsinspectionconfiguration.html
  */
 class CfnTLSInspectionConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnTLSInspectionConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnTLSInspectionConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "tags", "tlsInspectionConfiguration", "tlsInspectionConfigurationName"];
     props;
     strategy;
@@ -278,7 +337,7 @@ class CfnTLSInspectionConfigurationPropsMixin 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
@@ -291,12 +350,7 @@ class CfnTLSInspectionConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTLSInspectionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTLSInspectionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTLSInspectionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -325,7 +379,7 @@ exports.CfnTLSInspectionConfigurationPropsMixin = CfnTLSInspectionConfigurationP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-vpcendpointassociation.html
  */
 class CfnVpcEndpointAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnVpcEndpointAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnVpcEndpointAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "firewallArn", "subnetMapping", "tags", "vpcId"];
     props;
     strategy;
@@ -348,7 +402,7 @@ class CfnVpcEndpointAssociationPropsMixin 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
@@ -361,12 +415,7 @@ class CfnVpcEndpointAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVpcEndpointAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVpcEndpointAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVpcEndpointAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-networkfirewall/logs-delivery-mixins.generated.js

@@ -15,7 +15,7 @@ const service = require("aws-cdk-lib/aws-networkfirewall");
  * @stability external
  */
 class CfnFirewallAlertLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallAlertLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallAlertLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -112,7 +112,7 @@ exports.CfnFirewallAlertLogs = CfnFirewallAlertLogs;
  * @stability external
  */
 class CfnFirewallFlowLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallFlowLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallFlowLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -209,7 +209,7 @@ exports.CfnFirewallFlowLogs = CfnFirewallFlowLogs;
  * @stability external
  */
 class CfnFirewallTlsLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallTlsLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallTlsLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -309,7 +309,7 @@ exports.CfnFirewallTlsLogs = CfnFirewallTlsLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html
  */
 class CfnFirewallLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallLogsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallLogsMixin", version: "2.242.0-alpha.0" };
     static ALERT_LOGS = new CfnFirewallAlertLogs();
     static FLOW_LOGS = new CfnFirewallFlowLogs();
     static TLS_LOGS = new CfnFirewallTlsLogs();
@@ -357,7 +357,7 @@ exports.CfnFirewallLogsMixin = CfnFirewallLogsMixin;
  * Output Format options for each destination of CfnFirewallAlertLogs.
  */
 class CfnFirewallAlertLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallAlertLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallAlertLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnFirewallAlertLogsOutputFormat = CfnFirewallAlertLogsOutputFormat;
 (function (CfnFirewallAlertLogsOutputFormat) {
@@ -384,7 +384,7 @@ exports.CfnFirewallAlertLogsOutputFormat = CfnFirewallAlertLogsOutputFormat;
  * Output Format options for each destination of CfnFirewallFlowLogs.
  */
 class CfnFirewallFlowLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallFlowLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallFlowLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnFirewallFlowLogsOutputFormat = CfnFirewallFlowLogsOutputFormat;
 (function (CfnFirewallFlowLogsOutputFormat) {
@@ -411,7 +411,7 @@ exports.CfnFirewallFlowLogsOutputFormat = CfnFirewallFlowLogsOutputFormat;
  * Output Format options for each destination of CfnFirewallTlsLogs.
  */
 class CfnFirewallTlsLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallTlsLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_networkfirewall.mixins.CfnFirewallTlsLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnFirewallTlsLogsOutputFormat = CfnFirewallTlsLogsOutputFormat;
 (function (CfnFirewallTlsLogsOutputFormat) {

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

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

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

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

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

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