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

package/lib/services/aws-elasticloadbalancingv2/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-elasticloadbalancingv2");
 /**
  * Specifies a listener for an Application Load Balancer, Network Load Balancer, or Gateway Load Balancer.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-elasticloadbalancingv2");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
  */
 class CfnListenerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnListenerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnListenerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["alpnPolicy", "certificates", "defaultActions", "listenerAttributes", "loadBalancerArn", "mutualAuthentication", "port", "protocol", "sslPolicy"];
     props;
     strategy;
@@ -39,8 +38,11 @@ class CfnListenerPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnListenerMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -53,16 +55,79 @@ 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);
         }
     }
 }
 exports.CfnListenerPropsMixin = CfnListenerPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnListenerPropsMixinAuthenticateCognitoConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authenticationRequestExtraParams: (!props.authenticationRequestExtraParams ? undefined : props.authenticationRequestExtraParams),
+        onUnauthenticatedRequest: (!props.onUnauthenticatedRequest ? undefined : props.onUnauthenticatedRequest),
+        scope: (!props.scope ? undefined : props.scope),
+        sessionCookieName: (!props.sessionCookieName ? undefined : props.sessionCookieName),
+        sessionTimeout: (!props.sessionTimeout ? undefined : props.sessionTimeout),
+        userPoolArn: (!props.userPoolArn ? undefined : cdk.getRefProperty(props.userPoolArn?.userPoolRef, 'userPoolArn') ?? cdk.ensureStringOrUndefined(props.userPoolArn, "userPoolArn", "cognito.IUserPoolRef | string")),
+        userPoolClientId: (!props.userPoolClientId ? undefined : cdk.getRefProperty(props.userPoolClientId?.userPoolClientRef, 'userPoolId') ?? cdk.getRefProperty(props.userPoolClientId?.userPoolClientRef, 'clientId') ?? cdk.ensureStringOrUndefined(props.userPoolClientId, "userPoolClientId", "cognito.IUserPoolClientRef | string")),
+        userPoolDomain: (!props.userPoolDomain ? undefined : props.userPoolDomain)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerPropsMixinTargetGroupTupleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        targetGroupArn: (!props.targetGroupArn ? undefined : cdk.getRefProperty(props.targetGroupArn?.targetGroupRef, 'targetGroupArn') ?? cdk.ensureStringOrUndefined(props.targetGroupArn, "targetGroupArn", "elasticloadbalancingv2.ITargetGroupRef | string")),
+        weight: (!props.weight ? undefined : props.weight)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerPropsMixinForwardConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        targetGroups: (!props.targetGroups ? undefined : (cdk.isResolvableObject(props.targetGroups) ? props.targetGroups : (!props.targetGroups ? undefined : cdk.mapArrayInPlace(props.targetGroups, (item) => flattenCfnListenerPropsMixinTargetGroupTupleProperty(item))))),
+        targetGroupStickinessConfig: (!props.targetGroupStickinessConfig ? undefined : props.targetGroupStickinessConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerPropsMixinActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authenticateCognitoConfig: (!props.authenticateCognitoConfig ? undefined : (!props.authenticateCognitoConfig ? undefined : flattenCfnListenerPropsMixinAuthenticateCognitoConfigProperty(props.authenticateCognitoConfig))),
+        authenticateOidcConfig: (!props.authenticateOidcConfig ? undefined : props.authenticateOidcConfig),
+        fixedResponseConfig: (!props.fixedResponseConfig ? undefined : props.fixedResponseConfig),
+        forwardConfig: (!props.forwardConfig ? undefined : (!props.forwardConfig ? undefined : flattenCfnListenerPropsMixinForwardConfigProperty(props.forwardConfig))),
+        jwtValidationConfig: (!props.jwtValidationConfig ? undefined : props.jwtValidationConfig),
+        order: (!props.order ? undefined : props.order),
+        redirectConfig: (!props.redirectConfig ? undefined : props.redirectConfig),
+        targetGroupArn: (!props.targetGroupArn ? undefined : cdk.getRefProperty(props.targetGroupArn?.targetGroupRef, 'targetGroupArn') ?? cdk.ensureStringOrUndefined(props.targetGroupArn, "targetGroupArn", "elasticloadbalancingv2.ITargetGroupRef | string")),
+        type: (!props.type ? undefined : props.type)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerPropsMixinCertificateProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        certificateArn: (!props.certificateArn ? undefined : cdk.getRefProperty(props.certificateArn?.serverCertificateRef, 'serverCertificateArn') ?? cdk.getRefProperty(props.certificateArn?.certificateRef, 'certificateId') ?? cdk.ensureStringOrUndefined(props.certificateArn, "certificateArn", "certificatemanager.ICertificateRef | iam.IServerCertificateRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerMixinProps(props) {
+    const ret = {};
+    if ((props.certificates !== undefined))
+        ret.certificates = (cdk.isResolvableObject(props.certificates) ? props.certificates : cdk.mapArrayInPlace(props.certificates, (item) => flattenCfnListenerPropsMixinCertificateProperty(item)));
+    if ((props.defaultActions !== undefined))
+        ret.defaultActions = (cdk.isResolvableObject(props.defaultActions) ? props.defaultActions : cdk.mapArrayInPlace(props.defaultActions, (item) => flattenCfnListenerPropsMixinActionProperty(item)));
+    if ((props.loadBalancerArn !== undefined))
+        ret.loadBalancerArn = cdk.getRefProperty(props.loadBalancerArn?.loadBalancerRef, 'loadBalancerArn') ?? cdk.ensureStringOrUndefined(props.loadBalancerArn, "loadBalancerArn", "elasticloadbalancingv2.ILoadBalancerRef | string");
+    return ret;
+}
 /**
  * Specifies an SSL server certificate to add to the certificate list for an HTTPS or TLS listener.
  *
@@ -72,7 +137,7 @@ exports.CfnListenerPropsMixin = CfnListenerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html
  */
 class CfnListenerCertificatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnListenerCertificatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnListenerCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificates", "listenerArn"];
     props;
     strategy;
@@ -95,7 +160,7 @@ class CfnListenerCertificatePropsMixin 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
@@ -108,12 +173,7 @@ class CfnListenerCertificatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnListenerCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnListenerCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnListenerCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -131,7 +191,7 @@ exports.CfnListenerCertificatePropsMixin = CfnListenerCertificatePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html
  */
 class CfnListenerRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnListenerRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnListenerRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["actions", "conditions", "listenerArn", "priority", "transforms"];
     props;
     strategy;
@@ -153,8 +213,11 @@ class CfnListenerRulePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnListenerRuleMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -167,16 +230,69 @@ class CfnListenerRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnListenerRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnListenerRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnListenerRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnListenerRulePropsMixin = CfnListenerRulePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnListenerRulePropsMixinAuthenticateCognitoConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authenticationRequestExtraParams: (!props.authenticationRequestExtraParams ? undefined : props.authenticationRequestExtraParams),
+        onUnauthenticatedRequest: (!props.onUnauthenticatedRequest ? undefined : props.onUnauthenticatedRequest),
+        scope: (!props.scope ? undefined : props.scope),
+        sessionCookieName: (!props.sessionCookieName ? undefined : props.sessionCookieName),
+        sessionTimeout: (!props.sessionTimeout ? undefined : props.sessionTimeout),
+        userPoolArn: (!props.userPoolArn ? undefined : cdk.getRefProperty(props.userPoolArn?.userPoolRef, 'userPoolArn') ?? cdk.ensureStringOrUndefined(props.userPoolArn, "userPoolArn", "cognito.IUserPoolRef | string")),
+        userPoolClientId: (!props.userPoolClientId ? undefined : cdk.getRefProperty(props.userPoolClientId?.userPoolClientRef, 'clientId') ?? cdk.ensureStringOrUndefined(props.userPoolClientId, "userPoolClientId", "cognito.IUserPoolClientRef | string")),
+        userPoolDomain: (!props.userPoolDomain ? undefined : props.userPoolDomain)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerRulePropsMixinTargetGroupTupleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        targetGroupArn: (!props.targetGroupArn ? undefined : cdk.getRefProperty(props.targetGroupArn?.targetGroupRef, 'targetGroupArn') ?? cdk.ensureStringOrUndefined(props.targetGroupArn, "targetGroupArn", "elasticloadbalancingv2.ITargetGroupRef | string")),
+        weight: (!props.weight ? undefined : props.weight)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerRulePropsMixinForwardConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        targetGroups: (!props.targetGroups ? undefined : (cdk.isResolvableObject(props.targetGroups) ? props.targetGroups : (!props.targetGroups ? undefined : cdk.mapArrayInPlace(props.targetGroups, (item) => flattenCfnListenerRulePropsMixinTargetGroupTupleProperty(item))))),
+        targetGroupStickinessConfig: (!props.targetGroupStickinessConfig ? undefined : props.targetGroupStickinessConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerRulePropsMixinActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authenticateCognitoConfig: (!props.authenticateCognitoConfig ? undefined : (!props.authenticateCognitoConfig ? undefined : flattenCfnListenerRulePropsMixinAuthenticateCognitoConfigProperty(props.authenticateCognitoConfig))),
+        authenticateOidcConfig: (!props.authenticateOidcConfig ? undefined : props.authenticateOidcConfig),
+        fixedResponseConfig: (!props.fixedResponseConfig ? undefined : props.fixedResponseConfig),
+        forwardConfig: (!props.forwardConfig ? undefined : (!props.forwardConfig ? undefined : flattenCfnListenerRulePropsMixinForwardConfigProperty(props.forwardConfig))),
+        jwtValidationConfig: (!props.jwtValidationConfig ? undefined : props.jwtValidationConfig),
+        order: (!props.order ? undefined : props.order),
+        redirectConfig: (!props.redirectConfig ? undefined : props.redirectConfig),
+        targetGroupArn: (!props.targetGroupArn ? undefined : cdk.getRefProperty(props.targetGroupArn?.targetGroupRef, 'targetGroupArn') ?? cdk.ensureStringOrUndefined(props.targetGroupArn, "targetGroupArn", "elasticloadbalancingv2.ITargetGroupRef | string")),
+        type: (!props.type ? undefined : props.type)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnListenerRuleMixinProps(props) {
+    const ret = {};
+    if ((props.actions !== undefined))
+        ret.actions = (cdk.isResolvableObject(props.actions) ? props.actions : cdk.mapArrayInPlace(props.actions, (item) => flattenCfnListenerRulePropsMixinActionProperty(item)));
+    if ((props.listenerArn !== undefined))
+        ret.listenerArn = cdk.getRefProperty(props.listenerArn?.listenerRef, 'listenerArn') ?? cdk.ensureStringOrUndefined(props.listenerArn, "listenerArn", "elasticloadbalancingv2.IListenerRef | string");
+    return ret;
+}
 /**
  * Specifies an Application Load Balancer, a Network Load Balancer, or a Gateway Load Balancer.
  *
@@ -186,7 +302,7 @@ exports.CfnListenerRulePropsMixin = CfnListenerRulePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
  */
 class CfnLoadBalancerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enableCapacityReservationProvisionStabilize", "enablePrefixForIpv6SourceNat", "enforceSecurityGroupInboundRulesOnPrivateLinkTraffic", "ipAddressType", "ipv4IpamPoolId", "loadBalancerAttributes", "minimumLoadBalancerCapacity", "name", "scheme", "securityGroups", "subnetMappings", "subnets", "tags", "type"];
     props;
     strategy;
@@ -208,8 +324,11 @@ class CfnLoadBalancerPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLoadBalancerMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -222,16 +341,45 @@ class CfnLoadBalancerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLoadBalancerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLoadBalancerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLoadBalancerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLoadBalancerPropsMixin = CfnLoadBalancerPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLoadBalancerPropsMixinLoadBalancerAttributeProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        key: (!props.key ? undefined : props.key),
+        value: (!props.value ? undefined : cdk.getRefProperty(props.value?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.value, "value", "s3.IBucketRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLoadBalancerPropsMixinSubnetMappingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        allocationId: (!props.allocationId ? undefined : props.allocationId),
+        iPv6Address: (!props.iPv6Address ? undefined : props.iPv6Address),
+        privateIPv4Address: (!props.privateIPv4Address ? undefined : props.privateIPv4Address),
+        sourceNatIpv6Prefix: (!props.sourceNatIpv6Prefix ? undefined : props.sourceNatIpv6Prefix),
+        subnetId: (!props.subnetId ? undefined : cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLoadBalancerMixinProps(props) {
+    const ret = {};
+    if ((props.loadBalancerAttributes !== undefined))
+        ret.loadBalancerAttributes = (cdk.isResolvableObject(props.loadBalancerAttributes) ? props.loadBalancerAttributes : cdk.mapArrayInPlace(props.loadBalancerAttributes, (item) => flattenCfnLoadBalancerPropsMixinLoadBalancerAttributeProperty(item)));
+    if ((props.securityGroups !== undefined))
+        ret.securityGroups = cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"));
+    if ((props.subnetMappings !== undefined))
+        ret.subnetMappings = (cdk.isResolvableObject(props.subnetMappings) ? props.subnetMappings : cdk.mapArrayInPlace(props.subnetMappings, (item) => flattenCfnLoadBalancerPropsMixinSubnetMappingProperty(item)));
+    if ((props.subnets !== undefined))
+        ret.subnets = cdk.mapArrayInPlace(props.subnets, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnets", "ec2.ISubnetRef | string"));
+    return ret;
+}
 /**
  * Specifies a target group for an Application Load Balancer, a Network Load Balancer, or a Gateway Load Balancer.
  *
@@ -243,7 +391,7 @@ exports.CfnLoadBalancerPropsMixin = CfnLoadBalancerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
  */
 class CfnTargetGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnTargetGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnTargetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["healthCheckEnabled", "healthCheckIntervalSeconds", "healthCheckPath", "healthCheckPort", "healthCheckProtocol", "healthCheckTimeoutSeconds", "healthyThresholdCount", "ipAddressType", "matcher", "name", "port", "protocol", "protocolVersion", "tags", "targetControlPort", "targetGroupAttributes", "targets", "targetType", "unhealthyThresholdCount", "vpcId"];
     props;
     strategy;
@@ -265,8 +413,11 @@ class CfnTargetGroupPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTargetGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -279,16 +430,31 @@ 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);
         }
     }
 }
 exports.CfnTargetGroupPropsMixin = CfnTargetGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTargetGroupPropsMixinTargetDescriptionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        availabilityZone: (!props.availabilityZone ? undefined : props.availabilityZone),
+        id: (!props.id ? undefined : cdk.getRefProperty(props.id?.loadBalancerRef, 'loadBalancerArn') ?? cdk.getRefProperty(props.id?.functionRef, 'functionArn') ?? cdk.getRefProperty(props.id?.instanceRef, 'instanceId') ?? cdk.ensureStringOrUndefined(props.id, "id", "elasticloadbalancingv2.ILoadBalancerRef | ec2.IInstanceRef | lambda.IFunctionRef | string")),
+        port: (!props.port ? undefined : props.port),
+        quicServerId: (!props.quicServerId ? undefined : props.quicServerId)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTargetGroupMixinProps(props) {
+    const ret = {};
+    if ((props.targets !== undefined))
+        ret.targets = (cdk.isResolvableObject(props.targets) ? props.targets : cdk.mapArrayInPlace(props.targets, (item) => flattenCfnTargetGroupPropsMixinTargetDescriptionProperty(item)));
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Creates a trust store.
  *
@@ -300,7 +466,7 @@ exports.CfnTargetGroupPropsMixin = CfnTargetGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-truststore.html
  */
 class CfnTrustStorePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnTrustStorePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnTrustStorePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["caCertificatesBundleS3Bucket", "caCertificatesBundleS3Key", "caCertificatesBundleS3ObjectVersion", "name", "tags"];
     props;
     strategy;
@@ -323,7 +489,7 @@ class CfnTrustStorePropsMixin 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
@@ -336,12 +502,7 @@ class CfnTrustStorePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrustStorePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrustStorePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrustStorePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -357,7 +518,7 @@ exports.CfnTrustStorePropsMixin = CfnTrustStorePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-truststorerevocation.html
  */
 class CfnTrustStoreRevocationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnTrustStoreRevocationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnTrustStoreRevocationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["revocationContents", "trustStoreArn"];
     props;
     strategy;
@@ -380,7 +541,7 @@ class CfnTrustStoreRevocationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -393,12 +554,7 @@ class CfnTrustStoreRevocationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrustStoreRevocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrustStoreRevocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrustStoreRevocationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

@@ -15,7 +15,7 @@ const service = require("aws-cdk-lib/aws-elasticloadbalancingv2");
  * @stability external
  */
 class CfnLoadBalancerNlbAccessLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -124,7 +124,7 @@ exports.CfnLoadBalancerNlbAccessLogs = CfnLoadBalancerNlbAccessLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
  */
 class CfnLoadBalancerLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerLogsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerLogsMixin", version: "2.242.0-alpha.0" };
     static NLB_ACCESS_LOGS = new CfnLoadBalancerNlbAccessLogs();
     logType;
     logDelivery;
@@ -170,7 +170,7 @@ exports.CfnLoadBalancerLogsMixin = CfnLoadBalancerLogsMixin;
  * Output Format options for each destination of CfnLoadBalancerNlbAccessLogs.
  */
 class CfnLoadBalancerNlbAccessLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnLoadBalancerNlbAccessLogsOutputFormat = CfnLoadBalancerNlbAccessLogsOutputFormat;
 (function (CfnLoadBalancerNlbAccessLogsOutputFormat) {

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

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

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

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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-elasticsearch";
 export declare class CfnDomainPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDomainMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Elasticsearch::Domain`.
      *

package/lib/services/aws-elasticsearch/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-elasticsearch");
 /**
  * The AWS::Elasticsearch::Domain resource creates an Amazon OpenSearch Service domain.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-elasticsearch");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html
  */
 class CfnDomainPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticsearch.mixins.CfnDomainPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticsearch.mixins.CfnDomainPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessPolicies", "advancedOptions", "advancedSecurityOptions", "cognitoOptions", "domainArn", "domainEndpointOptions", "domainName", "ebsOptions", "elasticsearchClusterConfig", "elasticsearchVersion", "encryptionAtRestOptions", "logPublishingOptions", "nodeToNodeEncryptionOptions", "snapshotOptions", "tags", "vpcOptions"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnDomainPropsMixin 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 CfnDomainPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

@@ -0,0 +1,16 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.mixins.preview.services.emr.events"
+    },
+    "dotnet": {
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.EMR.Events"
+    },
+    "python": {
+      "module": "aws_cdk.mixins_preview.aws_emr.events"
+    },
+    "go": {
+      "packageName": "previewawsemrevents"
+    }
+  }
+}

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

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

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

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