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

package/lib/services/aws-appsync/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-appsync");
 /**
  * The `AWS::AppSync::ApiCache` resource represents the input of a `CreateApiCache` operation.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-appsync");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html
  */
 class CfnApiCachePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnApiCachePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnApiCachePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiCachingBehavior", "apiId", "atRestEncryptionEnabled", "healthMetricsConfig", "transitEncryptionEnabled", "ttl", "type"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnApiCachePropsMixin 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
@@ -53,12 +52,7 @@ class CfnApiCachePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApiCachePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApiCachePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApiCachePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,7 +66,7 @@ exports.CfnApiCachePropsMixin = CfnApiCachePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html
  */
 class CfnApiKeyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnApiKeyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnApiKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "description", "expires"];
     props;
     strategy;
@@ -95,7 +89,7 @@ class CfnApiKeyPropsMixin 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 +102,7 @@ class CfnApiKeyPropsMixin extends cdk.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);
         }
     }
 }
@@ -129,7 +118,7 @@ exports.CfnApiKeyPropsMixin = CfnApiKeyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html
  */
 class CfnDataSourcePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnDataSourcePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnDataSourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "description", "dynamoDbConfig", "elasticsearchConfig", "eventBridgeConfig", "httpConfig", "lambdaConfig", "metricsConfig", "name", "openSearchServiceConfig", "relationalDatabaseConfig", "serviceRoleArn", "type"];
     props;
     strategy;
@@ -151,8 +140,11 @@ class CfnDataSourcePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDataSourceMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -165,16 +157,88 @@ class CfnDataSourcePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataSourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataSourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataSourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDataSourcePropsMixin = CfnDataSourcePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDataSourcePropsMixinEventBridgeConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        eventBusArn: (!props.eventBusArn ? undefined : cdk.getRefProperty(props.eventBusArn?.eventBusRef, 'eventBusArn') ?? cdk.ensureStringOrUndefined(props.eventBusArn, "eventBusArn", "events.IEventBusRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDataSourcePropsMixinHttpConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authorizationConfig: (!props.authorizationConfig ? undefined : props.authorizationConfig),
+        endpoint: (!props.endpoint ? undefined : cdk.getRefProperty(props.endpoint?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.endpoint, "endpoint", "s3.IBucketRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDataSourcePropsMixinRdsHttpEndpointConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        awsRegion: (!props.awsRegion ? undefined : props.awsRegion),
+        awsSecretStoreArn: (!props.awsSecretStoreArn ? undefined : cdk.getRefProperty(props.awsSecretStoreArn?.secretRef, 'secretId') ?? cdk.ensureStringOrUndefined(props.awsSecretStoreArn, "awsSecretStoreArn", "secretsmanager.ISecretRef | string")),
+        databaseName: (!props.databaseName ? undefined : props.databaseName),
+        dbClusterIdentifier: (!props.dbClusterIdentifier ? undefined : cdk.getRefProperty(props.dbClusterIdentifier?.dbClusterRef, 'dbClusterArn') ?? cdk.ensureStringOrUndefined(props.dbClusterIdentifier, "dbClusterIdentifier", "rds.IDBClusterRef | string")),
+        schema: (!props.schema ? undefined : props.schema)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDataSourcePropsMixinRelationalDatabaseConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        rdsHttpEndpointConfig: (!props.rdsHttpEndpointConfig ? undefined : (!props.rdsHttpEndpointConfig ? undefined : flattenCfnDataSourcePropsMixinRdsHttpEndpointConfigProperty(props.rdsHttpEndpointConfig))),
+        relationalDatabaseSourceType: (!props.relationalDatabaseSourceType ? undefined : props.relationalDatabaseSourceType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDataSourcePropsMixinLambdaConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        lambdaFunctionArn: (!props.lambdaFunctionArn ? undefined : cdk.getRefProperty(props.lambdaFunctionArn?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.lambdaFunctionArn, "lambdaFunctionArn", "lambda.IFunctionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDataSourcePropsMixinDynamoDBConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        awsRegion: (!props.awsRegion ? undefined : props.awsRegion),
+        deltaSyncConfig: (!props.deltaSyncConfig ? undefined : props.deltaSyncConfig),
+        tableName: (!props.tableName ? undefined : cdk.getRefProperty(props.tableName?.tableRef, 'tableName') ?? cdk.ensureStringOrUndefined(props.tableName, "tableName", "dynamodb.ITableRef | string")),
+        useCallerCredentials: (!props.useCallerCredentials ? undefined : props.useCallerCredentials),
+        versioned: (!props.versioned ? undefined : props.versioned)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDataSourceMixinProps(props) {
+    const ret = {};
+    if ((props.apiId !== undefined))
+        ret.apiId = props.apiId;
+    if ((props.dynamoDbConfig !== undefined))
+        ret.dynamoDbConfig = flattenCfnDataSourcePropsMixinDynamoDBConfigProperty(props.dynamoDbConfig);
+    if ((props.eventBridgeConfig !== undefined))
+        ret.eventBridgeConfig = flattenCfnDataSourcePropsMixinEventBridgeConfigProperty(props.eventBridgeConfig);
+    if ((props.httpConfig !== undefined))
+        ret.httpConfig = flattenCfnDataSourcePropsMixinHttpConfigProperty(props.httpConfig);
+    if ((props.lambdaConfig !== undefined))
+        ret.lambdaConfig = flattenCfnDataSourcePropsMixinLambdaConfigProperty(props.lambdaConfig);
+    if ((props.relationalDatabaseConfig !== undefined))
+        ret.relationalDatabaseConfig = flattenCfnDataSourcePropsMixinRelationalDatabaseConfigProperty(props.relationalDatabaseConfig);
+    if ((props.serviceRoleArn !== undefined))
+        ret.serviceRoleArn = cdk.getRefProperty(props.serviceRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.serviceRoleArn, "serviceRoleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The `AWS::AppSync::DomainName` resource creates a `DomainNameConfig` object to configure a custom domain.
  *
@@ -184,7 +248,7 @@ exports.CfnDataSourcePropsMixin = CfnDataSourcePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-domainname.html
  */
 class CfnDomainNamePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnDomainNamePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnDomainNamePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateArn", "description", "domainName", "tags"];
     props;
     strategy;
@@ -207,7 +271,7 @@ class CfnDomainNamePropsMixin 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
@@ -220,12 +284,7 @@ class CfnDomainNamePropsMixin extends cdk.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);
         }
     }
 }
@@ -239,7 +298,7 @@ exports.CfnDomainNamePropsMixin = CfnDomainNamePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-domainnameapiassociation.html
  */
 class CfnDomainNameApiAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnDomainNameApiAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnDomainNameApiAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "domainName"];
     props;
     strategy;
@@ -261,8 +320,11 @@ class CfnDomainNameApiAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDomainNameApiAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -275,16 +337,20 @@ class CfnDomainNameApiAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainNameApiAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainNameApiAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainNameApiAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDomainNameApiAssociationPropsMixin = CfnDomainNameApiAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDomainNameApiAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.apiId !== undefined))
+        ret.apiId = props.apiId;
+    if ((props.domainName !== undefined))
+        ret.domainName = cdk.getRefProperty(props.domainName?.domainNameRef, 'domainName') ?? cdk.ensureStringOrUndefined(props.domainName, "domainName", "appsync.IDomainNameRef | string");
+    return ret;
+}
 /**
  * The `AWS::AppSync::FunctionConfiguration` resource defines the functions in GraphQL APIs to perform certain operations.
  *
@@ -300,7 +366,7 @@ exports.CfnDomainNameApiAssociationPropsMixin = CfnDomainNameApiAssociationProps
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html
  */
 class CfnFunctionConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnFunctionConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnFunctionConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "code", "codeS3Location", "dataSourceName", "description", "functionVersion", "maxBatchSize", "name", "requestMappingTemplate", "requestMappingTemplateS3Location", "responseMappingTemplate", "responseMappingTemplateS3Location", "runtime", "syncConfig"];
     props;
     strategy;
@@ -322,8 +388,11 @@ class CfnFunctionConfigurationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFunctionConfigurationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -336,16 +405,20 @@ class CfnFunctionConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFunctionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFunctionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFunctionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFunctionConfigurationPropsMixin = CfnFunctionConfigurationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFunctionConfigurationMixinProps(props) {
+    const ret = {};
+    if ((props.apiId !== undefined))
+        ret.apiId = props.apiId;
+    if ((props.dataSourceName !== undefined))
+        ret.dataSourceName = props.dataSourceName;
+    return ret;
+}
 /**
  * The `AWS::AppSync::GraphQLApi` resource creates a new AWS AppSync GraphQL API.
  *
@@ -357,7 +430,7 @@ exports.CfnFunctionConfigurationPropsMixin = CfnFunctionConfigurationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html
  */
 class CfnGraphQLApiPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnGraphQLApiPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnGraphQLApiPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalAuthenticationProviders", "apiType", "authenticationType", "enhancedMetricsConfig", "environmentVariables", "introspectionConfig", "lambdaAuthorizerConfig", "logConfig", "mergedApiExecutionRoleArn", "name", "openIdConnectConfig", "ownerContact", "queryDepthLimit", "resolverCountLimit", "tags", "userPoolConfig", "visibility", "xrayEnabled"];
     props;
     strategy;
@@ -379,8 +452,11 @@ class CfnGraphQLApiPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnGraphQLApiMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -393,16 +469,76 @@ class CfnGraphQLApiPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGraphQLApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGraphQLApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGraphQLApiPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnGraphQLApiPropsMixin = CfnGraphQLApiPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnGraphQLApiPropsMixinLambdaAuthorizerConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authorizerResultTtlInSeconds: (!props.authorizerResultTtlInSeconds ? undefined : props.authorizerResultTtlInSeconds),
+        authorizerUri: (!props.authorizerUri ? undefined : cdk.getRefProperty(props.authorizerUri?.functionRef, 'functionArn') ?? cdk.getRefProperty(props.authorizerUri?.aliasRef, 'aliasArn') ?? cdk.ensureStringOrUndefined(props.authorizerUri, "authorizerUri", "lambda.IFunctionRef | lambda.IAliasRef | string")),
+        identityValidationExpression: (!props.identityValidationExpression ? undefined : props.identityValidationExpression)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnGraphQLApiPropsMixinCognitoUserPoolConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        appIdClientRegex: (!props.appIdClientRegex ? undefined : props.appIdClientRegex),
+        awsRegion: (!props.awsRegion ? undefined : props.awsRegion),
+        userPoolId: (!props.userPoolId ? undefined : cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnGraphQLApiPropsMixinAdditionalAuthenticationProviderProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authenticationType: (!props.authenticationType ? undefined : props.authenticationType),
+        lambdaAuthorizerConfig: (!props.lambdaAuthorizerConfig ? undefined : (!props.lambdaAuthorizerConfig ? undefined : flattenCfnGraphQLApiPropsMixinLambdaAuthorizerConfigProperty(props.lambdaAuthorizerConfig))),
+        openIdConnectConfig: (!props.openIdConnectConfig ? undefined : props.openIdConnectConfig),
+        userPoolConfig: (!props.userPoolConfig ? undefined : (!props.userPoolConfig ? undefined : flattenCfnGraphQLApiPropsMixinCognitoUserPoolConfigProperty(props.userPoolConfig)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnGraphQLApiPropsMixinUserPoolConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        appIdClientRegex: (!props.appIdClientRegex ? undefined : props.appIdClientRegex),
+        awsRegion: (!props.awsRegion ? undefined : props.awsRegion),
+        defaultAction: (!props.defaultAction ? undefined : props.defaultAction),
+        userPoolId: (!props.userPoolId ? undefined : cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnGraphQLApiPropsMixinLogConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cloudWatchLogsRoleArn: (!props.cloudWatchLogsRoleArn ? undefined : cdk.getRefProperty(props.cloudWatchLogsRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.cloudWatchLogsRoleArn, "cloudWatchLogsRoleArn", "iam.IRoleRef | string")),
+        excludeVerboseContent: (!props.excludeVerboseContent ? undefined : props.excludeVerboseContent),
+        fieldLogLevel: (!props.fieldLogLevel ? undefined : props.fieldLogLevel)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnGraphQLApiMixinProps(props) {
+    const ret = {};
+    if ((props.additionalAuthenticationProviders !== undefined))
+        ret.additionalAuthenticationProviders = (cdk.isResolvableObject(props.additionalAuthenticationProviders) ? props.additionalAuthenticationProviders : cdk.mapArrayInPlace(props.additionalAuthenticationProviders, (item) => flattenCfnGraphQLApiPropsMixinAdditionalAuthenticationProviderProperty(item)));
+    if ((props.lambdaAuthorizerConfig !== undefined))
+        ret.lambdaAuthorizerConfig = flattenCfnGraphQLApiPropsMixinLambdaAuthorizerConfigProperty(props.lambdaAuthorizerConfig);
+    if ((props.logConfig !== undefined))
+        ret.logConfig = flattenCfnGraphQLApiPropsMixinLogConfigProperty(props.logConfig);
+    if ((props.userPoolConfig !== undefined))
+        ret.userPoolConfig = flattenCfnGraphQLApiPropsMixinUserPoolConfigProperty(props.userPoolConfig);
+    return ret;
+}
 /**
  * The `AWS::AppSync::GraphQLSchema` resource is used for your AWS AppSync GraphQL schema that controls the data model for your API.
  *
@@ -418,7 +554,7 @@ exports.CfnGraphQLApiPropsMixin = CfnGraphQLApiPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlschema.html
  */
 class CfnGraphQLSchemaPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnGraphQLSchemaPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnGraphQLSchemaPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "definition", "definitionS3Location"];
     props;
     strategy;
@@ -441,7 +577,7 @@ class CfnGraphQLSchemaPropsMixin 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
@@ -454,12 +590,7 @@ class CfnGraphQLSchemaPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGraphQLSchemaPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGraphQLSchemaPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGraphQLSchemaPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -479,7 +610,7 @@ exports.CfnGraphQLSchemaPropsMixin = CfnGraphQLSchemaPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html
  */
 class CfnResolverPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnResolverPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnResolverPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "cachingConfig", "code", "codeS3Location", "dataSourceName", "fieldName", "kind", "maxBatchSize", "metricsConfig", "pipelineConfig", "requestMappingTemplate", "requestMappingTemplateS3Location", "responseMappingTemplate", "responseMappingTemplateS3Location", "runtime", "syncConfig", "typeName"];
     props;
     strategy;
@@ -501,8 +632,11 @@ class CfnResolverPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResolverMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -515,16 +649,20 @@ class CfnResolverPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResolverPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResolverPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResolverPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResolverPropsMixin = CfnResolverPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResolverMixinProps(props) {
+    const ret = {};
+    if ((props.apiId !== undefined))
+        ret.apiId = props.apiId;
+    if ((props.dataSourceName !== undefined))
+        ret.dataSourceName = props.dataSourceName;
+    return ret;
+}
 /**
  * Describes the configuration of a source API.
  *
@@ -536,7 +674,7 @@ exports.CfnResolverPropsMixin = CfnResolverPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-sourceapiassociation.html
  */
 class CfnSourceApiAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnSourceApiAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnSourceApiAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "mergedApiIdentifier", "sourceApiAssociationConfig", "sourceApiIdentifier"];
     props;
     strategy;
@@ -559,7 +697,7 @@ class CfnSourceApiAssociationPropsMixin 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
@@ -572,12 +710,7 @@ class CfnSourceApiAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSourceApiAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSourceApiAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSourceApiAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -591,7 +724,7 @@ exports.CfnSourceApiAssociationPropsMixin = CfnSourceApiAssociationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-api.html
  */
 class CfnApiPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnApiPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnApiPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["eventConfig", "name", "ownerContact", "tags"];
     props;
     strategy;
@@ -614,7 +747,7 @@ class CfnApiPropsMixin 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
@@ -627,12 +760,7 @@ class CfnApiPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApiPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApiPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -648,7 +776,7 @@ exports.CfnApiPropsMixin = CfnApiPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-channelnamespace.html
  */
 class CfnChannelNamespacePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnChannelNamespacePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appsync.mixins.CfnChannelNamespacePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiId", "codeHandlers", "codeS3Location", "handlerConfigs", "name", "publishAuthModes", "subscribeAuthModes", "tags"];
     props;
     strategy;
@@ -671,7 +799,7 @@ class CfnChannelNamespacePropsMixin 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
@@ -684,12 +812,7 @@ class CfnChannelNamespacePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnChannelNamespacePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnChannelNamespacePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnChannelNamespacePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

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