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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-location";
 export declare class CfnGeofenceCollectionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGeofenceCollectionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::GeofenceCollection`.
      *
@@ -107,7 +107,7 @@ export interface CfnGeofenceCollectionMixinProps {
 export declare class CfnMapPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMapMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::Map`.
      *
@@ -269,7 +269,7 @@ export interface CfnMapMixinProps {
 export declare class CfnPlaceIndexPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPlaceIndexMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::PlaceIndex`.
      *
@@ -390,7 +390,7 @@ export interface CfnPlaceIndexMixinProps {
 export declare class CfnRouteCalculatorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRouteCalculatorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::RouteCalculator`.
      *
@@ -477,7 +477,7 @@ export interface CfnRouteCalculatorMixinProps {
 export declare class CfnTrackerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTrackerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::Tracker`.
      *
@@ -584,7 +584,7 @@ export interface CfnTrackerMixinProps {
 export declare class CfnTrackerConsumerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTrackerConsumerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::TrackerConsumer`.
      *
@@ -643,7 +643,7 @@ export interface CfnTrackerConsumerMixinProps {
 export declare class CfnAPIKeyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAPIKeyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Location::APIKey`.
      *

package/lib/services/aws-location/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-location");
 /**
  * The `AWS::Location::GeofenceCollection` resource specifies the ability to detect and act when a tracked device enters or exits a defined geographical boundary known as a geofence.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-location");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html
  */
 class CfnGeofenceCollectionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnGeofenceCollectionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnGeofenceCollectionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["collectionName", "description", "kmsKeyId", "pricingPlan", "pricingPlanDataSource", "tags"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnGeofenceCollectionPropsMixin 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 CfnGeofenceCollectionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGeofenceCollectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGeofenceCollectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGeofenceCollectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,7 +66,7 @@ exports.CfnGeofenceCollectionPropsMixin = CfnGeofenceCollectionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html
  */
 class CfnMapPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnMapPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnMapPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["configuration", "description", "mapName", "pricingPlan", "tags"];
     props;
     strategy;
@@ -95,7 +89,7 @@ class CfnMapPropsMixin 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 CfnMapPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMapPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMapPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMapPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -131,7 +120,7 @@ exports.CfnMapPropsMixin = CfnMapPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html
  */
 class CfnPlaceIndexPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnPlaceIndexPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnPlaceIndexPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataSource", "dataSourceConfiguration", "description", "indexName", "pricingPlan", "tags"];
     props;
     strategy;
@@ -154,7 +143,7 @@ class CfnPlaceIndexPropsMixin 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
@@ -167,12 +156,7 @@ class CfnPlaceIndexPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPlaceIndexPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPlaceIndexPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPlaceIndexPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -190,7 +174,7 @@ exports.CfnPlaceIndexPropsMixin = CfnPlaceIndexPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html
  */
 class CfnRouteCalculatorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnRouteCalculatorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnRouteCalculatorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["calculatorName", "dataSource", "description", "pricingPlan", "tags"];
     props;
     strategy;
@@ -213,7 +197,7 @@ class CfnRouteCalculatorPropsMixin 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
@@ -226,12 +210,7 @@ class CfnRouteCalculatorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteCalculatorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteCalculatorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteCalculatorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -245,7 +224,7 @@ exports.CfnRouteCalculatorPropsMixin = CfnRouteCalculatorPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html
  */
 class CfnTrackerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnTrackerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnTrackerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "eventBridgeEnabled", "kmsKeyEnableGeospatialQueries", "kmsKeyId", "positionFiltering", "pricingPlan", "pricingPlanDataSource", "tags", "trackerName"];
     props;
     strategy;
@@ -268,7 +247,7 @@ class CfnTrackerPropsMixin 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
@@ -281,12 +260,7 @@ class CfnTrackerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrackerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrackerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrackerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -304,7 +278,7 @@ exports.CfnTrackerPropsMixin = CfnTrackerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-trackerconsumer.html
  */
 class CfnTrackerConsumerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnTrackerConsumerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnTrackerConsumerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["consumerArn", "trackerName"];
     props;
     strategy;
@@ -327,7 +301,7 @@ class CfnTrackerConsumerPropsMixin 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
@@ -340,12 +314,7 @@ class CfnTrackerConsumerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrackerConsumerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrackerConsumerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrackerConsumerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -359,7 +328,7 @@ exports.CfnTrackerConsumerPropsMixin = CfnTrackerConsumerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-apikey.html
  */
 class CfnAPIKeyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnAPIKeyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_location.mixins.CfnAPIKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "expireTime", "forceDelete", "forceUpdate", "keyName", "noExpiry", "restrictions", "tags"];
     props;
     strategy;
@@ -382,7 +351,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
@@ -395,12 +364,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);
         }
     }
 }

package/lib/services/aws-logs/.events.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.logs.events"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.Logs.Events",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.Logs.Events"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.Logs.Events"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_logs.events"

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

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

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

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

package/lib/services/aws-logs/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-logs";
+import { aws_iam as iamRefs, aws_kinesis as kinesisRefs, aws_kinesisfirehose as kinesisFirehoseRefs, aws_kms as kmsRefs, aws_lambda as lambdaRefs, aws_logs as logsRefs } from "aws-cdk-lib/interfaces";
 /**
  * Creates or updates an account-level data protection policy or subscription filter policy that applies to all log groups or a subset of log groups in the account.
  *
@@ -68,7 +69,7 @@ import * as service from "aws-cdk-lib/aws-logs";
 export declare class CfnAccountPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccountPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::AccountPolicy`.
      *
@@ -196,7 +197,7 @@ export interface CfnAccountPolicyMixinProps {
 export declare class CfnDestinationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDestinationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::Destination`.
      *
@@ -238,7 +239,7 @@ export interface CfnDestinationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
     /**
      * The tags that have been assigned to this delivery destination.
      *
@@ -250,7 +251,7 @@ export interface CfnDestinationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-targetarn
      */
-    readonly targetArn?: string;
+    readonly targetArn?: kinesisFirehoseRefs.IDeliveryStreamRef | kinesisRefs.IStreamRef | lambdaRefs.IFunctionRef | string;
 }
 /**
  * The `AWS::Logs::LogGroup` resource specifies a log group.
@@ -271,7 +272,7 @@ export interface CfnDestinationMixinProps {
 export declare class CfnLogGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLogGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::LogGroup`.
      *
@@ -336,7 +337,7 @@ export interface CfnLogGroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-kmskeyid
      */
-    readonly kmsKeyId?: string;
+    readonly kmsKeyId?: kmsRefs.IKeyRef | string;
     /**
      * Specifies the log group class for this log group. There are two classes:.
      *
@@ -356,7 +357,7 @@ export interface CfnLogGroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-loggroupname
      */
-    readonly logGroupName?: string;
+    readonly logGroupName?: lambdaRefs.IFunctionRef | string;
     /**
      * Creates or updates a resource policy for the specified log group that allows other services to put log events to this account.
      *
@@ -405,7 +406,7 @@ export interface CfnLogGroupMixinProps {
 export declare class CfnLogStreamPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLogStreamMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::LogStream`.
      *
@@ -435,7 +436,7 @@ export interface CfnLogStreamMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html#cfn-logs-logstream-loggroupname
      */
-    readonly logGroupName?: string;
+    readonly logGroupName?: logsRefs.ILogGroupRef | string;
     /**
      * The name of the log stream.
      *
@@ -460,7 +461,7 @@ export interface CfnLogStreamMixinProps {
 export declare class CfnMetricFilterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMetricFilterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::MetricFilter`.
      *
@@ -626,7 +627,7 @@ export interface CfnMetricFilterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-logs-metricfilter-loggroupname
      */
-    readonly logGroupName?: string;
+    readonly logGroupName?: logsRefs.ILogGroupRef | string;
     /**
      * The metric transformations.
      *
@@ -647,7 +648,7 @@ export interface CfnMetricFilterMixinProps {
 export declare class CfnQueryDefinitionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnQueryDefinitionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::QueryDefinition`.
      *
@@ -677,7 +678,7 @@ export interface CfnQueryDefinitionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html#cfn-logs-querydefinition-loggroupnames
      */
-    readonly logGroupNames?: Array<string>;
+    readonly logGroupNames?: Array<logsRefs.ILogGroupRef | string>;
     /**
      * A name for the query definition.
      *
@@ -717,7 +718,7 @@ export interface CfnQueryDefinitionMixinProps {
 export declare class CfnResourcePolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourcePolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::ResourcePolicy`.
      *
@@ -777,7 +778,7 @@ export interface CfnResourcePolicyMixinProps {
 export declare class CfnSubscriptionFilterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSubscriptionFilterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::SubscriptionFilter`.
      *
@@ -817,7 +818,7 @@ export interface CfnSubscriptionFilterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-destinationarn
      */
-    readonly destinationArn?: string;
+    readonly destinationArn?: kinesisFirehoseRefs.IDeliveryStreamRef | kinesisRefs.IStreamRef | lambdaRefs.IFunctionRef | string;
     /**
      * The method used to distribute log data to the destination, which can be either random or grouped by log stream.
      *
@@ -861,7 +862,7 @@ export interface CfnSubscriptionFilterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-loggroupname
      */
-    readonly logGroupName?: string;
+    readonly logGroupName?: logsRefs.ILogGroupRef | string;
     /**
      * The ARN of an IAM role that grants CloudWatch Logs permissions to deliver ingested log events to the destination stream.
      *
@@ -869,7 +870,7 @@ export interface CfnSubscriptionFilterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
 }
 /**
  * This structure contains information about one *delivery* in your account.
@@ -888,7 +889,7 @@ export interface CfnSubscriptionFilterMixinProps {
 export declare class CfnDeliveryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDeliveryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::Delivery`.
      *
@@ -984,7 +985,7 @@ export interface CfnDeliveryMixinProps {
 export declare class CfnDeliveryDestinationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDeliveryDestinationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::DeliveryDestination`.
      *
@@ -1100,7 +1101,7 @@ export interface CfnDeliveryDestinationMixinProps {
 export declare class CfnDeliverySourcePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDeliverySourceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::DeliverySource`.
      *
@@ -1173,7 +1174,7 @@ export interface CfnDeliverySourceMixinProps {
 export declare class CfnIntegrationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIntegrationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::Integration`.
      *
@@ -1302,7 +1303,7 @@ export interface CfnIntegrationMixinProps {
 export declare class CfnLogAnomalyDetectorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLogAnomalyDetectorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::LogAnomalyDetector`.
      *
@@ -1393,7 +1394,7 @@ export interface CfnLogAnomalyDetectorMixinProps {
 export declare class CfnScheduledQueryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScheduledQueryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::ScheduledQuery`.
      *
@@ -1543,7 +1544,7 @@ export interface CfnScheduledQueryMixinProps {
 export declare class CfnTransformerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTransformerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Logs::Transformer`.
      *