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

package/lib/services/aws-internetmonitor/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-internetmonitor");
 /**
  * The `AWS::InternetMonitor::Monitor` resource is an Internet Monitor resource type that contains information about how you create a monitor in Amazon CloudWatch Internet Monitor.
@@ -23,7 +22,7 @@ const service = require("aws-cdk-lib/aws-internetmonitor");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-internetmonitor-monitor.html
  */
 class CfnMonitorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_internetmonitor.mixins.CfnMonitorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_internetmonitor.mixins.CfnMonitorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["healthEventsConfig", "includeLinkedAccounts", "internetMeasurementsLogDelivery", "linkedAccountId", "maxCityNetworksToMonitor", "monitorName", "resources", "resourcesToAdd", "resourcesToRemove", "status", "tags", "trafficPercentageToMonitor"];
     props;
     strategy;
@@ -46,7 +45,7 @@ class CfnMonitorPropsMixin 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
@@ -59,12 +58,7 @@ class CfnMonitorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMonitorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMonitorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMonitorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

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

package/lib/services/aws-invoicing/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-invoicing");
 /**
  * An invoice unit is a set of mutually exclusive account that correspond to your business entity.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-invoicing");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-invoicing-invoiceunit.html
  */
 class CfnInvoiceUnitPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_invoicing.mixins.CfnInvoiceUnitPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_invoicing.mixins.CfnInvoiceUnitPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "invoiceReceiver", "name", "resourceTags", "rule", "taxInheritanceDisabled"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnInvoiceUnitPropsMixin 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 CfnInvoiceUnitPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInvoiceUnitPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInvoiceUnitPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInvoiceUnitPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

package/lib/services/aws-iot/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-iot";
+import { aws_dynamodb as dynamoDbRefs, aws_iam as iamRefs, aws_iotevents as ioTEventsRefs, aws_kinesisfirehose as kinesisFirehoseRefs, aws_lambda as lambdaRefs, aws_s3 as s3Refs, aws_sns as snsRefs, aws_sqs as sqsRefs } from "aws-cdk-lib/interfaces";
 /**
  * Use the `AWS::IoT::AccountAuditConfiguration` resource to configure or reconfigure the Device Defender audit settings for your account.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-iot";
 export declare class CfnAccountAuditConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccountAuditConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::AccountAuditConfiguration`.
      *
@@ -308,7 +309,7 @@ export interface CfnAccountAuditConfigurationMixinProps {
 export declare class CfnAuthorizerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAuthorizerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::Authorizer`.
      *
@@ -405,7 +406,7 @@ export interface CfnAuthorizerMixinProps {
 export declare class CfnBillingGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBillingGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::BillingGroup`.
      *
@@ -477,7 +478,7 @@ export interface CfnBillingGroupMixinProps {
 export declare class CfnCACertificatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCACertificateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::CACertificate`.
      *
@@ -601,7 +602,7 @@ export interface CfnCACertificateMixinProps {
 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::IoT::Certificate`.
      *
@@ -682,7 +683,7 @@ export interface CfnCertificateMixinProps {
 export declare class CfnCustomMetricPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCustomMetricMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::CustomMetric`.
      *
@@ -751,7 +752,7 @@ export interface CfnCustomMetricMixinProps {
 export declare class CfnDimensionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDimensionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::Dimension`.
      *
@@ -816,7 +817,7 @@ export interface CfnDimensionMixinProps {
 export declare class CfnDomainConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDomainConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::DomainConfiguration`.
      *
@@ -1064,7 +1065,7 @@ export interface CfnDomainConfigurationMixinProps {
 export declare class CfnFleetMetricPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFleetMetricMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::FleetMetric`.
      *
@@ -1188,7 +1189,7 @@ export interface CfnFleetMetricMixinProps {
 export declare class CfnJobTemplatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnJobTemplateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::JobTemplate`.
      *
@@ -1554,7 +1555,7 @@ export interface CfnJobTemplateMixinProps {
 export declare class CfnLoggingPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLoggingMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::Logging`.
      *
@@ -1643,7 +1644,7 @@ export interface CfnLoggingMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html#cfn-iot-logging-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
 }
 /**
  * Defines an action that can be applied to audit findings by using StartAuditMitigationActionsTask.
@@ -1658,7 +1659,7 @@ export interface CfnLoggingMixinProps {
 export declare class CfnMitigationActionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMitigationActionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::MitigationAction`.
      *
@@ -1890,7 +1891,7 @@ export interface CfnMitigationActionMixinProps {
 export declare class CfnPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::Policy`.
      *
@@ -1945,7 +1946,7 @@ export interface CfnPolicyMixinProps {
 export declare class CfnPolicyPrincipalAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPolicyPrincipalAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::PolicyPrincipalAttachment`.
      *
@@ -1994,7 +1995,7 @@ export interface CfnPolicyPrincipalAttachmentMixinProps {
 export declare class CfnProvisioningTemplatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProvisioningTemplateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::ProvisioningTemplate`.
      *
@@ -2035,7 +2036,7 @@ export declare namespace CfnProvisioningTemplatePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-provisioningtemplate-provisioninghook.html#cfn-iot-provisioningtemplate-provisioninghook-targetarn
          */
