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

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

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

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

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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-ram";
 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::RAM::Permission`.
      *
@@ -90,7 +90,7 @@ export interface CfnPermissionMixinProps {
 export declare class CfnResourceSharePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourceShareMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RAM::ResourceShare`.
      *

package/lib/services/aws-ram/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-ram");
 /**
  * Creates a customer managed permission for a specified resource type that you can attach to resource shares.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-ram");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-permission.html
  */
 class CfnPermissionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ram.mixins.CfnPermissionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ram.mixins.CfnPermissionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "policyTemplate", "resourceType", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnPermissionPropsMixin 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 CfnPermissionPropsMixin extends cdk.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);
         }
     }
 }
@@ -78,7 +72,7 @@ exports.CfnPermissionPropsMixin = CfnPermissionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html
  */
 class CfnResourceSharePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ram.mixins.CfnResourceSharePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ram.mixins.CfnResourceSharePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allowExternalPrincipals", "name", "permissionArns", "principals", "resourceArns", "sources", "tags"];
     props;
     strategy;
@@ -101,7 +95,7 @@ class CfnResourceSharePropsMixin 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
@@ -114,12 +108,7 @@ class CfnResourceSharePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourceSharePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourceSharePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourceSharePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

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

package/lib/services/aws-rbin/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-rbin");
 /**
  * Creates a Recycle Bin retention rule. You can create two types of retention rules:.
@@ -22,7 +21,7 @@ const service = require("aws-cdk-lib/aws-rbin");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rbin-rule.html
  */
 class CfnRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rbin.mixins.CfnRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rbin.mixins.CfnRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "excludeResourceTags", "lockConfiguration", "resourceTags", "resourceType", "retentionPeriod", "status", "tags"];
     props;
     strategy;
@@ -45,7 +44,7 @@ class CfnRulePropsMixin 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
@@ -58,12 +57,7 @@ class CfnRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

@@ -0,0 +1,16 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.mixins.preview.services.rds.events"
+    },
+    "dotnet": {
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.RDS.Events"
+    },
+    "python": {
+      "module": "aws_cdk.mixins_preview.aws_rds.events"
+    },
+    "go": {
+      "packageName": "previewawsrdsevents"
+    }
+  }
+}

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

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

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

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

package/lib/services/aws-rds/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-rds";
+import { aws_ec2 as ec2Refs, aws_iam as iamRefs, aws_kms as kmsRefs, aws_rds as rdsRefs, aws_secretsmanager as secretsManagerRefs, aws_sns as snsRefs } from "aws-cdk-lib/interfaces";
 /**
  * Creates a custom DB engine version (CEV).
  *
@@ -13,7 +14,7 @@ import * as service from "aws-cdk-lib/aws-rds";
 export declare class CfnCustomDBEngineVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCustomDBEngineVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::CustomDBEngineVersion`.
      *
@@ -187,7 +188,7 @@ export interface CfnCustomDBEngineVersionMixinProps {
 export declare class CfnDBClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBCluster`.
      *
@@ -265,7 +266,7 @@ export declare namespace CfnDBClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-masterusersecret.html#cfn-rds-dbcluster-masterusersecret-kmskeyid
          */
-        readonly kmsKeyId?: string;
+        readonly kmsKeyId?: kmsRefs.IKeyRef | string;
         /**
          * The Amazon Resource Name (ARN) of the secret.
          *
@@ -377,7 +378,7 @@ export declare namespace CfnDBClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-dbclusterrole.html#cfn-rds-dbcluster-dbclusterrole-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
     }
     /**
      * The `Endpoint` return value specifies the connection endpoint for the primary instance of the DB cluster.
@@ -584,7 +585,7 @@ export interface CfnDBClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbclusterparametergroupname
      */
-    readonly dbClusterParameterGroupName?: string;
+    readonly dbClusterParameterGroupName?: rdsRefs.IDBClusterParameterGroupRef | string;
     /**
      * The name of the DB parameter group to apply to all instances of the DB cluster.
      *
@@ -611,7 +612,7 @@ export interface CfnDBClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbsubnetgroupname
      */
-    readonly dbSubnetGroupName?: string;
+    readonly dbSubnetGroupName?: rdsRefs.IDBSubnetGroupRef | string;
     /**
      * Reserved for future use.
      *
@@ -826,7 +827,7 @@ export interface CfnDBClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-globalclusteridentifier
      */
-    readonly globalClusterIdentifier?: string;
+    readonly globalClusterIdentifier?: rdsRefs.IGlobalClusterRef | string;
     /**
      * The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for each DB instance in the Multi-AZ DB cluster.
      *
@@ -856,7 +857,7 @@ export interface CfnDBClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-kmskeyid
      */
