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

package/lib/services/aws-lakeformation/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-lakeformation");
 /**
  * A structure that represents a data cell filter with column-level, row-level, and/or cell-level security.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-lakeformation");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-datacellsfilter.html
  */
 class CfnDataCellsFilterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnDataCellsFilterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnDataCellsFilterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["columnNames", "columnWildcard", "databaseName", "name", "rowFilter", "tableCatalogId", "tableName"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnDataCellsFilterPropsMixin 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 CfnDataCellsFilterPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataCellsFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataCellsFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataCellsFilterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -74,7 +68,7 @@ exports.CfnDataCellsFilterPropsMixin = CfnDataCellsFilterPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-datalakesettings.html
  */
 class CfnDataLakeSettingsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnDataLakeSettingsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnDataLakeSettingsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["admins", "allowExternalDataFiltering", "allowFullTableExternalDataAccess", "authorizedSessionTagValueList", "createDatabaseDefaultPermissions", "createTableDefaultPermissions", "externalDataFilteringAllowList", "mutationType", "parameters", "readOnlyAdmins", "trustedResourceOwners"];
     props;
     strategy;
@@ -97,7 +91,7 @@ class CfnDataLakeSettingsPropsMixin 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
@@ -110,12 +104,7 @@ class CfnDataLakeSettingsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataLakeSettingsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataLakeSettingsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataLakeSettingsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,7 +122,7 @@ exports.CfnDataLakeSettingsPropsMixin = CfnDataLakeSettingsPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-permissions.html
  */
 class CfnPermissionsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnPermissionsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnPermissionsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataLakePrincipal", "permissions", "permissionsWithGrantOption", "resource"];
     props;
     strategy;
@@ -156,7 +145,7 @@ class CfnPermissionsPropsMixin 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
@@ -169,12 +158,7 @@ class CfnPermissionsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPermissionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPermissionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPermissionsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -190,7 +174,7 @@ exports.CfnPermissionsPropsMixin = CfnPermissionsPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-principalpermissions.html
  */
 class CfnPrincipalPermissionsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnPrincipalPermissionsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnPrincipalPermissionsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalog", "permissions", "permissionsWithGrantOption", "principal", "resource"];
     props;
     strategy;
@@ -212,8 +196,11 @@ class CfnPrincipalPermissionsPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnPrincipalPermissionsMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -226,16 +213,26 @@ class CfnPrincipalPermissionsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPrincipalPermissionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPrincipalPermissionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPrincipalPermissionsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnPrincipalPermissionsPropsMixin = CfnPrincipalPermissionsPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnPrincipalPermissionsPropsMixinDataLakePrincipalProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        dataLakePrincipalIdentifier: (!props.dataLakePrincipalIdentifier ? undefined : cdk.getRefProperty(props.dataLakePrincipalIdentifier?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.dataLakePrincipalIdentifier, "dataLakePrincipalIdentifier", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnPrincipalPermissionsMixinProps(props) {
+    const ret = {};
+    if ((props.principal !== undefined))
+        ret.principal = flattenCfnPrincipalPermissionsPropsMixinDataLakePrincipalProperty(props.principal);
+    return ret;
+}
 /**
  * The `AWS::LakeFormation::Resource` represents the data (  buckets and folders) that is being registered with AWS Lake Formation .
  *
@@ -247,7 +244,7 @@ exports.CfnPrincipalPermissionsPropsMixin = CfnPrincipalPermissionsPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-resource.html
  */
 class CfnResourcePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnResourcePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnResourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["hybridAccessEnabled", "resourceArn", "roleArn", "useServiceLinkedRole", "withFederation"];
     props;
     strategy;
@@ -270,7 +267,7 @@ class CfnResourcePropsMixin 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
@@ -283,12 +280,7 @@ class CfnResourcePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -304,7 +296,7 @@ exports.CfnResourcePropsMixin = CfnResourcePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-tag.html
  */
 class CfnTagPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnTagPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnTagPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "tagKey", "tagValues"];
     props;
     strategy;
@@ -327,7 +319,7 @@ class CfnTagPropsMixin 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 +332,7 @@ class CfnTagPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTagPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTagPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTagPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -361,7 +348,7 @@ exports.CfnTagPropsMixin = CfnTagPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-tagassociation.html
  */
 class CfnTagAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnTagAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lakeformation.mixins.CfnTagAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["lfTags", "resource"];
     props;
     strategy;
@@ -384,7 +371,7 @@ class CfnTagAssociationPropsMixin 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
@@ -397,12 +384,7 @@ class CfnTagAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTagAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTagAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTagAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

package/lib/services/aws-lambda/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-lambda";
+import { aws_cognito as cognitoRefs, aws_ec2 as ec2Refs, aws_efs as efsRefs, aws_events as eventsRefs, aws_iam as iamRefs, aws_iot as ioTRefs, aws_kinesis as kinesisRefs, aws_kinesisfirehose as kinesisFirehoseRefs, aws_kms as kmsRefs, aws_lambda as lambdaRefs, aws_logs as logsRefs, aws_msk as mskRefs, aws_s3 as s3Refs, aws_signer as signerRefs, aws_sns as snsRefs, aws_sqs as sqsRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::Lambda::Alias` resource creates an [alias](https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html) for a Lambda function version. Use aliases to provide clients with a function identifier that you can update to invoke a different version.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-lambda";
 export declare class CfnAliasPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAliasMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::Alias`.
      *
@@ -110,7 +111,7 @@ export interface CfnAliasMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-functionname
      */
-    readonly functionName?: string;
+    readonly functionName?: lambdaRefs.IFunctionRef | string;
     /**
      * The function version that the alias invokes.
      *
@@ -147,7 +148,7 @@ export interface CfnAliasMixinProps {
 export declare class CfnCodeSigningConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCodeSigningConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::CodeSigningConfig`.
      *
@@ -180,7 +181,7 @@ export declare namespace CfnCodeSigningConfigPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-codesigningconfig-allowedpublishers.html#cfn-lambda-codesigningconfig-allowedpublishers-signingprofileversionarns
          */
-        readonly signingProfileVersionArns?: Array<string>;
+        readonly signingProfileVersionArns?: Array<signerRefs.ISigningProfileRef | string>;
     }
     /**
      * Code signing configuration [policies](https://docs.aws.amazon.com/lambda/latest/dg/configuration-codesigning.html#config-codesigning-policies) specify the validation failure action for signature mismatch or expiry.
@@ -251,7 +252,7 @@ export interface CfnCodeSigningConfigMixinProps {
 export declare class CfnEventInvokeConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEventInvokeConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::EventInvokeConfig`.
      *
@@ -315,7 +316,7 @@ export declare namespace CfnEventInvokeConfigPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-onsuccess.html#cfn-lambda-eventinvokeconfig-onsuccess-destination
          */
-        readonly destination?: string;
+        readonly destination?: eventsRefs.IEventBusRef | snsRefs.ITopicRef | sqsRefs.IQueueRef | string;
     }
     /**
      * A destination for events that failed processing.
@@ -338,7 +339,7 @@ export declare namespace CfnEventInvokeConfigPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-onfailure.html#cfn-lambda-eventinvokeconfig-onfailure-destination
          */
-        readonly destination?: string;
+        readonly destination?: lambdaRefs.IFunctionRef | snsRefs.ITopicRef | sqsRefs.IQueueRef | string;
     }
 }
 /**
@@ -374,7 +375,7 @@ export interface CfnEventInvokeConfigMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html#cfn-lambda-eventinvokeconfig-functionname
      */