-        readonly targetArn?: string;
+        readonly targetArn?: lambdaRefs.IFunctionRef | string;
     }
 }
 /**
@@ -2071,7 +2072,7 @@ export interface CfnProvisioningTemplateMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-provisioningrolearn
      */
-    readonly provisioningRoleArn?: string;
+    readonly provisioningRoleArn?: iamRefs.IRoleRef | string;
     /**
      * Metadata that can be used to manage the fleet provisioning template.
      *
@@ -2108,7 +2109,7 @@ export interface CfnProvisioningTemplateMixinProps {
 export declare class CfnResourceSpecificLoggingPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourceSpecificLoggingMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::ResourceSpecificLogging`.
      *
@@ -2167,7 +2168,7 @@ export interface CfnResourceSpecificLoggingMixinProps {
 export declare class CfnRoleAliasPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRoleAliasMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::RoleAlias`.
      *
@@ -2210,7 +2211,7 @@ export interface CfnRoleAliasMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-rolealias.html#cfn-iot-rolealias-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
     /**
      * An array of key-value pairs to apply to this resource.
      *
@@ -2233,7 +2234,7 @@ export interface CfnRoleAliasMixinProps {
 export declare class CfnScheduledAuditPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScheduledAuditMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::ScheduledAudit`.
      *
@@ -2329,7 +2330,7 @@ export interface CfnScheduledAuditMixinProps {
 export declare class CfnSecurityProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSecurityProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::SecurityProfile`.
      *
@@ -2710,7 +2711,7 @@ export interface CfnSecurityProfileMixinProps {
 export declare class CfnSoftwarePackagePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSoftwarePackageMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::SoftwarePackage`.
      *
@@ -2773,7 +2774,7 @@ export interface CfnSoftwarePackageMixinProps {
 export declare class CfnSoftwarePackageVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSoftwarePackageVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::SoftwarePackageVersion`.
      *
@@ -2925,7 +2926,7 @@ export interface CfnSoftwarePackageVersionMixinProps {
 export declare class CfnThingPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnThingMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::Thing`.
      *
@@ -3005,7 +3006,7 @@ export interface CfnThingMixinProps {
 export declare class CfnThingGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnThingGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::ThingGroup`.
      *
@@ -3118,7 +3119,7 @@ export interface CfnThingGroupMixinProps {
 export declare class CfnThingPrincipalAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnThingPrincipalAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::ThingPrincipalAttachment`.
      *
@@ -3171,7 +3172,7 @@ export interface CfnThingPrincipalAttachmentMixinProps {
 export declare class CfnThingTypePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnThingTypeMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::ThingType`.
      *
@@ -3309,7 +3310,7 @@ export interface CfnThingTypeMixinProps {
 export declare class CfnTopicRulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTopicRuleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::TopicRule`.
      *
@@ -3534,7 +3535,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-bucketname
          */