-    readonly kmsKeyId?: string;
+    readonly kmsKeyId?: kmsRefs.IKeyRef | string;
     /**
      * Specifies whether to manage the master user password with AWS Secrets Manager.
      *
@@ -1264,7 +1265,7 @@ export interface CfnDBClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-vpcsecuritygroupids
      */
-    readonly vpcSecurityGroupIds?: Array<string>;
+    readonly vpcSecurityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
 }
 /**
  * The `AWS::RDS::DBClusterParameterGroup` resource creates a new Amazon RDS DB cluster parameter group.
@@ -1283,7 +1284,7 @@ export interface CfnDBClusterMixinProps {
 export declare class CfnDBClusterParameterGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBClusterParameterGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBClusterParameterGroup`.
      *
@@ -1425,7 +1426,7 @@ export interface CfnDBClusterParameterGroupMixinProps {
 export declare class CfnDBInstancePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBInstanceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBInstance`.
      *
@@ -1458,7 +1459,7 @@ export declare namespace CfnDBInstancePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-masterusersecret.html#cfn-rds-dbinstance-masterusersecret-kmskeyid
          */
-        readonly kmsKeyId?: string;
+        readonly kmsKeyId?: kmsRefs.IKeyRef | string;
         /**
          * The Amazon Resource Name (ARN) of the secret.
          *
@@ -1943,7 +1944,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-dbclusteridentifier
      */
-    readonly dbClusterIdentifier?: string;
+    readonly dbClusterIdentifier?: rdsRefs.IDBClusterRef | string;
     /**
      * The identifier for the Multi-AZ DB cluster snapshot to restore from.
      *
@@ -2055,7 +2056,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-dbparametergroupname
      */
-    readonly dbParameterGroupName?: string;
+    readonly dbParameterGroupName?: rdsRefs.IDBParameterGroupRef | string;
     /**
      * A list of the DB security groups to assign to the DB instance.
      *
@@ -2136,7 +2137,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-dbsubnetgroupname
      */
-    readonly dbSubnetGroupName?: string;
+    readonly dbSubnetGroupName?: rdsRefs.IDBSubnetGroupRef | string;
     /**
      * The Oracle system identifier (SID), which is the name of the Oracle database instance that manages your database files.
      *
@@ -2426,7 +2427,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-kmskeyid
      */
-    readonly kmsKeyId?: string;
+    readonly kmsKeyId?: kmsRefs.IKeyRef | string;
     /**
      * License model information for this DB instance.
      *
@@ -2616,7 +2617,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-monitoringrolearn
      */
-    readonly monitoringRoleArn?: string;
+    readonly monitoringRoleArn?: iamRefs.IRoleRef | string;
     /**
      * Specifies whether the DB instance is a Multi-AZ deployment.
      *
@@ -2669,7 +2670,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-performanceinsightskmskeyid
      */
-    readonly performanceInsightsKmsKeyId?: string;
+    readonly performanceInsightsKmsKeyId?: kmsRefs.IKeyRef | string;
     /**
      * The number of days to retain Performance Insights data.
      *
@@ -2851,7 +2852,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-sourcedbinstanceidentifier
      */
-    readonly sourceDbInstanceIdentifier?: string;
+    readonly sourceDbInstanceIdentifier?: rdsRefs.IDBInstanceRef | string;
     /**
      * The resource ID of the source DB instance from which to restore.
      *
@@ -2973,7 +2974,7 @@ export interface CfnDBInstanceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-vpcsecuritygroups
      */
-    readonly vpcSecurityGroups?: Array<string>;
+    readonly vpcSecurityGroups?: Array<ec2Refs.ISecurityGroupRef | string>;
 }
 /**
  * The `AWS::RDS::DBParameterGroup` resource creates a custom parameter group for an RDS database family.
@@ -2994,7 +2995,7 @@ export interface CfnDBInstanceMixinProps {
 export declare class CfnDBParameterGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBParameterGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBParameterGroup`.
      *
@@ -3116,7 +3117,7 @@ export interface CfnDBParameterGroupMixinProps {
 export declare class CfnDBProxyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBProxyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBProxy`.
      *
@@ -3175,7 +3176,7 @@ export declare namespace CfnDBProxyPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-secretarn
          */
-        readonly secretArn?: string;
+        readonly secretArn?: secretsManagerRefs.ISecretRef | string;
     }
     /**
      * Metadata assigned to an Amazon RDS resource consisting of a key-value pair.
@@ -3286,7 +3287,7 @@ export interface CfnDBProxyMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
     /**
      * An optional set of key-value pairs to associate arbitrary data of your choosing with the proxy.
      *
@@ -3313,13 +3314,13 @@ export interface CfnDBProxyMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-vpcsecuritygroupids
      */
-    readonly vpcSecurityGroupIds?: Array<string>;
+    readonly vpcSecurityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
     /**
      * One or more VPC subnet IDs to associate with the new proxy.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-vpcsubnetids
      */
