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

package/README.md

@@ -15,105 +15,26 @@
 
 <!--END STABILITY BANNER-->
 
-> **Note**: The core Mixins mechanism (`Mixins`, `Mixin`, `IMixin`, `MixinApplicator`, `ConstructSelector`) is now available in `constructs` and `aws-cdk-lib/core`. Please update your imports.
-> This package continues to provide additional preview features until they move to their final destinations.
-
-This package provides two main features:
-
-1. **Mixins** - Composable abstractions for adding functionality to constructs
-2. **EventBridge Event Patterns** - Type-safe event patterns for AWS resources
+> **Note**: The core Mixins mechanism (`Mixins`, `Mixin`, `IMixin`, `MixinApplicator`, `ConstructSelector`) is now available in `constructs` and `aws-cdk-lib`.
+> All service Mixins are now available in `aws-cdk-lib`.
+> Please update your imports.
+>
+> This package continues to provide **Logs Delivery Mixins** and **EventBridge Event Facades**.
 
 ---
 
 CDK Mixins provide a new, advanced way to add functionality through composable abstractions.
 Unlike traditional L2 constructs that bundle all features together, Mixins allow you to pick and choose exactly the capabilities you need for constructs.
-
-## Key Benefits
-
-CDK Mixins offer a well-defined way to build self-contained constructs features.
-Mixins are applied during or after construct construction.
-
-* **Universal Compatibility**: Apply the same abstractions to L1 constructs, L2 constructs, or custom constructs
-* **Composable Design**: Mix and match features without being locked into specific implementations
-* **Cross-Service Abstractions**: Use common patterns like encryption across different AWS services
-* **Escape Hatch Freedom**: Customize resources in a safe, typed way while keeping the abstractions you want
-
+Mixins can be applied during or after construct construction.
 Mixins are an _addition_, _not_ a replacement for construct properties.
 By itself, they cannot change optionality of properties or change defaults.
 
-### Usage and documentation
+## Usage and documentation
 
-See the [documentation for `aws-cdk-lib`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib-readme.html#mixins).
+See the [documentation for CDK Mixins](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib-readme.html#mixins) in  `aws-cdk-lib`.
 
 ### Built-in Mixins
 
-#### Cross-Service Mixins
-
-**EncryptionAtRest**: Applies encryption to supported AWS resources
-
-```typescript
-// Works across different resource types
-const myBucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(myBucket).apply(new EncryptionAtRest());
-
-const myLogGroup = new logs.CfnLogGroup(scope, "LogGroup");
-Mixins.of(myLogGroup).apply(new EncryptionAtRest());
-```
-
-#### S3-Specific Mixins
-
-**AutoDeleteObjects**: Configures automatic object deletion for S3 buckets
-
-```typescript
-const myBucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(myBucket).apply(new AutoDeleteObjects());
-```
-
-**BucketVersioning**: Enables versioning on S3 buckets
-
-```typescript
-const myBucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(myBucket).apply(new BucketVersioning());
-```
-
-**BucketBlockPublicAccess**: Enables blocking public-access on S3 buckets
-
-```typescript
-const myBucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(myBucket).apply(new BucketBlockPublicAccess());
-```
-
-**BucketPolicyStatementsMixin**: Adds IAM policy statements to a bucket policy
-
-```typescript
-const bucketPolicy = new s3.CfnBucketPolicy(scope, "BucketPolicy", {
-  bucket: bucket,
-  policyDocument: new iam.PolicyDocument(),
-});
-Mixins.of(bucketPolicy).apply(new BucketPolicyStatementsMixin([
-  new iam.PolicyStatement({
-    actions: ["s3:GetObject"],
-    resources: ["*"],
-    principals: [new iam.AnyPrincipal()],
-  }),
-]));
-```
-
-#### ECS-Specific Mixins
-
-**ClusterSettings**: Applies one or more cluster settings to ECS clusters
-
-```typescript
-import * as ecs from 'aws-cdk-lib/aws-ecs';
-import { ClusterSettings } from '@aws-cdk/mixins-preview/aws-ecs/mixins';
-
-const cluster = new ecs.CfnCluster(scope, "Cluster");
-Mixins.of(cluster).apply(new ClusterSettings([{
-  name: "containerInsights",
-  value: "enhanced",
-}]));
-```
-
 ### Logs Delivery
 
 Configures vended logs delivery for supported resources to various destinations:
@@ -148,7 +69,6 @@ distribution
 Configures vended logs delivery for supported resources when a pre-created destination is provided:
 
 ```typescript
-import '@aws-cdk/mixins-preview/with';
 import * as cloudfrontMixins from '@aws-cdk/mixins-preview/aws-cloudfront/mixins';
 
 // Create CloudFront distribution
@@ -180,7 +100,6 @@ distribution
 Vended Logs Configuration for Cross Account delivery (only supported for S3 and Firehose destinations)
 
 ```typescript
-import '@aws-cdk/mixins-preview/with';
 import * as logDestinations from '@aws-cdk/mixins-preview/aws-logs';
 import * as cloudfrontMixins from '@aws-cdk/mixins-preview/aws-cloudfront/mixins';
 
@@ -230,8 +149,6 @@ distribution
 For every CloudFormation resource, CDK Mixins automatically generates type-safe property mixins. These allow you to apply L1 properties with full TypeScript support:
 
 ```typescript
-import '@aws-cdk/mixins-preview/with';
-
 new s3.Bucket(scope, "Bucket")
   .with(new CfnBucketPropsMixin({
     versioningConfiguration: { status: "Enabled" },
@@ -242,43 +159,65 @@ new s3.Bucket(scope, "Bucket")
   }));
 ```
 
+Deeply nested properties support cross-service references, such as passing a KMS key for encryption:
+
+```typescript
+const key = new kms.Key(scope, "Key");
+
+new s3.Bucket(scope, "Bucket")
+  .with(new CfnBucketPropsMixin({
+    bucketEncryption: {
+      serverSideEncryptionConfiguration: [{
+        serverSideEncryptionByDefault: {
+          sseAlgorithm: "aws:kms",
+          kmsMasterKeyId: key,
+        },
+      }],
+    },
+  }));
+```
+
 Property mixins support two merge strategies:
 
 ```typescript
-// MERGE (default): Deep merges properties with existing values
+// COMBINE (default): Deep merges properties with existing values
 Mixins.of(bucket).apply(new CfnBucketPropsMixin(
   { versioningConfiguration: { status: "Enabled" } },
-  { strategy: PropertyMergeStrategy.MERGE }
+  { strategy: PropertyMergeStrategy.combine() }
 ));
 
 // OVERRIDE: Replaces existing property values
 Mixins.of(bucket).apply(new CfnBucketPropsMixin(
   { versioningConfiguration: { status: "Enabled" } },
-  { strategy: PropertyMergeStrategy.OVERRIDE }
+  { strategy: PropertyMergeStrategy.override() }
 ));
 ```
 
-Property mixins are available for all AWS services:
+You can also implement `IMergeStrategy` to define a custom strategy:
 
 ```typescript
-import { CfnLogGroupPropsMixin } from '@aws-cdk/mixins-preview/aws-logs/mixins';
-import { CfnFunctionPropsMixin } from '@aws-cdk/mixins-preview/aws-lambda/mixins';
-import { CfnTablePropsMixin } from '@aws-cdk/mixins-preview/aws-dynamodb/mixins';
-```
+class MyCustomStrategy implements IMergeStrategy {
+  public apply(target: object, source: object, allowedKeys: string[]) {
+    for (const key of allowedKeys) {
+      if (key in source) {
+        (target as any)[key] = (source as any)[key];
+      }
+    }
+  }
+}
 
-### Error Handling
+Mixins.of(bucket).apply(new CfnBucketPropsMixin(
+  { tags: [{ key: 'Extra', value: 'Tag' }] },
+  { strategy: new MyCustomStrategy() }
+));
+```
 
-Mixins provide comprehensive error handling:
+Property mixins are available for all AWS services:
 
 ```typescript
-// Graceful handling of unsupported constructs
-Mixins.of(scope)
-  .apply(new EncryptionAtRest()); // Skips unsupported constructs
-
-// Strict application that requires all constructs to match
-Mixins.of(scope)
-  .requireAll() // Throws if no constructs support the mixin
-  .apply(new EncryptionAtRest());
+import { CfnLogGroupPropsMixin } from '@aws-cdk/mixins-preview/aws-logs/mixins';
+import { CfnFunctionPropsMixin } from '@aws-cdk/mixins-preview/aws-lambda/mixins';
+import { CfnTablePropsMixin } from '@aws-cdk/mixins-preview/aws-dynamodb/mixins';
 ```
 
 ---

package/lib/mixins/property-mixins.d.ts

@@ -1,16 +1,5 @@
-/**
- * Strategy for handling nested properties in L1 property mixins
- */
-export declare enum PropertyMergeStrategy {
-    /**
-     * Override all properties
-     */
-    OVERRIDE = "override",
-    /**
-     * Deep merge nested objects, override primitives and arrays
-     */
-    MERGE = "merge"
-}
+import type { IMergeStrategy } from 'aws-cdk-lib/core';
+export { type IMergeStrategy, PropertyMergeStrategy } from 'aws-cdk-lib/core';
 /**
  * Options for applying CfnProperty mixins
  */
@@ -18,7 +7,7 @@ export interface CfnPropertyMixinOptions {
     /**
      * Strategy for merging nested properties
      *
-     * @default - PropertyMergeStrategy.MERGE
+     * @default - PropertyMergeStrategy.combine()
      */
-    readonly strategy?: PropertyMergeStrategy;
+    readonly strategy?: IMergeStrategy;
 }

package/lib/mixins/property-mixins.js

@@ -1,17 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertyMergeStrategy = void 0;
-/**
- * Strategy for handling nested properties in L1 property mixins
- */
-var PropertyMergeStrategy;
-(function (PropertyMergeStrategy) {
-    /**
-     * Override all properties
-     */
-    PropertyMergeStrategy["OVERRIDE"] = "override";
-    /**
-     * Deep merge nested objects, override primitives and arrays
-     */
-    PropertyMergeStrategy["MERGE"] = "merge";
-})(PropertyMergeStrategy || (exports.PropertyMergeStrategy = PropertyMergeStrategy = {}));
+var core_1 = require("aws-cdk-lib/core");
+Object.defineProperty(exports, "PropertyMergeStrategy", { enumerable: true, get: function () { return core_1.PropertyMergeStrategy; } });

package/lib/services/alexa-ask/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.alexa.ask"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK",
-      "packageId": "Amazon.CDK.Mixins.Preview.Alexa.ASK"
+      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.alexa_ask"

package/lib/services/alexa-ask/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.alexa.ask.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.Alexa.ASK.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.alexa_ask.mixins"

package/lib/services/alexa-ask/cfn-props-mixins.generated.d.ts

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/alexa-ask";
 export declare class CfnSkillPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSkillMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `Alexa::ASK::Skill`.
      *

package/lib/services/alexa-ask/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/alexa-ask");
 /**
  * The `Alexa::ASK::Skill` resource creates an Alexa skill that enables customers to access new abilities.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/alexa-ask");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html
  */
 class CfnSkillPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.alexa_ask.mixins.CfnSkillPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.alexa_ask.mixins.CfnSkillPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authenticationConfiguration", "skillPackage", "vendorId"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnSkillPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,12 +54,7 @@ class CfnSkillPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSkillPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSkillPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSkillPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-accessanalyzer";
 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

@@ -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-accessanalyzer");
 /**
  * The `AWS::AccessAnalyzer::Analyzer` resource specifies a new analyzer.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-accessanalyzer");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html
  */
 class CfnAnalyzerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_accessanalyzer.mixins.CfnAnalyzerPropsMixin", version: "2.241.0-alpha.0" };
+    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;
@@ -42,7 +41,7 @@ class CfnAnalyzerPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,12 +54,7 @@ class CfnAnalyzerPropsMixin extends cdk.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

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 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.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-acmpca";
 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`.
      *
@@ -574,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.
      *
@@ -598,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.
      *
@@ -635,7 +636,7 @@ export interface CfnCertificateMixinProps {
 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`.
      *
@@ -1182,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.
          *
@@ -1314,7 +1315,7 @@ export interface CfnCertificateAuthorityMixinProps {
 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`.
      *
@@ -1350,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.
      *
@@ -1381,7 +1382,7 @@ export interface CfnCertificateAuthorityActivationMixinProps {
 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`.
      *
@@ -1419,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.
      *