-        readonly bucketName?: string;
+        readonly bucketName?: s3Refs.IBucketRef | string;
         /**
          * The Amazon S3 canned ACL that controls access to the object identified by the object key.
          *
@@ -3556,7 +3557,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
     }
     /**
      * Describes an action that updates a CloudWatch alarm.
@@ -3616,7 +3617,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html#cfn-iot-topicrule-ioteventsaction-inputname
          */
-        readonly inputName?: string;
+        readonly inputName?: ioTEventsRefs.IInputRef | string;
         /**
          * The ID of the message. The default `messageId` is a new UUID value.
          *
@@ -3634,7 +3635,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html#cfn-iot-topicrule-ioteventsaction-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
     }
     /**
      * Describes an action that writes data to an Amazon Kinesis Firehose stream.
@@ -3657,13 +3658,13 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-deliverystreamname
          */
-        readonly deliveryStreamName?: string;
+        readonly deliveryStreamName?: kinesisFirehoseRefs.IDeliveryStreamRef | string;
         /**
          * The IAM role that grants access to the Amazon Kinesis Firehose stream.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
         /**
          * A character separator that will be used to separate records written to the Firehose stream.
          *
@@ -3700,7 +3701,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html#cfn-iot-topicrule-republishaction-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
         /**
          * The name of the MQTT topic.
          *
@@ -4175,7 +4176,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html#cfn-iot-topicrule-dynamodbv2action-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
     }
     /**
      * The input for the DynamoActionVS action that specifies the DynamoDB table to which the message data will be written.
@@ -4190,7 +4191,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putiteminput.html#cfn-iot-topicrule-putiteminput-tablename
          */
-        readonly tableName?: string;
+        readonly tableName?: dynamoDbRefs.ITableRef | string;
     }
     /**
      * Describes an action that captures a CloudWatch metric.
@@ -4456,13 +4457,13 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-queueurl
          */
-        readonly queueUrl?: string;
+        readonly queueUrl?: sqsRefs.IQueueRef | string;
         /**
          * The ARN of the IAM role that grants access.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
         /**
          * Specifies whether to use Base64 encoding.
          *
@@ -4638,7 +4639,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotanalyticsaction.html#cfn-iot-topicrule-iotanalyticsaction-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
     }
     /**
      * Describes an action to publish to an Amazon SNS topic.
@@ -4661,13 +4662,13 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
         /**
          * The ARN of the SNS topic.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-targetarn
          */
-        readonly targetArn?: string;
+        readonly targetArn?: snsRefs.ITopicRef | string;
     }
     /**
      * Describes an action to invoke a Lambda function.
@@ -4682,7 +4683,7 @@ export declare namespace CfnTopicRulePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-lambdaaction.html#cfn-iot-topicrule-lambdaaction-functionarn
          */
-        readonly functionArn?: string;
+        readonly functionArn?: lambdaRefs.IFunctionRef | string;
     }
     /**
      * Describes an action to send device location updates from an MQTT message to an Amazon Location tracker resource.
@@ -4797,7 +4798,7 @@ export interface CfnTopicRuleMixinProps {
 export declare class CfnTopicRuleDestinationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTopicRuleDestinationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::TopicRuleDestination`.
      *
@@ -4909,7 +4910,7 @@ export interface CfnTopicRuleDestinationMixinProps {
 export declare class CfnCertificateProviderPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCertificateProviderMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::CertificateProvider`.
      *
@@ -4972,7 +4973,7 @@ export interface CfnCertificateProviderMixinProps {
 export declare class CfnCommandPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCommandMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::Command`.
      *
@@ -5251,7 +5252,7 @@ export interface CfnCommandMixinProps {
 export declare class CfnEncryptionConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEncryptionConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoT::EncryptionConfiguration`.
      *