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

package/lib/services/aws-vpclattice/cfn-props-mixins.generated.js

@@ -5,9 +5,7 @@ const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-vpclattice");
 /**
  * Enables access logs to be sent to Amazon CloudWatch, Amazon S3, and Amazon Kinesis Data Firehose.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-vpclattice");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-accesslogsubscription.html
  */
-class CfnAccessLogSubscriptionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnAccessLogSubscriptionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAccessLogSubscriptionPropsMixin extends cdk.Mixin {
+    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;
@@ -43,7 +41,7 @@ class CfnAccessLogSubscriptionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,12 +54,7 @@ class CfnAccessLogSubscriptionPropsMixin extends core.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,8 +69,8 @@ exports.CfnAccessLogSubscriptionPropsMixin = CfnAccessLogSubscriptionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-authpolicy.html
  */
-class CfnAuthPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnAuthPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAuthPolicyPropsMixin extends cdk.Mixin {
+    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;
@@ -100,7 +93,7 @@ class CfnAuthPolicyPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -113,12 +106,7 @@ class CfnAuthPolicyPropsMixin extends core.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,8 +121,8 @@ exports.CfnAuthPolicyPropsMixin = CfnAuthPolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-listener.html
  */
-class CfnListenerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnListenerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnListenerPropsMixin extends cdk.Mixin {
+    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;
@@ -157,7 +145,7 @@ class CfnListenerPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -170,12 +158,7 @@ class CfnListenerPropsMixin extends core.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,8 +173,8 @@ exports.CfnListenerPropsMixin = CfnListenerPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcepolicy.html
  */
-class CfnResourcePolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourcePolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourcePolicyPropsMixin extends cdk.Mixin {
+    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;
@@ -214,7 +197,7 @@ class CfnResourcePolicyPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -227,12 +210,7 @@ class CfnResourcePolicyPropsMixin extends core.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,8 +225,8 @@ exports.CfnResourcePolicyPropsMixin = CfnResourcePolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-rule.html
  */
-class CfnRulePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnRulePropsMixin", version: "2.240.0-alpha.0" };
+class CfnRulePropsMixin extends cdk.Mixin {
+    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;
@@ -271,7 +249,7 @@ class CfnRulePropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -284,12 +262,7 @@ class CfnRulePropsMixin extends core.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,8 +279,8 @@ exports.CfnRulePropsMixin = CfnRulePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-service.html
  */
-class CfnServicePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServicePropsMixin", version: "2.240.0-alpha.0" };
+class CfnServicePropsMixin extends cdk.Mixin {
+    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;
@@ -330,7 +303,7 @@ class CfnServicePropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -343,12 +316,7 @@ class CfnServicePropsMixin extends core.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,8 +333,8 @@ exports.CfnServicePropsMixin = CfnServicePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetwork.html
  */
-class CfnServiceNetworkPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkPropsMixin", version: "2.240.0-alpha.0" };
+class CfnServiceNetworkPropsMixin extends cdk.Mixin {
+    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;
@@ -389,7 +357,7 @@ class CfnServiceNetworkPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -402,12 +370,7 @@ class CfnServiceNetworkPropsMixin extends core.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,8 +391,8 @@ exports.CfnServiceNetworkPropsMixin = CfnServiceNetworkPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkserviceassociation.html
  */
-class CfnServiceNetworkServiceAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkServiceAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnServiceNetworkServiceAssociationPropsMixin extends cdk.Mixin {
+    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;
@@ -452,7 +415,7 @@ class CfnServiceNetworkServiceAssociationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -465,12 +428,7 @@ class CfnServiceNetworkServiceAssociationPropsMixin extends core.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,8 +449,8 @@ exports.CfnServiceNetworkServiceAssociationPropsMixin = CfnServiceNetworkService
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkvpcassociation.html
  */
-class CfnServiceNetworkVpcAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkVpcAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnServiceNetworkVpcAssociationPropsMixin extends cdk.Mixin {
+    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;
@@ -515,7 +473,7 @@ class CfnServiceNetworkVpcAssociationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -528,12 +486,7 @@ class CfnServiceNetworkVpcAssociationPropsMixin extends core.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,8 +503,8 @@ exports.CfnServiceNetworkVpcAssociationPropsMixin = CfnServiceNetworkVpcAssociat
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-targetgroup.html
  */
-class CfnTargetGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnTargetGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnTargetGroupPropsMixin extends cdk.Mixin {
+    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;
@@ -574,7 +527,7 @@ class CfnTargetGroupPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -587,12 +540,7 @@ class CfnTargetGroupPropsMixin extends core.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,8 +555,8 @@ exports.CfnTargetGroupPropsMixin = CfnTargetGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-domainverification.html
  */
-class CfnDomainVerificationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnDomainVerificationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainVerificationPropsMixin extends cdk.Mixin {
+    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;
@@ -631,7 +579,7 @@ class CfnDomainVerificationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -644,12 +592,7 @@ class CfnDomainVerificationPropsMixin extends core.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,8 +607,8 @@ exports.CfnDomainVerificationPropsMixin = CfnDomainVerificationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourceconfiguration.html
  */
-class CfnResourceConfigurationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourceConfigurationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourceConfigurationPropsMixin extends cdk.Mixin {
+    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;
@@ -688,7 +631,7 @@ class CfnResourceConfigurationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -701,12 +644,7 @@ class CfnResourceConfigurationPropsMixin extends core.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,8 +659,8 @@ exports.CfnResourceConfigurationPropsMixin = CfnResourceConfigurationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcegateway.html
  */
-class CfnResourceGatewayPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnResourceGatewayPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourceGatewayPropsMixin extends cdk.Mixin {
+    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;
@@ -744,8 +682,11 @@ class CfnResourceGatewayPropsMixin extends core.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
@@ -758,16 +699,20 @@ class CfnResourceGatewayPropsMixin extends core.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,8 +723,8 @@ exports.CfnResourceGatewayPropsMixin = CfnResourceGatewayPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkresourceassociation.html
  */
-class CfnServiceNetworkResourceAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_vpclattice.mixins.CfnServiceNetworkResourceAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnServiceNetworkResourceAssociationPropsMixin extends cdk.Mixin {
+    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;
@@ -802,7 +747,7 @@ class CfnServiceNetworkResourceAssociationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -815,12 +760,7 @@ class CfnServiceNetworkResourceAssociationPropsMixin extends core.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);
         }
     }
 }

package/lib/services/aws-vpclattice/logs-delivery-mixins.generated.d.ts

@@ -1,6 +1,6 @@
+import * as cdk from "aws-cdk-lib/core";
 import * as interfaces from "aws-cdk-lib/interfaces";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as logsDelivery from "../aws-logs/logs-delivery";
 import * as service from "aws-cdk-lib/aws-vpclattice";
 /**
@@ -13,16 +13,22 @@ import * as service from "aws-cdk-lib/aws-vpclattice";
 export declare class CfnServiceAccessLogs {
     /**
      * Send logs to an S3 Bucket
+     *
+     * @param props Additional properties that are optionally used in log delivery for S3 destinations
      */
-    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: logsDelivery.IS3LogsDestinationProps): CfnServiceLogsMixin;
+    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: CfnServiceAccessLogsS3Props): CfnServiceLogsMixin;
     /**
      * Send logs to a CloudWatch Log Group
+     *
+     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
      */
-    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef): CfnServiceLogsMixin;
+    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef, props?: CfnServiceAccessLogsLogGroupProps): CfnServiceLogsMixin;
     /**
      * Send logs to a Firehose Delivery Stream
+     *
+     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
      */
-    toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef): CfnServiceLogsMixin;
+    toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef, props?: CfnServiceAccessLogsFirehoseProps): CfnServiceLogsMixin;
     /**
      * Delivers logs to a pre-created delivery destination
      *
@@ -44,7 +50,7 @@ export declare class CfnServiceAccessLogs {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-service.html
  */
-export declare class CfnServiceLogsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnServiceLogsMixin extends cdk.Mixin implements constructs.IMixin {
     static readonly ACCESS_LOGS: CfnServiceAccessLogs;
     protected readonly logType: string;
     protected readonly logDelivery: logsDelivery.ILogsDelivery;
@@ -64,6 +70,50 @@ export declare class CfnServiceLogsMixin extends core.Mixin implements core.IMix
      */
     applyTo(resource: constructs.IConstruct): void;
 }
+/**
+ * Output Format options for each destination of CfnServiceAccessLogs.
+ */
+export declare class CfnServiceAccessLogsOutputFormat {
+}
+export declare namespace CfnServiceAccessLogsOutputFormat {
+    enum S3 {
+        JSON = "json",
+        PLAIN = "plain",
+        W3C = "w3c",
+        PARQUET = "parquet"
+    }
+    enum LogGroup {
+        PLAIN = "plain",
+        JSON = "json"
+    }
+    enum Firehose {
+        JSON = "json",
+        PLAIN = "plain",
+        RAW = "raw"
+    }
+}
+export interface CfnServiceAccessLogsS3Props {
+    /**
+     * Encrpytion key for your delivery bucket
+     */
+    readonly encryptionKey?: interfaces.aws_kms.IKeyRef;
+    /**
+     * Format for log output, options are json,plain,w3c,parquet
+     */
+    readonly outputFormat?: CfnServiceAccessLogsOutputFormat.S3;
+}
+export interface CfnServiceAccessLogsLogGroupProps {
+    /**
+     * Format for log output, options are plain,json
+     */
+    readonly outputFormat?: CfnServiceAccessLogsOutputFormat.LogGroup;
+}
+export interface CfnServiceAccessLogsFirehoseProps {
+    /**
+     * Format for log output, options are json,plain,raw
+     */
+    readonly outputFormat?: CfnServiceAccessLogsOutputFormat.Firehose;
+}
 /**
  * Builder for CfnResourceConfigurationLogsMixin to generate RESOURCE_ACCESS_LOGS for CfnResourceConfiguration
  *
@@ -74,16 +124,22 @@ export declare class CfnServiceLogsMixin extends core.Mixin implements core.IMix
 export declare class CfnResourceConfigurationResourceAccessLogs {
     /**
      * Send logs to an S3 Bucket
+     *
+     * @param props Additional properties that are optionally used in log delivery for S3 destinations
      */
-    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: logsDelivery.IS3LogsDestinationProps): CfnResourceConfigurationLogsMixin;
+    toS3(bucket: interfaces.aws_s3.IBucketRef, props?: CfnResourceConfigurationResourceAccessLogsS3Props): CfnResourceConfigurationLogsMixin;
     /**
      * Send logs to a CloudWatch Log Group
+     *
+     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
      */
-    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef): CfnResourceConfigurationLogsMixin;
+    toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef, props?: CfnResourceConfigurationResourceAccessLogsLogGroupProps): CfnResourceConfigurationLogsMixin;
     /**
      * Send logs to a Firehose Delivery Stream
+     *
+     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
      */
-    toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef): CfnResourceConfigurationLogsMixin;
+    toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef, props?: CfnResourceConfigurationResourceAccessLogsFirehoseProps): CfnResourceConfigurationLogsMixin;
     /**
      * Delivers logs to a pre-created delivery destination
      *
@@ -103,7 +159,7 @@ export declare class CfnResourceConfigurationResourceAccessLogs {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourceconfiguration.html
  */
-export declare class CfnResourceConfigurationLogsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnResourceConfigurationLogsMixin extends cdk.Mixin implements constructs.IMixin {
     static readonly RESOURCE_ACCESS_LOGS: CfnResourceConfigurationResourceAccessLogs;
     protected readonly logType: string;
     protected readonly logDelivery: logsDelivery.ILogsDelivery;
@@ -123,3 +179,47 @@ export declare class CfnResourceConfigurationLogsMixin extends core.Mixin implem
      */
     applyTo(resource: constructs.IConstruct): void;
 }
+/**
+ * Output Format options for each destination of CfnResourceConfigurationResourceAccessLogs.
+ */
+export declare class CfnResourceConfigurationResourceAccessLogsOutputFormat {
+}
+export declare namespace CfnResourceConfigurationResourceAccessLogsOutputFormat {
+    enum S3 {
+        JSON = "json",
+        PLAIN = "plain",
+        W3C = "w3c",
+        PARQUET = "parquet"
+    }
+    enum LogGroup {
+        PLAIN = "plain",
+        JSON = "json"
+    }
+    enum Firehose {
+        JSON = "json",
+        PLAIN = "plain",
+        RAW = "raw"
+    }
+}
+export interface CfnResourceConfigurationResourceAccessLogsS3Props {
+    /**
+     * Encrpytion key for your delivery bucket
+     */
+    readonly encryptionKey?: interfaces.aws_kms.IKeyRef;
+    /**
+     * Format for log output, options are json,plain,w3c,parquet
+     */
+    readonly outputFormat?: CfnResourceConfigurationResourceAccessLogsOutputFormat.S3;
+}
+export interface CfnResourceConfigurationResourceAccessLogsLogGroupProps {
+    /**
+     * Format for log output, options are plain,json
+     */
+    readonly outputFormat?: CfnResourceConfigurationResourceAccessLogsOutputFormat.LogGroup;
+}
+export interface CfnResourceConfigurationResourceAccessLogsFirehoseProps {
+    /**
+     * Format for log output, options are json,plain,raw
+     */
+    readonly outputFormat?: CfnResourceConfigurationResourceAccessLogsOutputFormat.Firehose;
+}