-    readonly vpcSubnetIds?: Array<string>;
+    readonly vpcSubnetIds?: Array<ec2Refs.ISubnetRef | string>;
 }
 /**
  * The `AWS::RDS::DBProxyEndpoint` resource creates or updates a DB proxy endpoint.
@@ -3336,7 +3337,7 @@ export interface CfnDBProxyMixinProps {
 export declare class CfnDBProxyEndpointPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBProxyEndpointMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBProxyEndpoint`.
      *
@@ -3435,7 +3436,7 @@ export interface CfnDBProxyEndpointMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-vpcsecuritygroupids
      */
-    readonly vpcSecurityGroupIds?: Array<string>;
+    readonly vpcSecurityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
     /**
      * The VPC subnet IDs for the DB proxy endpoint that you create.
      *
@@ -3443,7 +3444,7 @@ export interface CfnDBProxyEndpointMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-vpcsubnetids
      */
-    readonly vpcSubnetIds?: Array<string>;
+    readonly vpcSubnetIds?: Array<ec2Refs.ISubnetRef | string>;
 }
 /**
  * The `AWS::RDS::DBProxyTargetGroup` resource represents a set of RDS DB instances, Aurora DB clusters, or both that a proxy can connect to.
@@ -3472,7 +3473,7 @@ export interface CfnDBProxyEndpointMixinProps {
 export declare class CfnDBProxyTargetGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBProxyTargetGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBProxyTargetGroup`.
      *
@@ -3589,7 +3590,7 @@ export interface CfnDBProxyTargetGroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-dbclusteridentifiers
      */
-    readonly dbClusterIdentifiers?: Array<string>;
+    readonly dbClusterIdentifiers?: Array<rdsRefs.IDBClusterRef | string>;
     /**
      * One or more DB instance identifiers.
      *
@@ -3601,7 +3602,7 @@ export interface CfnDBProxyTargetGroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-dbproxyname
      */
-    readonly dbProxyName?: string;
+    readonly dbProxyName?: rdsRefs.IDBProxyRef | string;
     /**
      * The identifier for the target group.
      *
@@ -3624,7 +3625,7 @@ export interface CfnDBProxyTargetGroupMixinProps {
 export declare class CfnDBSecurityGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBSecurityGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBSecurityGroup`.
      *
@@ -3742,7 +3743,7 @@ export interface CfnDBSecurityGroupMixinProps {
 export declare class CfnDBSecurityGroupIngressPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBSecurityGroupIngressMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBSecurityGroupIngress`.
      *
@@ -3819,7 +3820,7 @@ export interface CfnDBSecurityGroupIngressMixinProps {
 export declare class CfnDBSubnetGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBSubnetGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBSubnetGroup`.
      *
@@ -3869,7 +3870,7 @@ export interface CfnDBSubnetGroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnetgroup.html#cfn-rds-dbsubnetgroup-subnetids
      */
-    readonly subnetIds?: Array<string>;
+    readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * Tags to assign to the DB subnet group.
      *
@@ -3890,7 +3891,7 @@ export interface CfnDBSubnetGroupMixinProps {
 export declare class CfnEventSubscriptionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEventSubscriptionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::EventSubscription`.
      *
@@ -3941,7 +3942,7 @@ export interface CfnEventSubscriptionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-snstopicarn
      */
-    readonly snsTopicArn?: string;
+    readonly snsTopicArn?: snsRefs.ITopicRef | string;
     /**
      * The list of identifiers of the event sources for which events are returned.
      *
@@ -3960,7 +3961,7 @@ export interface CfnEventSubscriptionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-sourceids
      */
-    readonly sourceIds?: Array<string>;
+    readonly sourceIds?: Array<rdsRefs.IDBClusterRef | rdsRefs.IDBInstanceRef | string>;
     /**
      * The type of source that is generating the events.
      *
@@ -4003,7 +4004,7 @@ export interface CfnEventSubscriptionMixinProps {
 export declare class CfnGlobalClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGlobalClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::GlobalCluster`.
      *
@@ -4115,7 +4116,7 @@ export interface CfnGlobalClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-sourcedbclusteridentifier
      */
-    readonly sourceDbClusterIdentifier?: string;
+    readonly sourceDbClusterIdentifier?: rdsRefs.IDBClusterRef | string;
     /**
      * Specifies whether to enable storage encryption for the new global database cluster.
      *
@@ -4146,7 +4147,7 @@ export interface CfnGlobalClusterMixinProps {
 export declare class CfnOptionGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnOptionGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::OptionGroup`.
      *
@@ -4317,7 +4318,7 @@ export interface CfnOptionGroupMixinProps {
 export declare class CfnDBShardGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBShardGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RDS::DBShardGroup`.
      *
@@ -4418,7 +4419,7 @@ export interface CfnDBShardGroupMixinProps {
 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::RDS::Integration`.
      *