-    readonly functionName?: string;
+    readonly functionName?: lambdaRefs.IFunctionRef | string;
     /**
      * The maximum age of a request that Lambda sends to a function for processing.
      *
@@ -421,7 +422,7 @@ export interface CfnEventInvokeConfigMixinProps {
 export declare class CfnEventSourceMappingPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEventSourceMappingMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::EventSourceMapping`.
      *
@@ -691,7 +692,7 @@ export declare namespace CfnEventSourceMappingPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-onfailure.html#cfn-lambda-eventsourcemapping-onfailure-destination
          */
-        readonly destination?: string;
+        readonly destination?: snsRefs.ITopicRef | sqsRefs.IQueueRef | string;
     }
     /**
      * Specific configuration settings for an Amazon Managed Streaming for Apache Kafka (Amazon MSK) event source.
@@ -891,7 +892,7 @@ export interface CfnEventSourceMappingMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-eventsourcearn
      */
-    readonly eventSourceArn?: string;
+    readonly eventSourceArn?: kinesisRefs.IStreamRef | mskRefs.IClusterRef | sqsRefs.IQueueRef | string;
     /**
      * An object that defines the filter criteria that determine whether Lambda should process an event.
      *
@@ -912,7 +913,7 @@ export interface CfnEventSourceMappingMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-functionname
      */
-    readonly functionName?: string;
+    readonly functionName?: lambdaRefs.IFunctionRef | lambdaRefs.IVersionRef | string;
     /**
      * (Kinesis, DynamoDB Streams, and SQS) A list of current response type enums applied to the event source mapping.
      *
@@ -1087,7 +1088,7 @@ export interface CfnEventSourceMappingMixinProps {
 export declare class CfnFunctionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFunctionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::Function`.
      *
@@ -1180,13 +1181,13 @@ export declare namespace CfnFunctionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html#cfn-lambda-function-vpcconfig-securitygroupids
          */
-        readonly securityGroupIds?: Array<string>;
+        readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
         /**
          * A list of VPC subnet IDs.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html#cfn-lambda-function-vpcconfig-subnetids
          */
-        readonly subnetIds?: Array<string>;
+        readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     }
     /**
      * The [dead-letter queue](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-dlq) for failed asynchronous invocations.
@@ -1201,7 +1202,7 @@ export declare namespace CfnFunctionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-deadletterconfig.html#cfn-lambda-function-deadletterconfig-targetarn
          */
-        readonly targetArn?: string;
+        readonly targetArn?: snsRefs.ITopicRef | sqsRefs.IQueueRef | string;
     }
     /**
      * Sets the runtime management configuration for a function's version.
@@ -1274,7 +1275,7 @@ export declare namespace CfnFunctionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3bucket
          */
-        readonly s3Bucket?: string;
+        readonly s3Bucket?: s3Refs.IBucketRef | string;
         /**
          * The Amazon S3 key of the deployment package.
          *
@@ -1321,7 +1322,7 @@ export declare namespace CfnFunctionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-arn
          */
-        readonly arn?: string;
+        readonly arn?: efsRefs.IAccessPointRef | string;
         /**
          * The path where the function can access the file system, starting with `/mnt/` .
          *
@@ -1502,7 +1503,7 @@ export declare namespace CfnFunctionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-loggingconfig.html#cfn-lambda-function-loggingconfig-loggroup
          */
-        readonly logGroup?: string;
+        readonly logGroup?: logsRefs.ILogGroupRef | string;
         /**
          * Set this property to filter the system logs for your function that Lambda sends to CloudWatch.
          *
@@ -1574,7 +1575,7 @@ export interface CfnFunctionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-codesigningconfigarn
      */
-    readonly codeSigningConfigArn?: string;
+    readonly codeSigningConfigArn?: lambdaRefs.ICodeSigningConfigRef | string;
     /**
      * A dead-letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing.
      *
@@ -1663,13 +1664,13 @@ export interface CfnFunctionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-kmskeyarn
      */
-    readonly kmsKeyArn?: string;
+    readonly kmsKeyArn?: kmsRefs.IKeyRef | string;
     /**
      * A list of [function layers](https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html) to add to the function's execution environment. Specify each layer by its ARN, including the version.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-layers
      */
-    readonly layers?: Array<string>;
+    readonly layers?: Array<lambdaRefs.ILayerVersionRef | string>;
     /**
      * The function's Amazon CloudWatch Logs configuration settings.
      *
@@ -1715,7 +1716,7 @@ export interface CfnFunctionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-role
      */
-    readonly role?: string;
+    readonly role?: iamRefs.IRoleRef | string;
     /**
      * The identifier of the function's [runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) . Runtime is required if the deployment package is a .zip file archive. Specifying a runtime results in an error if you're deploying a function using a container image.
      *
@@ -1790,7 +1791,7 @@ export interface CfnFunctionMixinProps {
 export declare class CfnLayerVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLayerVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::LayerVersion`.
      *
@@ -1821,7 +1822,7 @@ export declare namespace CfnLayerVersionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-layerversion-content.html#cfn-lambda-layerversion-content-s3bucket
          */
-        readonly s3Bucket?: string;
+        readonly s3Bucket?: s3Refs.IBucketRef | string;
         /**
          * The Amazon S3 key of the layer archive.
          *
@@ -1898,7 +1899,7 @@ export interface CfnLayerVersionMixinProps {
 export declare class CfnLayerVersionPermissionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLayerVersionPermissionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::LayerVersionPermission`.
      *
@@ -1936,7 +1937,7 @@ export interface CfnLayerVersionPermissionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html#cfn-lambda-layerversionpermission-layerversionarn
      */
-    readonly layerVersionArn?: string;
+    readonly layerVersionArn?: lambdaRefs.ILayerVersionRef | string;
     /**
      * With the principal set to `*` , grant permission to all accounts in the specified organization.
      *
@@ -1971,7 +1972,7 @@ export interface CfnLayerVersionPermissionMixinProps {
 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::Lambda::Permission`.
      *
@@ -2021,7 +2022,7 @@ export interface CfnPermissionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-functionname
      */
-    readonly functionName?: string;
+    readonly functionName?: lambdaRefs.IFunctionRef | lambdaRefs.IVersionRef | string;
     /**
      * The type of authentication that your function URL uses.
      *
@@ -2043,7 +2044,7 @@ export interface CfnPermissionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-principal
      */
-    readonly principal?: string;
+    readonly principal?: iamRefs.IRoleRef | iamRefs.IUserRef | string;
     /**
      * The identifier for your organization in AWS Organizations .
      *
@@ -2069,7 +2070,7 @@ export interface CfnPermissionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-sourcearn
      */
-    readonly sourceArn?: string;
+    readonly sourceArn?: cognitoRefs.IUserPoolRef | eventsRefs.IRuleRef | iamRefs.IRoleRef | ioTRefs.ITopicRuleRef | kinesisFirehoseRefs.IDeliveryStreamRef | lambdaRefs.IFunctionRef | logsRefs.ILogGroupRef | s3Refs.IBucketRef | snsRefs.ITopicRef | sqsRefs.IQueueRef | string;
 }
 /**
  * The `AWS::Lambda::Url` resource creates a function URL with the specified configuration parameters.
@@ -2084,7 +2085,7 @@ export interface CfnPermissionMixinProps {
 export declare class CfnUrlPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUrlMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::Url`.
      *
@@ -2210,7 +2211,7 @@ export interface CfnUrlMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-url.html#cfn-lambda-url-targetfunctionarn
      */
-    readonly targetFunctionArn?: string;
+    readonly targetFunctionArn?: lambdaRefs.IFunctionRef | string;
 }
 /**
  * The `AWS::Lambda::Version` resource creates a [version](https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) from the current code and configuration of a function. Use versions to create a snapshot of your function code and configuration that doesn't change.
@@ -2223,7 +2224,7 @@ export interface CfnUrlMixinProps {
 export declare class CfnVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::Version`.
      *
@@ -2344,7 +2345,7 @@ export interface CfnVersionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-functionname
      */
-    readonly functionName?: string;
+    readonly functionName?: lambdaRefs.IFunctionRef | string;
     /**
      * Configuration that defines the scaling behavior for a Lambda Managed Instances function, including the minimum and maximum number of execution environments that can be provisioned.
      *
@@ -2377,7 +2378,7 @@ export interface CfnVersionMixinProps {
 export declare class CfnCapacityProviderPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCapacityProviderMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lambda::CapacityProvider`.
      *