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

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

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

package/lib/services/aws-vpclattice/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-vpclattice";
+import { aws_ec2 as ec2Refs } from "aws-cdk-lib/interfaces";
 /**
  * Enables access logs to be sent to Amazon CloudWatch, Amazon S3, and Amazon Kinesis Data Firehose.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-vpclattice";
 export declare class CfnAccessLogSubscriptionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccessLogSubscriptionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::AccessLogSubscription`.
      *
@@ -80,7 +81,7 @@ export interface CfnAccessLogSubscriptionMixinProps {
 export declare class CfnAuthPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAuthPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::AuthPolicy`.
      *
@@ -131,7 +132,7 @@ export interface CfnAuthPolicyMixinProps {
 export declare class CfnListenerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnListenerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::Listener`.
      *
@@ -302,7 +303,7 @@ export interface CfnListenerMixinProps {
 export declare class CfnResourcePolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourcePolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ResourcePolicy`.
      *
@@ -353,7 +354,7 @@ export interface CfnResourcePolicyMixinProps {
 export declare class CfnRulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRuleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::Rule`.
      *
@@ -678,7 +679,7 @@ export interface CfnRuleMixinProps {
 export declare class CfnServicePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::Service`.
      *
@@ -788,7 +789,7 @@ export interface CfnServiceMixinProps {
 export declare class CfnServiceNetworkPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceNetworkMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ServiceNetwork`.
      *
@@ -882,7 +883,7 @@ export interface CfnServiceNetworkMixinProps {
 export declare class CfnServiceNetworkServiceAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceNetworkServiceAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ServiceNetworkServiceAssociation`.
      *
@@ -976,7 +977,7 @@ export interface CfnServiceNetworkServiceAssociationMixinProps {
 export declare class CfnServiceNetworkVpcAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceNetworkVpcAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ServiceNetworkVpcAssociation`.
      *
@@ -1084,7 +1085,7 @@ export interface CfnServiceNetworkVpcAssociationMixinProps {
 export declare class CfnTargetGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTargetGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::TargetGroup`.
      *
@@ -1355,7 +1356,7 @@ export interface CfnTargetGroupMixinProps {
 export declare class CfnDomainVerificationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDomainVerificationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::DomainVerification`.
      *
@@ -1429,7 +1430,7 @@ export interface CfnDomainVerificationMixinProps {
 export declare class CfnResourceConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourceConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ResourceConfiguration`.
      *
@@ -1617,7 +1618,7 @@ export interface CfnResourceConfigurationMixinProps {
 export declare class CfnResourceGatewayPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourceGatewayMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ResourceGateway`.
      *
@@ -1665,13 +1666,13 @@ export interface CfnResourceGatewayMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcegateway.html#cfn-vpclattice-resourcegateway-securitygroupids
      */
-    readonly securityGroupIds?: Array<string>;
+    readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
     /**
      * The IDs of the VPC subnets for the resource gateway.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcegateway.html#cfn-vpclattice-resourcegateway-subnetids
      */
-    readonly subnetIds?: Array<string>;
+    readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * The tags for the resource gateway.
      *
