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

package/lib/services/aws-apigateway/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-apigateway");
 /**
  * The `AWS::ApiGateway::Account` resource specifies the IAM role that Amazon API Gateway uses to write API logs to Amazon CloudWatch Logs.
@@ -21,8 +19,8 @@ const service = require("aws-cdk-lib/aws-apigateway");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-account.html
  */
-class CfnAccountPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnAccountPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAccountPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnAccountPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cloudWatchRoleArn"];
     props;
     strategy;
@@ -44,8 +42,11 @@ class CfnAccountPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAccountMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -58,16 +59,18 @@ class CfnAccountPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccountPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccountPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccountPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAccountPropsMixin = CfnAccountPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAccountMixinProps(props) {
+    const ret = {};
+    if ((props.cloudWatchRoleArn !== undefined))
+        ret.cloudWatchRoleArn = cdk.getRefProperty(props.cloudWatchRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.cloudWatchRoleArn, "cloudWatchRoleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::ApiKey` resource creates a unique key that you can distribute to clients who are executing API Gateway `Method` resources that require an API key.
  *
@@ -78,8 +81,8 @@ exports.CfnAccountPropsMixin = CfnAccountPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html
  */
-class CfnApiKeyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnApiKeyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnApiKeyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnApiKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["customerId", "description", "enabled", "generateDistinctId", "name", "stageKeys", "tags", "value"];
     props;
     strategy;
@@ -101,8 +104,11 @@ class CfnApiKeyPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnApiKeyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -115,16 +121,27 @@ class CfnApiKeyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApiKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApiKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApiKeyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnApiKeyPropsMixin = CfnApiKeyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnApiKeyPropsMixinStageKeyProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        restApiId: (!props.restApiId ? undefined : cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string")),
+        stageName: (!props.stageName ? undefined : cdk.getRefProperty(props.stageName?.stageRef, 'stageName') ?? cdk.ensureStringOrUndefined(props.stageName, "stageName", "apigateway.IStageRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnApiKeyMixinProps(props) {
+    const ret = {};
+    if ((props.stageKeys !== undefined))
+        ret.stageKeys = (cdk.isResolvableObject(props.stageKeys) ? props.stageKeys : cdk.mapArrayInPlace(props.stageKeys, (item) => flattenCfnApiKeyPropsMixinStageKeyProperty(item)));
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::Authorizer` resource creates an authorization layer that API Gateway activates for methods that have authorization enabled.
  *
@@ -135,8 +152,8 @@ exports.CfnApiKeyPropsMixin = CfnApiKeyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html
  */
-class CfnAuthorizerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnAuthorizerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAuthorizerPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnAuthorizerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authorizerCredentials", "authorizerResultTtlInSeconds", "authorizerUri", "authType", "identitySource", "identityValidationExpression", "name", "providerArns", "restApiId", "type"];
     props;
     strategy;
@@ -158,8 +175,11 @@ class CfnAuthorizerPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAuthorizerMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -172,16 +192,22 @@ class CfnAuthorizerPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAuthorizerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAuthorizerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAuthorizerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAuthorizerPropsMixin = CfnAuthorizerPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAuthorizerMixinProps(props) {
+    const ret = {};
+    if ((props.authorizerCredentials !== undefined))
+        ret.authorizerCredentials = cdk.getRefProperty(props.authorizerCredentials?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.authorizerCredentials, "authorizerCredentials", "iam.IRoleRef | string");
+    if ((props.providerArns !== undefined))
+        ret.providerArns = cdk.mapArrayInPlace(props.providerArns, (item) => cdk.getRefProperty(item?.userPoolRef, 'userPoolArn') ?? cdk.ensureStringOrUndefined(item, "providerArns", "cognito.IUserPoolRef | string"));
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::BasePathMapping` resource creates a base path that clients who call your API must use in the invocation URL.
  *
@@ -192,8 +218,8 @@ exports.CfnAuthorizerPropsMixin = CfnAuthorizerPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html
  */
-class CfnBasePathMappingPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnBasePathMappingPropsMixin", version: "2.240.0-alpha.0" };
+class CfnBasePathMappingPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnBasePathMappingPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["basePath", "domainName", "id", "restApiId", "stage"];
     props;
     strategy;
@@ -215,8 +241,11 @@ class CfnBasePathMappingPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnBasePathMappingMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -229,16 +258,22 @@ class CfnBasePathMappingPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBasePathMappingPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBasePathMappingPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBasePathMappingPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnBasePathMappingPropsMixin = CfnBasePathMappingPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnBasePathMappingMixinProps(props) {
+    const ret = {};
+    if ((props.domainName !== undefined))
+        ret.domainName = cdk.getRefProperty(props.domainName?.domainNameRef, 'domainName') ?? cdk.ensureStringOrUndefined(props.domainName, "domainName", "apigateway.IDomainNameRef | string");
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    if ((props.stage !== undefined))
+        ret.stage = cdk.getRefProperty(props.stage?.stageRef, 'stageName') ?? cdk.ensureStringOrUndefined(props.stage, "stage", "apigateway.IStageRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::ClientCertificate` resource creates a client certificate that API Gateway uses to configure client-side SSL authentication for sending requests to the integration endpoint.
  *
@@ -247,8 +282,8 @@ exports.CfnBasePathMappingPropsMixin = CfnBasePathMappingPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html
  */
-class CfnClientCertificatePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnClientCertificatePropsMixin", version: "2.240.0-alpha.0" };
+class CfnClientCertificatePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnClientCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "tags"];
     props;
     strategy;
@@ -271,7 +306,7 @@ class CfnClientCertificatePropsMixin 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 +319,7 @@ class CfnClientCertificatePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClientCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClientCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClientCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -304,8 +334,8 @@ exports.CfnClientCertificatePropsMixin = CfnClientCertificatePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html
  */
-class CfnDeploymentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDeploymentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeploymentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDeploymentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deploymentCanarySettings", "description", "restApiId", "stageDescription", "stageName"];
     props;
     strategy;
@@ -327,8 +357,11 @@ class CfnDeploymentPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDeploymentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -341,16 +374,18 @@ class CfnDeploymentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDeploymentPropsMixin = CfnDeploymentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDeploymentMixinProps(props) {
+    const ret = {};
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::DocumentationPart` resource creates a documentation part for an API.
  *
@@ -361,8 +396,8 @@ exports.CfnDeploymentPropsMixin = CfnDeploymentPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html
  */
-class CfnDocumentationPartPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDocumentationPartPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDocumentationPartPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDocumentationPartPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["location", "properties", "restApiId"];
     props;
     strategy;
@@ -384,8 +419,11 @@ class CfnDocumentationPartPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDocumentationPartMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -398,16 +436,18 @@ class CfnDocumentationPartPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDocumentationPartPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDocumentationPartPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDocumentationPartPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDocumentationPartPropsMixin = CfnDocumentationPartPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDocumentationPartMixinProps(props) {
+    const ret = {};
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::DocumentationVersion` resource creates a snapshot of the documentation for an API.
  *
@@ -418,8 +458,8 @@ exports.CfnDocumentationPartPropsMixin = CfnDocumentationPartPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html
  */
-class CfnDocumentationVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDocumentationVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDocumentationVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDocumentationVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "documentationVersion", "restApiId"];
     props;
     strategy;
@@ -441,8 +481,11 @@ class CfnDocumentationVersionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDocumentationVersionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -455,16 +498,18 @@ class CfnDocumentationVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDocumentationVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDocumentationVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDocumentationVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDocumentationVersionPropsMixin = CfnDocumentationVersionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDocumentationVersionMixinProps(props) {
+    const ret = {};
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::DomainName` resource specifies a public custom domain name for your API in API Gateway.
  *
@@ -477,8 +522,8 @@ exports.CfnDocumentationVersionPropsMixin = CfnDocumentationVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html
  */
-class CfnDomainNamePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDomainNamePropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainNamePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDomainNamePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateArn", "domainName", "endpointAccessMode", "endpointConfiguration", "mutualTlsAuthentication", "ownershipVerificationCertificateArn", "regionalCertificateArn", "routingMode", "securityPolicy", "tags"];
     props;
     strategy;
@@ -501,7 +546,7 @@ class CfnDomainNamePropsMixin 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
@@ -514,12 +559,7 @@ class CfnDomainNamePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainNamePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainNamePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainNamePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -534,8 +574,8 @@ exports.CfnDomainNamePropsMixin = CfnDomainNamePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html
  */
-class CfnGatewayResponsePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnGatewayResponsePropsMixin", version: "2.240.0-alpha.0" };
+class CfnGatewayResponsePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnGatewayResponsePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["responseParameters", "responseTemplates", "responseType", "restApiId", "statusCode"];
     props;
     strategy;
@@ -557,8 +597,11 @@ class CfnGatewayResponsePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnGatewayResponseMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -571,16 +614,18 @@ class CfnGatewayResponsePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGatewayResponsePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGatewayResponsePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGatewayResponsePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnGatewayResponsePropsMixin = CfnGatewayResponsePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnGatewayResponseMixinProps(props) {
+    const ret = {};
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::Method` resource creates API Gateway methods that define the parameters and body that clients must send in their requests.
  *
@@ -589,8 +634,8 @@ exports.CfnGatewayResponsePropsMixin = CfnGatewayResponsePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html
  */
-class CfnMethodPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnMethodPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMethodPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnMethodPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiKeyRequired", "authorizationScopes", "authorizationType", "authorizerId", "httpMethod", "integration", "methodResponses", "operationName", "requestModels", "requestParameters", "requestValidatorId", "resourceId", "restApiId"];
     props;
     strategy;
@@ -612,8 +657,11 @@ class CfnMethodPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnMethodMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -626,16 +674,49 @@ class CfnMethodPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMethodPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMethodPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMethodPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnMethodPropsMixin = CfnMethodPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnMethodPropsMixinIntegrationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cacheKeyParameters: (!props.cacheKeyParameters ? undefined : props.cacheKeyParameters),
+        cacheNamespace: (!props.cacheNamespace ? undefined : props.cacheNamespace),
+        connectionId: (!props.connectionId ? undefined : cdk.getRefProperty(props.connectionId?.vpcLinkRef, 'vpcLinkId') ?? cdk.ensureStringOrUndefined(props.connectionId, "connectionId", "apigateway.IVpcLinkRef | string")),
+        connectionType: (!props.connectionType ? undefined : props.connectionType),
+        contentHandling: (!props.contentHandling ? undefined : props.contentHandling),
+        credentials: (!props.credentials ? undefined : cdk.getRefProperty(props.credentials?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.credentials, "credentials", "iam.IRoleRef | string")),
+        integrationHttpMethod: (!props.integrationHttpMethod ? undefined : props.integrationHttpMethod),
+        integrationResponses: (!props.integrationResponses ? undefined : props.integrationResponses),
+        integrationTarget: (!props.integrationTarget ? undefined : props.integrationTarget),
+        passthroughBehavior: (!props.passthroughBehavior ? undefined : props.passthroughBehavior),
+        requestParameters: (!props.requestParameters ? undefined : props.requestParameters),
+        requestTemplates: (!props.requestTemplates ? undefined : props.requestTemplates),
+        responseTransferMode: (!props.responseTransferMode ? undefined : props.responseTransferMode),
+        timeoutInMillis: (!props.timeoutInMillis ? undefined : props.timeoutInMillis),
+        type: (!props.type ? undefined : props.type),
+        uri: (!props.uri ? undefined : cdk.getRefProperty(props.uri?.functionRef, 'functionArn') ?? cdk.getRefProperty(props.uri?.aliasRef, 'aliasArn') ?? cdk.ensureStringOrUndefined(props.uri, "uri", "lambda.IFunctionRef | lambda.IAliasRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnMethodMixinProps(props) {
+    const ret = {};
+    if ((props.authorizerId !== undefined))
+        ret.authorizerId = cdk.getRefProperty(props.authorizerId?.authorizerRef, 'authorizerId') ?? cdk.ensureStringOrUndefined(props.authorizerId, "authorizerId", "apigateway.IAuthorizerRef | string");
+    if ((props.integration !== undefined))
+        ret.integration = flattenCfnMethodPropsMixinIntegrationProperty(props.integration);
+    if ((props.requestValidatorId !== undefined))
+        ret.requestValidatorId = cdk.getRefProperty(props.requestValidatorId?.requestValidatorRef, 'requestValidatorId') ?? cdk.ensureStringOrUndefined(props.requestValidatorId, "requestValidatorId", "apigateway.IRequestValidatorRef | string");
+    if ((props.resourceId !== undefined))
+        ret.resourceId = cdk.getRefProperty(props.resourceId?.resourceRef, 'resourceId') ?? cdk.ensureStringOrUndefined(props.resourceId, "resourceId", "apigateway.IResourceRef | string");
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::Model` resource defines the structure of a request or response payload for an API method.
  *
@@ -644,8 +725,8 @@ exports.CfnMethodPropsMixin = CfnMethodPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html
  */
-class CfnModelPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnModelPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnModelPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["contentType", "description", "name", "restApiId", "schema"];
     props;
     strategy;
@@ -667,8 +748,11 @@ class CfnModelPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnModelMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -681,16 +765,18 @@ class CfnModelPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnModelPropsMixin = CfnModelPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnModelMixinProps(props) {
+    const ret = {};
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::RequestValidator` resource sets up basic validation rules for incoming requests to your API.
  *
@@ -701,8 +787,8 @@ exports.CfnModelPropsMixin = CfnModelPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html
  */
-class CfnRequestValidatorPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnRequestValidatorPropsMixin", version: "2.240.0-alpha.0" };
+class CfnRequestValidatorPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnRequestValidatorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "restApiId", "validateRequestBody", "validateRequestParameters"];
     props;
     strategy;
@@ -724,8 +810,11 @@ class CfnRequestValidatorPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRequestValidatorMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -738,16 +827,18 @@ class CfnRequestValidatorPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRequestValidatorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRequestValidatorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRequestValidatorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRequestValidatorPropsMixin = CfnRequestValidatorPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRequestValidatorMixinProps(props) {
+    const ret = {};
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::Resource` resource creates a resource in an API.
  *
@@ -756,8 +847,8 @@ exports.CfnRequestValidatorPropsMixin = CfnRequestValidatorPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html
  */
-class CfnResourcePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnResourcePropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourcePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnResourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["parentId", "pathPart", "restApiId"];
     props;
     strategy;
@@ -779,8 +870,11 @@ class CfnResourcePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResourceMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -793,16 +887,20 @@ class CfnResourcePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResourcePropsMixin = CfnResourcePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResourceMixinProps(props) {
+    const ret = {};
+    if ((props.parentId !== undefined))
+        ret.parentId = cdk.getRefProperty(props.parentId?.resourceRef, 'resourceId') ?? cdk.ensureStringOrUndefined(props.parentId, "parentId", "apigateway.IResourceRef | string");
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::RestApi` resource creates a REST API.
  *
@@ -815,8 +913,8 @@ exports.CfnResourcePropsMixin = CfnResourcePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html
  */
-class CfnRestApiPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnRestApiPropsMixin", version: "2.240.0-alpha.0" };
+class CfnRestApiPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnRestApiPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiKeySourceType", "binaryMediaTypes", "body", "bodyS3Location", "cloneFrom", "description", "disableExecuteApiEndpoint", "endpointAccessMode", "endpointConfiguration", "failOnWarnings", "minimumCompressionSize", "mode", "name", "parameters", "policy", "securityPolicy", "tags"];
     props;
     strategy;
@@ -838,8 +936,11 @@ class CfnRestApiPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRestApiMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -852,16 +953,43 @@ class CfnRestApiPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRestApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRestApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRestApiPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRestApiPropsMixin = CfnRestApiPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRestApiPropsMixinS3LocationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucket: (!props.bucket ? undefined : cdk.getRefProperty(props.bucket?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucket, "bucket", "s3.IBucketRef | string")),
+        eTag: (!props.eTag ? undefined : props.eTag),
+        key: (!props.key ? undefined : props.key),
+        version: (!props.version ? undefined : props.version)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRestApiPropsMixinEndpointConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        ipAddressType: (!props.ipAddressType ? undefined : props.ipAddressType),
+        types: (!props.types ? undefined : props.types),
+        vpcEndpointIds: (!props.vpcEndpointIds ? undefined : cdk.mapArrayInPlace(props.vpcEndpointIds, (item) => cdk.getRefProperty(item?.vpcEndpointRef, 'vpcEndpointId') ?? cdk.ensureStringOrUndefined(item, "vpcEndpointIds", "ec2.IVPCEndpointRef | string")))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRestApiMixinProps(props) {
+    const ret = {};
+    if ((props.bodyS3Location !== undefined))
+        ret.bodyS3Location = flattenCfnRestApiPropsMixinS3LocationProperty(props.bodyS3Location);
+    if ((props.cloneFrom !== undefined))
+        ret.cloneFrom = cdk.getRefProperty(props.cloneFrom?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.cloneFrom, "cloneFrom", "apigateway.IRestApiRef | string");
+    if ((props.endpointConfiguration !== undefined))
+        ret.endpointConfiguration = flattenCfnRestApiPropsMixinEndpointConfigurationProperty(props.endpointConfiguration);
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::Stage` resource creates a stage for a deployment.
  *
@@ -870,8 +998,8 @@ exports.CfnRestApiPropsMixin = CfnRestApiPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html
  */
-class CfnStagePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnStagePropsMixin", version: "2.240.0-alpha.0" };
+class CfnStagePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnStagePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessLogSetting", "cacheClusterEnabled", "cacheClusterSize", "canarySetting", "clientCertificateId", "deploymentId", "description", "documentationVersion", "methodSettings", "restApiId", "stageName", "tags", "tracingEnabled", "variables"];
     props;
     strategy;
@@ -893,8 +1021,11 @@ class CfnStagePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnStageMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -907,16 +1038,46 @@ class CfnStagePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStagePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStagePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStagePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnStagePropsMixin = CfnStagePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnStagePropsMixinCanarySettingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deploymentId: (!props.deploymentId ? undefined : cdk.getRefProperty(props.deploymentId?.deploymentRef, 'deploymentId') ?? cdk.ensureStringOrUndefined(props.deploymentId, "deploymentId", "apigateway.IDeploymentRef | string")),
+        percentTraffic: (!props.percentTraffic ? undefined : props.percentTraffic),
+        stageVariableOverrides: (!props.stageVariableOverrides ? undefined : props.stageVariableOverrides),
+        useStageCache: (!props.useStageCache ? undefined : props.useStageCache)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnStagePropsMixinAccessLogSettingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        destinationArn: (!props.destinationArn ? undefined : cdk.getRefProperty(props.destinationArn?.logGroupRef, 'logGroupArn') ?? cdk.ensureStringOrUndefined(props.destinationArn, "destinationArn", "logs.ILogGroupRef | string")),
+        format: (!props.format ? undefined : props.format)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnStageMixinProps(props) {
+    const ret = {};
+    if ((props.accessLogSetting !== undefined))
+        ret.accessLogSetting = flattenCfnStagePropsMixinAccessLogSettingProperty(props.accessLogSetting);
+    if ((props.canarySetting !== undefined))
+        ret.canarySetting = flattenCfnStagePropsMixinCanarySettingProperty(props.canarySetting);
+    if ((props.clientCertificateId !== undefined))
+        ret.clientCertificateId = cdk.getRefProperty(props.clientCertificateId?.clientCertificateRef, 'clientCertificateId') ?? cdk.ensureStringOrUndefined(props.clientCertificateId, "clientCertificateId", "apigateway.IClientCertificateRef | string");
+    if ((props.deploymentId !== undefined))
+        ret.deploymentId = cdk.getRefProperty(props.deploymentId?.deploymentRef, 'deploymentId') ?? cdk.ensureStringOrUndefined(props.deploymentId, "deploymentId", "apigateway.IDeploymentRef | string");
+    if ((props.restApiId !== undefined))
+        ret.restApiId = cdk.getRefProperty(props.restApiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.restApiId, "restApiId", "apigateway.IRestApiRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::UsagePlan` resource creates a usage plan for deployed APIs.
  *
@@ -929,8 +1090,8 @@ exports.CfnStagePropsMixin = CfnStagePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html
  */
-class CfnUsagePlanPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnUsagePlanPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUsagePlanPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnUsagePlanPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiStages", "description", "quota", "tags", "throttle", "usagePlanName"];
     props;
     strategy;
@@ -952,8 +1113,11 @@ class CfnUsagePlanPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUsagePlanMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -966,16 +1130,28 @@ class CfnUsagePlanPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUsagePlanPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUsagePlanPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUsagePlanPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUsagePlanPropsMixin = CfnUsagePlanPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUsagePlanPropsMixinApiStageProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        apiId: (!props.apiId ? undefined : cdk.getRefProperty(props.apiId?.restApiRef, 'restApiId') ?? cdk.ensureStringOrUndefined(props.apiId, "apiId", "apigateway.IRestApiRef | string")),
+        stage: (!props.stage ? undefined : cdk.getRefProperty(props.stage?.stageRef, 'stageName') ?? cdk.ensureStringOrUndefined(props.stage, "stage", "apigateway.IStageRef | string")),
+        throttle: (!props.throttle ? undefined : props.throttle)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnUsagePlanMixinProps(props) {
+    const ret = {};
+    if ((props.apiStages !== undefined))
+        ret.apiStages = (cdk.isResolvableObject(props.apiStages) ? props.apiStages : cdk.mapArrayInPlace(props.apiStages, (item) => flattenCfnUsagePlanPropsMixinApiStageProperty(item)));
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::UsagePlanKey` resource associates an API key with a usage plan.
  *
@@ -986,8 +1162,8 @@ exports.CfnUsagePlanPropsMixin = CfnUsagePlanPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html
  */
-class CfnUsagePlanKeyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnUsagePlanKeyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUsagePlanKeyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnUsagePlanKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["keyId", "keyType", "usagePlanId"];
     props;
     strategy;
@@ -1009,8 +1185,11 @@ class CfnUsagePlanKeyPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUsagePlanKeyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1023,16 +1202,20 @@ class CfnUsagePlanKeyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUsagePlanKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUsagePlanKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUsagePlanKeyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUsagePlanKeyPropsMixin = CfnUsagePlanKeyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUsagePlanKeyMixinProps(props) {
+    const ret = {};
+    if ((props.keyId !== undefined))
+        ret.keyId = cdk.getRefProperty(props.keyId?.apiKeyRef, 'apiKeyId') ?? cdk.ensureStringOrUndefined(props.keyId, "keyId", "apigateway.IApiKeyRef | string");
+    if ((props.usagePlanId !== undefined))
+        ret.usagePlanId = cdk.getRefProperty(props.usagePlanId?.usagePlanRef, 'usagePlanId') ?? cdk.ensureStringOrUndefined(props.usagePlanId, "usagePlanId", "apigateway.IUsagePlanRef | string");
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::VpcLink` resource creates an API Gateway VPC link for a REST API to access resources in an Amazon Virtual Private Cloud (VPC).
  *
@@ -1043,8 +1226,8 @@ exports.CfnUsagePlanKeyPropsMixin = CfnUsagePlanKeyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html
  */
-class CfnVpcLinkPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnVpcLinkPropsMixin", version: "2.240.0-alpha.0" };
+class CfnVpcLinkPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnVpcLinkPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "name", "tags", "targetArns"];
     props;
     strategy;
@@ -1066,8 +1249,11 @@ class CfnVpcLinkPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVpcLinkMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1080,16 +1266,18 @@ class CfnVpcLinkPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVpcLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVpcLinkPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVpcLinkPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVpcLinkPropsMixin = CfnVpcLinkPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVpcLinkMixinProps(props) {
+    const ret = {};
+    if ((props.targetArns !== undefined))
+        ret.targetArns = cdk.mapArrayInPlace(props.targetArns, (item) => cdk.getRefProperty(item?.loadBalancerRef, 'loadBalancerArn') ?? cdk.ensureStringOrUndefined(item, "targetArns", "elasticloadbalancingv2.ILoadBalancerRef | string"));
+    return ret;
+}
 /**
  * The `AWS::ApiGateway::BasePathMappingV2` resource creates a base path that clients who call your API must use in the invocation URL.
  *
@@ -1100,8 +1288,8 @@ exports.CfnVpcLinkPropsMixin = CfnVpcLinkPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmappingv2.html
  */
-class CfnBasePathMappingV2PropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnBasePathMappingV2PropsMixin", version: "2.240.0-alpha.0" };
+class CfnBasePathMappingV2PropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnBasePathMappingV2PropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["basePath", "domainNameArn", "restApiId", "stage"];
     props;
     strategy;
@@ -1124,7 +1312,7 @@ class CfnBasePathMappingV2PropsMixin 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
@@ -1137,12 +1325,7 @@ class CfnBasePathMappingV2PropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBasePathMappingV2PropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBasePathMappingV2PropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBasePathMappingV2PropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1159,8 +1342,8 @@ exports.CfnBasePathMappingV2PropsMixin = CfnBasePathMappingV2PropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainnameaccessassociation.html
  */
-class CfnDomainNameAccessAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDomainNameAccessAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainNameAccessAssociationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDomainNameAccessAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessAssociationSource", "accessAssociationSourceType", "domainNameArn", "tags"];
     props;
     strategy;
@@ -1183,7 +1366,7 @@ class CfnDomainNameAccessAssociationPropsMixin 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
@@ -1196,12 +1379,7 @@ class CfnDomainNameAccessAssociationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainNameAccessAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainNameAccessAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainNameAccessAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1216,8 +1394,8 @@ exports.CfnDomainNameAccessAssociationPropsMixin = CfnDomainNameAccessAssociatio
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainnamev2.html
  */
-class CfnDomainNameV2PropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDomainNameV2PropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainNameV2PropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_apigateway.mixins.CfnDomainNameV2PropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateArn", "domainName", "endpointAccessMode", "endpointConfiguration", "policy", "routingMode", "securityPolicy", "tags"];
     props;
     strategy;
@@ -1240,7 +1418,7 @@ class CfnDomainNameV2PropsMixin 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
@@ -1253,12 +1431,7 @@ class CfnDomainNameV2PropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainNameV2PropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainNameV2PropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainNameV2PropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }