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

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

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

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

@@ -1,6 +1,5 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-accessanalyzer";
 /**
@@ -13,10 +12,10 @@ import * as service from "aws-cdk-lib/aws-accessanalyzer";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html
  */
-export declare class CfnAnalyzerPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnAnalyzerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAnalyzerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AccessAnalyzer::Analyzer`.
      *

package/lib/services/aws-accessanalyzer/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-accessanalyzer");
 /**
  * The `AWS::AccessAnalyzer::Analyzer` resource specifies a new analyzer.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-accessanalyzer");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html
  */
-class CfnAnalyzerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_accessanalyzer.mixins.CfnAnalyzerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAnalyzerPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_accessanalyzer.mixins.CfnAnalyzerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["analyzerConfiguration", "analyzerName", "archiveRules", "tags", "type"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnAnalyzerPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,12 +54,7 @@ class CfnAnalyzerPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAnalyzerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAnalyzerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAnalyzerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-acmpca";
+import { aws_acmpca as acmpcaRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::ACMPCA::Certificate` resource is used to issue a certificate using your private certificate authority.
  *
@@ -13,10 +13,10 @@ import * as service from "aws-cdk-lib/aws-acmpca";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html
  */
-export declare class CfnCertificatePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnCertificatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCertificateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ACMPCA::Certificate`.
      *
@@ -575,7 +575,7 @@ export interface CfnCertificateMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-certificateauthorityarn
      */
-    readonly certificateAuthorityArn?: string;
+    readonly certificateAuthorityArn?: acmpcaRefs.ICertificateAuthorityRef | string;
     /**
      * The certificate signing request (CSR) for the certificate.
      *
@@ -599,7 +599,7 @@ export interface CfnCertificateMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-templatearn
      */
-    readonly templateArn?: string;
+    readonly templateArn?: acmpcaRefs.ICertificateAuthorityRef | string;
     /**
      * The period of time during which the certificate will be valid.
      *
@@ -633,10 +633,10 @@ export interface CfnCertificateMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html
  */
-export declare class CfnCertificateAuthorityPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnCertificateAuthorityPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCertificateAuthorityMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ACMPCA::CertificateAuthority`.
      *
@@ -1183,7 +1183,7 @@ export declare namespace CfnCertificateAuthorityPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-s3bucketname
          */
-        readonly s3BucketName?: string;
+        readonly s3BucketName?: s3Refs.IBucketRef | string;
         /**
          * Determines whether the CRL will be publicly readable or privately held in the CRL Amazon S3 bucket.
          *
@@ -1312,10 +1312,10 @@ export interface CfnCertificateAuthorityMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html
  */
-export declare class CfnCertificateAuthorityActivationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnCertificateAuthorityActivationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCertificateAuthorityActivationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ACMPCA::CertificateAuthorityActivation`.
      *
@@ -1351,7 +1351,7 @@ export interface CfnCertificateAuthorityActivationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html#cfn-acmpca-certificateauthorityactivation-certificateauthorityarn
      */
-    readonly certificateAuthorityArn?: string;
+    readonly certificateAuthorityArn?: acmpcaRefs.ICertificateAuthorityRef | string;
     /**
      * The Base64 PEM-encoded certificate chain that chains up to the root CA certificate that you used to sign your private CA certificate.
      *
@@ -1379,10 +1379,10 @@ export interface CfnCertificateAuthorityActivationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html
  */
-export declare class CfnPermissionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnPermissionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPermissionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ACMPCA::Permission`.
      *
@@ -1420,7 +1420,7 @@ export interface CfnPermissionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html#cfn-acmpca-permission-certificateauthorityarn
      */
-    readonly certificateAuthorityArn?: string;
+    readonly certificateAuthorityArn?: acmpcaRefs.ICertificateAuthorityRef | string;
     /**
      * The AWS service or entity that holds the permission.
      *

package/lib/services/aws-acmpca/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-acmpca");
 /**
  * The `AWS::ACMPCA::Certificate` resource is used to issue a certificate using your private certificate authority.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-acmpca");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html
  */
-class CfnCertificatePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnCertificatePropsMixin", version: "2.240.0-alpha.0" };
+class CfnCertificatePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["apiPassthrough", "certificateAuthorityArn", "certificateSigningRequest", "signingAlgorithm", "templateArn", "validity", "validityNotBefore"];
     props;
     strategy;
@@ -42,8 +40,11 @@ class CfnCertificatePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnCertificateMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,16 +57,22 @@ class CfnCertificatePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnCertificatePropsMixin = CfnCertificatePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnCertificateMixinProps(props) {
+    const ret = {};
+    if ((props.certificateAuthorityArn !== undefined))
+        ret.certificateAuthorityArn = cdk.getRefProperty(props.certificateAuthorityArn?.certificateAuthorityRef, 'certificateAuthorityArn') ?? cdk.ensureStringOrUndefined(props.certificateAuthorityArn, "certificateAuthorityArn", "acmpca.ICertificateAuthorityRef | string");
+    if ((props.certificateSigningRequest !== undefined))
+        ret.certificateSigningRequest = props.certificateSigningRequest;
+    if ((props.templateArn !== undefined))
+        ret.templateArn = cdk.getRefProperty(props.templateArn?.certificateAuthorityRef, 'certificateAuthorityArn') ?? cdk.ensureStringOrUndefined(props.templateArn, "templateArn", "acmpca.ICertificateAuthorityRef | string");
+    return ret;
+}
 /**
  * Use the `AWS::ACMPCA::CertificateAuthority` resource to create a private CA.
  *
@@ -78,8 +85,8 @@ exports.CfnCertificatePropsMixin = CfnCertificatePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html
  */
-class CfnCertificateAuthorityPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnCertificateAuthorityPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCertificateAuthorityPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnCertificateAuthorityPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["csrExtensions", "keyAlgorithm", "keyStorageSecurityStandard", "revocationConfiguration", "signingAlgorithm", "subject", "tags", "type", "usageMode"];
     props;
     strategy;
@@ -101,8 +108,11 @@ class CfnCertificateAuthorityPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnCertificateAuthorityMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -115,16 +125,42 @@ class CfnCertificateAuthorityPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificateAuthorityPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificateAuthorityPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificateAuthorityPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnCertificateAuthorityPropsMixin = CfnCertificateAuthorityPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnCertificateAuthorityPropsMixinCrlConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        crlDistributionPointExtensionConfiguration: (!props.crlDistributionPointExtensionConfiguration ? undefined : props.crlDistributionPointExtensionConfiguration),
+        crlType: (!props.crlType ? undefined : props.crlType),
+        customCname: (!props.customCname ? undefined : props.customCname),
+        customPath: (!props.customPath ? undefined : props.customPath),
+        enabled: (!props.enabled ? undefined : props.enabled),
+        expirationInDays: (!props.expirationInDays ? undefined : props.expirationInDays),
+        s3BucketName: (!props.s3BucketName ? undefined : cdk.getRefProperty(props.s3BucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.s3BucketName, "s3BucketName", "s3.IBucketRef | string")),
+        s3ObjectAcl: (!props.s3ObjectAcl ? undefined : props.s3ObjectAcl)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnCertificateAuthorityPropsMixinRevocationConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        crlConfiguration: (!props.crlConfiguration ? undefined : (!props.crlConfiguration ? undefined : flattenCfnCertificateAuthorityPropsMixinCrlConfigurationProperty(props.crlConfiguration))),
+        ocspConfiguration: (!props.ocspConfiguration ? undefined : props.ocspConfiguration)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnCertificateAuthorityMixinProps(props) {
+    const ret = {};
+    if ((props.revocationConfiguration !== undefined))
+        ret.revocationConfiguration = flattenCfnCertificateAuthorityPropsMixinRevocationConfigurationProperty(props.revocationConfiguration);
+    return ret;
+}
 /**
  * The `AWS::ACMPCA::CertificateAuthorityActivation` resource creates and installs a CA certificate on a CA.
  *
@@ -135,8 +171,8 @@ exports.CfnCertificateAuthorityPropsMixin = CfnCertificateAuthorityPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html
  */
-class CfnCertificateAuthorityActivationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnCertificateAuthorityActivationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCertificateAuthorityActivationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnCertificateAuthorityActivationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificate", "certificateAuthorityArn", "certificateChain", "status"];
     props;
     strategy;
@@ -158,8 +194,11 @@ class CfnCertificateAuthorityActivationPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnCertificateAuthorityActivationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -172,16 +211,18 @@ class CfnCertificateAuthorityActivationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificateAuthorityActivationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificateAuthorityActivationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificateAuthorityActivationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnCertificateAuthorityActivationPropsMixin = CfnCertificateAuthorityActivationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnCertificateAuthorityActivationMixinProps(props) {
+    const ret = {};
+    if ((props.certificateAuthorityArn !== undefined))
+        ret.certificateAuthorityArn = cdk.getRefProperty(props.certificateAuthorityArn?.certificateAuthorityRef, 'certificateAuthorityArn') ?? cdk.ensureStringOrUndefined(props.certificateAuthorityArn, "certificateAuthorityArn", "acmpca.ICertificateAuthorityRef | string");
+    return ret;
+}
 /**
  * Grants permissions to the Certificate Manager ( ACM ) service principal ( `acm.amazonaws.com` ) to perform [IssueCertificate](https://docs.aws.amazon.com/privateca/latest/APIReference/API_IssueCertificate.html) , [GetCertificate](https://docs.aws.amazon.com/privateca/latest/APIReference/API_GetCertificate.html) , and [ListPermissions](https://docs.aws.amazon.com/privateca/latest/APIReference/API_ListPermissions.html) actions on a CA. These actions are needed for the ACM principal to renew private PKI certificates requested through ACM and residing in the same AWS account as the CA.
  *
@@ -196,8 +237,8 @@ exports.CfnCertificateAuthorityActivationPropsMixin = CfnCertificateAuthorityAct
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html
  */
-class CfnPermissionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnPermissionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPermissionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_acmpca.mixins.CfnPermissionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["actions", "certificateAuthorityArn", "principal", "sourceAccount"];
     props;
     strategy;
@@ -219,8 +260,11 @@ class CfnPermissionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnPermissionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -233,13 +277,15 @@ class CfnPermissionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPermissionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPermissionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPermissionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnPermissionPropsMixin = CfnPermissionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnPermissionMixinProps(props) {
+    const ret = {};
+    if ((props.certificateAuthorityArn !== undefined))
+        ret.certificateAuthorityArn = cdk.getRefProperty(props.certificateAuthorityArn?.certificateAuthorityRef, 'certificateAuthorityArn') ?? cdk.ensureStringOrUndefined(props.certificateAuthorityArn, "certificateAuthorityArn", "acmpca.ICertificateAuthorityRef | string");
+    return ret;
+}

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

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

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

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

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

@@ -1,6 +1,5 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-aiops";
 /**
@@ -27,10 +26,10 @@ import * as service from "aws-cdk-lib/aws-aiops";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aiops-investigationgroup.html
  */
-export declare class CfnInvestigationGroupPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnInvestigationGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInvestigationGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AIOps::InvestigationGroup`.
      *

package/lib/services/aws-aiops/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-aiops");
 /**
  * Creates an *investigation group* in your account.
@@ -33,8 +31,8 @@ const service = require("aws-cdk-lib/aws-aiops");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aiops-investigationgroup.html
  */
-class CfnInvestigationGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_aiops.mixins.CfnInvestigationGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnInvestigationGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_aiops.mixins.CfnInvestigationGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["chatbotNotificationChannels", "crossAccountConfigurations", "encryptionConfig", "investigationGroupPolicy", "isCloudTrailEventHistoryEnabled", "name", "retentionInDays", "roleArn", "tagKeyBoundaries", "tags"];
     props;
     strategy;
@@ -57,7 +55,7 @@ class CfnInvestigationGroupPropsMixin 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
@@ -70,12 +68,7 @@ class CfnInvestigationGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInvestigationGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInvestigationGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInvestigationGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -1,6 +1,5 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-amazonmq";
 /**
@@ -32,10 +31,10 @@ import * as service from "aws-cdk-lib/aws-amazonmq";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html
  */
-export declare class CfnBrokerPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnBrokerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBrokerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AmazonMQ::Broker`.
      *
@@ -453,10 +452,10 @@ export interface CfnBrokerMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html
  */
-export declare class CfnConfigurationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AmazonMQ::Configuration`.
      *
@@ -561,10 +560,10 @@ export interface CfnConfigurationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configurationassociation.html
  */
-export declare class CfnConfigurationAssociationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnConfigurationAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfigurationAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AmazonMQ::ConfigurationAssociation`.
      *