@@ -1698,7 +1699,7 @@ export interface CfnResourceGatewayMixinProps {
 export declare class CfnServiceNetworkResourceAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceNetworkResourceAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::VpcLattice::ServiceNetworkResourceAssociation`.
      *

package/lib/services/aws-vpclattice/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-vpclattice");
 /**
  * Enables access logs to be sent to Amazon CloudWatch, Amazon S3, and Amazon Kinesis Data Firehose.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-vpclattice");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-accesslogsubscription.html
  */
 class CfnAccessLogSubscriptionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnAccessLogSubscriptionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnAccessLogSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destinationArn", "resourceIdentifier", "serviceNetworkLogType", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnAccessLogSubscriptionPropsMixin 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 CfnAccessLogSubscriptionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessLogSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessLogSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessLogSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnAccessLogSubscriptionPropsMixin = CfnAccessLogSubscriptionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-authpolicy.html
  */
 class CfnAuthPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnAuthPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnAuthPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policy", "resourceIdentifier"];
     props;
     strategy;
@@ -99,7 +93,7 @@ class CfnAuthPolicyPropsMixin 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
@@ -112,12 +106,7 @@ class CfnAuthPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAuthPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAuthPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAuthPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,7 +122,7 @@ exports.CfnAuthPolicyPropsMixin = CfnAuthPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-listener.html
  */
 class CfnListenerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnListenerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnListenerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["defaultAction", "name", "port", "protocol", "serviceIdentifier", "tags"];
     props;
     strategy;
@@ -156,7 +145,7 @@ class CfnListenerPropsMixin 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
@@ -169,12 +158,7 @@ class CfnListenerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnListenerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnListenerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnListenerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -190,7 +174,7 @@ exports.CfnListenerPropsMixin = CfnListenerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcepolicy.html
  */
 class CfnResourcePolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourcePolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourcePolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policy", "resourceArn"];
     props;
     strategy;
@@ -213,7 +197,7 @@ class CfnResourcePolicyPropsMixin 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
@@ -226,12 +210,7 @@ class CfnResourcePolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -247,7 +226,7 @@ exports.CfnResourcePolicyPropsMixin = CfnResourcePolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-rule.html
  */
 class CfnRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["action", "listenerIdentifier", "match", "name", "priority", "serviceIdentifier", "tags"];
     props;
     strategy;
@@ -270,7 +249,7 @@ class CfnRulePropsMixin 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
@@ -283,12 +262,7 @@ class CfnRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -306,7 +280,7 @@ exports.CfnRulePropsMixin = CfnRulePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-service.html
  */
 class CfnServicePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServicePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServicePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authType", "certificateArn", "customDomainName", "dnsEntry", "name", "tags"];
     props;
     strategy;
@@ -329,7 +303,7 @@ class CfnServicePropsMixin 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
@@ -342,12 +316,7 @@ class CfnServicePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServicePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServicePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServicePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -365,7 +334,7 @@ exports.CfnServicePropsMixin = CfnServicePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetwork.html
  */
 class CfnServiceNetworkPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authType", "name", "sharingConfig", "tags"];
     props;
     strategy;
@@ -388,7 +357,7 @@ class CfnServiceNetworkPropsMixin 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
@@ -401,12 +370,7 @@ class CfnServiceNetworkPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServiceNetworkPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServiceNetworkPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServiceNetworkPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -428,7 +392,7 @@ exports.CfnServiceNetworkPropsMixin = CfnServiceNetworkPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkserviceassociation.html
  */
 class CfnServiceNetworkServiceAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkServiceAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkServiceAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dnsEntry", "serviceIdentifier", "serviceNetworkIdentifier", "tags"];
     props;
     strategy;
@@ -451,7 +415,7 @@ class CfnServiceNetworkServiceAssociationPropsMixin 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
@@ -464,12 +428,7 @@ class CfnServiceNetworkServiceAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServiceNetworkServiceAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServiceNetworkServiceAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServiceNetworkServiceAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -491,7 +450,7 @@ exports.CfnServiceNetworkServiceAssociationPropsMixin = CfnServiceNetworkService
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkvpcassociation.html
  */
 class CfnServiceNetworkVpcAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkVpcAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkVpcAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dnsOptions", "privateDnsEnabled", "securityGroupIds", "serviceNetworkIdentifier", "tags", "vpcIdentifier"];
     props;
     strategy;
@@ -514,7 +473,7 @@ class CfnServiceNetworkVpcAssociationPropsMixin 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
@@ -527,12 +486,7 @@ class CfnServiceNetworkVpcAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServiceNetworkVpcAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServiceNetworkVpcAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServiceNetworkVpcAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -550,7 +504,7 @@ exports.CfnServiceNetworkVpcAssociationPropsMixin = CfnServiceNetworkVpcAssociat
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-targetgroup.html
  */
 class CfnTargetGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnTargetGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnTargetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["config", "name", "tags", "targets", "type"];
     props;
     strategy;
@@ -573,7 +527,7 @@ class CfnTargetGroupPropsMixin 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
@@ -586,12 +540,7 @@ class CfnTargetGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTargetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTargetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTargetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -607,7 +556,7 @@ exports.CfnTargetGroupPropsMixin = CfnTargetGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-domainverification.html
  */
 class CfnDomainVerificationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnDomainVerificationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnDomainVerificationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["domainName", "tags"];
     props;
     strategy;
@@ -630,7 +579,7 @@ class CfnDomainVerificationPropsMixin 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
@@ -643,12 +592,7 @@ class CfnDomainVerificationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainVerificationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainVerificationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainVerificationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -664,7 +608,7 @@ exports.CfnDomainVerificationPropsMixin = CfnDomainVerificationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourceconfiguration.html
  */
 class CfnResourceConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourceConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourceConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allowAssociationToSharableServiceNetwork", "customDomainName", "domainVerificationId", "groupDomain", "name", "portRanges", "protocolType", "resourceConfigurationAuthType", "resourceConfigurationDefinition", "resourceConfigurationGroupId", "resourceConfigurationType", "resourceGatewayId", "tags"];
     props;
     strategy;
@@ -687,7 +631,7 @@ class CfnResourceConfigurationPropsMixin 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
@@ -700,12 +644,7 @@ class CfnResourceConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourceConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourceConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourceConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -721,7 +660,7 @@ exports.CfnResourceConfigurationPropsMixin = CfnResourceConfigurationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcegateway.html
  */
 class CfnResourceGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourceGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourceGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["ipAddressType", "ipv4AddressesPerEni", "name", "securityGroupIds", "subnetIds", "tags", "vpcIdentifier"];
     props;
     strategy;
@@ -743,8 +682,11 @@ class CfnResourceGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResourceGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -757,16 +699,20 @@ class CfnResourceGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourceGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourceGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourceGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResourceGatewayPropsMixin = CfnResourceGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResourceGatewayMixinProps(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"));
+    return ret;
+}
 /**
  * Associates the specified service network with the specified resource configuration.
  *
@@ -778,7 +724,7 @@ exports.CfnResourceGatewayPropsMixin = CfnResourceGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkresourceassociation.html
  */
 class CfnServiceNetworkResourceAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkResourceAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkResourceAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["privateDnsEnabled", "resourceConfigurationId", "serviceNetworkId", "tags"];
     props;
     strategy;
@@ -801,7 +747,7 @@ class CfnServiceNetworkResourceAssociationPropsMixin 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
@@ -814,12 +760,7 @@ class CfnServiceNetworkResourceAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServiceNetworkResourceAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServiceNetworkResourceAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServiceNetworkResourceAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }