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

package/lib/services/aws-elasticloadbalancingv2/logs-delivery-mixins.generated.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CfnLoadBalancerLogsMixin = exports.CfnLoadBalancerNlbAccessLogs = void 0;
+exports.CfnLoadBalancerNlbAccessLogsRecordFields = exports.CfnLoadBalancerNlbAccessLogsOutputFormat = exports.CfnLoadBalancerLogsMixin = exports.CfnLoadBalancerNlbAccessLogs = void 0;
 const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const logsDelivery = require("../aws-logs/logs-delivery");
 const service = require("aws-cdk-lib/aws-elasticloadbalancingv2");
 /**
@@ -16,13 +15,15 @@ const service = require("aws-cdk-lib/aws-elasticloadbalancingv2");
  * @stability external
  */
 class CfnLoadBalancerNlbAccessLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogs", version: "2.240.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
+     *
+     * @param props Additional properties that are optionally used in log delivery for S3 destinations
      */
     toS3(bucket, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_logs_IS3LogsDestinationProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_elasticloadbalancingv2_mixins_CfnLoadBalancerNlbAccessLogsS3Props(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -33,24 +34,57 @@ class CfnLoadBalancerNlbAccessLogs {
         {
             return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
                 permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
-                kmsKey: (props && props.encryptionKey) ? props.encryptionKey : undefined
+                kmsKey: props?.encryptionKey,
+                outputFormat: props?.outputFormat,
+                providedFields: props?.recordFields,
+                mandatoryFields: ["type", "version", "time", "elb", "listener", "client_port", "destination_port", "connection_time", "tls_handshake_time", "received_bytes", "sent_bytes", "incoming_tls_alert", "chosen_cert_arn", "chosen_cert_serial", "tls_cipher", "tls_protocol_version", "tls_keyexchange", "domain_name", "alpn_fe_protocol", "alpn_be_protocol", "alpn_client_preference_list", "tls_connection_creation_time"]
             }));
         }
     }
     /**
      * Send logs to a CloudWatch Log Group
+     *
+     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
      */
-    toLogGroup(logGroup) {
+    toLogGroup(logGroup, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_elasticloadbalancingv2_mixins_CfnLoadBalancerNlbAccessLogsLogGroupProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toLogGroup);
+            }
+            throw error;
+        }
         {
-            return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup));
+            return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
+                outputFormat: props?.outputFormat,
+                providedFields: props?.recordFields,
+                mandatoryFields: ["type", "version", "time", "elb", "listener", "client_port", "destination_port", "connection_time", "tls_handshake_time", "received_bytes", "sent_bytes", "incoming_tls_alert", "chosen_cert_arn", "chosen_cert_serial", "tls_cipher", "tls_protocol_version", "tls_keyexchange", "domain_name", "alpn_fe_protocol", "alpn_be_protocol", "alpn_client_preference_list", "tls_connection_creation_time"]
+            }));
         }
     }
     /**
      * Send logs to a Firehose Delivery Stream
+     *
+     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
      */
-    toFirehose(deliveryStream) {
+    toFirehose(deliveryStream, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_elasticloadbalancingv2_mixins_CfnLoadBalancerNlbAccessLogsFirehoseProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toFirehose);
+            }
+            throw error;
+        }
         {
-            return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream));
+            return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
+                outputFormat: props?.outputFormat,
+                providedFields: props?.recordFields,
+                mandatoryFields: ["type", "version", "time", "elb", "listener", "client_port", "destination_port", "connection_time", "tls_handshake_time", "received_bytes", "sent_bytes", "incoming_tls_alert", "chosen_cert_arn", "chosen_cert_serial", "tls_cipher", "tls_protocol_version", "tls_keyexchange", "domain_name", "alpn_fe_protocol", "alpn_be_protocol", "alpn_client_preference_list", "tls_connection_creation_time"]
+            }));
         }
     }
     /**
@@ -59,10 +93,24 @@ class CfnLoadBalancerNlbAccessLogs {
      * Supported destinations are S3, CWL, FH
      * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
      * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
      */
-    toDestination(destination) {
+    toDestination(destination, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_elasticloadbalancingv2_mixins_CfnLoadBalancerNlbAccessLogsDestProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toDestination);
+            }
+            throw error;
+        }
         {
-            return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.DestinationLogsDelivery(destination));
+            return new CfnLoadBalancerLogsMixin("NLB_ACCESS_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: props?.recordFields,
+                mandatoryFields: ["type", "version", "time", "elb", "listener", "client_port", "destination_port", "connection_time", "tls_handshake_time", "received_bytes", "sent_bytes", "incoming_tls_alert", "chosen_cert_arn", "chosen_cert_serial", "tls_cipher", "tls_protocol_version", "tls_keyexchange", "domain_name", "alpn_fe_protocol", "alpn_be_protocol", "alpn_client_preference_list", "tls_connection_creation_time"]
+            }));
         }
     }
 }
@@ -75,8 +123,8 @@ exports.CfnLoadBalancerNlbAccessLogs = CfnLoadBalancerNlbAccessLogs;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
  */
-class CfnLoadBalancerLogsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerLogsMixin", version: "2.240.0-alpha.0" };
+class CfnLoadBalancerLogsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerLogsMixin", version: "2.242.0-alpha.0" };
     static NLB_ACCESS_LOGS = new CfnLoadBalancerNlbAccessLogs();
     logType;
     logDelivery;
@@ -118,3 +166,55 @@ class CfnLoadBalancerLogsMixin extends core.Mixin {
     }
 }
 exports.CfnLoadBalancerLogsMixin = CfnLoadBalancerLogsMixin;
+/**
+ * Output Format options for each destination of CfnLoadBalancerNlbAccessLogs.
+ */
+class CfnLoadBalancerNlbAccessLogsOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticloadbalancingv2.mixins.CfnLoadBalancerNlbAccessLogsOutputFormat", version: "2.242.0-alpha.0" };
+}
+exports.CfnLoadBalancerNlbAccessLogsOutputFormat = CfnLoadBalancerNlbAccessLogsOutputFormat;
+(function (CfnLoadBalancerNlbAccessLogsOutputFormat) {
+    let S3;
+    (function (S3) {
+        S3["JSON"] = "json";
+        S3["PLAIN"] = "plain";
+        S3["W3C"] = "w3c";
+        S3["PARQUET"] = "parquet";
+    })(S3 = CfnLoadBalancerNlbAccessLogsOutputFormat.S3 || (CfnLoadBalancerNlbAccessLogsOutputFormat.S3 = {}));
+    let LogGroup;
+    (function (LogGroup) {
+        LogGroup["PLAIN"] = "plain";
+        LogGroup["JSON"] = "json";
+    })(LogGroup = CfnLoadBalancerNlbAccessLogsOutputFormat.LogGroup || (CfnLoadBalancerNlbAccessLogsOutputFormat.LogGroup = {}));
+    let Firehose;
+    (function (Firehose) {
+        Firehose["JSON"] = "json";
+        Firehose["PLAIN"] = "plain";
+        Firehose["RAW"] = "raw";
+    })(Firehose = CfnLoadBalancerNlbAccessLogsOutputFormat.Firehose || (CfnLoadBalancerNlbAccessLogsOutputFormat.Firehose = {}));
+})(CfnLoadBalancerNlbAccessLogsOutputFormat || (exports.CfnLoadBalancerNlbAccessLogsOutputFormat = CfnLoadBalancerNlbAccessLogsOutputFormat = {}));
+var CfnLoadBalancerNlbAccessLogsRecordFields;
+(function (CfnLoadBalancerNlbAccessLogsRecordFields) {
+    CfnLoadBalancerNlbAccessLogsRecordFields["TYPE"] = "type";
+    CfnLoadBalancerNlbAccessLogsRecordFields["VERSION"] = "version";
+    CfnLoadBalancerNlbAccessLogsRecordFields["TIME"] = "time";
+    CfnLoadBalancerNlbAccessLogsRecordFields["ELB"] = "elb";
+    CfnLoadBalancerNlbAccessLogsRecordFields["LISTENER"] = "listener";
+    CfnLoadBalancerNlbAccessLogsRecordFields["CLIENT_PORT"] = "client_port";
+    CfnLoadBalancerNlbAccessLogsRecordFields["DESTINATION_PORT"] = "destination_port";
+    CfnLoadBalancerNlbAccessLogsRecordFields["CONNECTION_TIME"] = "connection_time";
+    CfnLoadBalancerNlbAccessLogsRecordFields["TLS_HANDSHAKE_TIME"] = "tls_handshake_time";
+    CfnLoadBalancerNlbAccessLogsRecordFields["RECEIVED_BYTES"] = "received_bytes";
+    CfnLoadBalancerNlbAccessLogsRecordFields["SENT_BYTES"] = "sent_bytes";
+    CfnLoadBalancerNlbAccessLogsRecordFields["INCOMING_TLS_ALERT"] = "incoming_tls_alert";
+    CfnLoadBalancerNlbAccessLogsRecordFields["CHOSEN_CERT_ARN"] = "chosen_cert_arn";
+    CfnLoadBalancerNlbAccessLogsRecordFields["CHOSEN_CERT_SERIAL"] = "chosen_cert_serial";
+    CfnLoadBalancerNlbAccessLogsRecordFields["TLS_CIPHER"] = "tls_cipher";
+    CfnLoadBalancerNlbAccessLogsRecordFields["TLS_PROTOCOL_VERSION"] = "tls_protocol_version";
+    CfnLoadBalancerNlbAccessLogsRecordFields["TLS_KEYEXCHANGE"] = "tls_keyexchange";
+    CfnLoadBalancerNlbAccessLogsRecordFields["DOMAIN_NAME"] = "domain_name";
+    CfnLoadBalancerNlbAccessLogsRecordFields["ALPN_FE_PROTOCOL"] = "alpn_fe_protocol";
+    CfnLoadBalancerNlbAccessLogsRecordFields["ALPN_BE_PROTOCOL"] = "alpn_be_protocol";
+    CfnLoadBalancerNlbAccessLogsRecordFields["ALPN_CLIENT_PREFERENCE_LIST"] = "alpn_client_preference_list";
+    CfnLoadBalancerNlbAccessLogsRecordFields["TLS_CONNECTION_CREATION_TIME"] = "tls_connection_creation_time";
+})(CfnLoadBalancerNlbAccessLogsRecordFields || (exports.CfnLoadBalancerNlbAccessLogsRecordFields = CfnLoadBalancerNlbAccessLogsRecordFields = {}));

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

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

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

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

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

@@ -1,6 +1,5 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-elasticsearch";
 /**
@@ -13,10 +12,10 @@ import * as service from "aws-cdk-lib/aws-elasticsearch";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html
  */
-export declare class CfnDomainPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnDomainPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDomainMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Elasticsearch::Domain`.
      *

package/lib/services/aws-elasticsearch/cfn-props-mixins.generated.js

@@ -5,9 +5,7 @@ const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-elasticsearch");
 /**
  * The AWS::Elasticsearch::Domain resource creates an Amazon OpenSearch Service domain.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-elasticsearch");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html
  */
-class CfnDomainPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticsearch.mixins.CfnDomainPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_elasticsearch.mixins.CfnDomainPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessPolicies", "advancedOptions", "advancedSecurityOptions", "cognitoOptions", "domainArn", "domainEndpointOptions", "domainName", "ebsOptions", "elasticsearchClusterConfig", "elasticsearchVersion", "encryptionAtRestOptions", "logPublishingOptions", "nodeToNodeEncryptionOptions", "snapshotOptions", "tags", "vpcOptions"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnDomainPropsMixin extends core.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
@@ -56,12 +54,7 @@ class CfnDomainPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-emr";
+import { aws_ec2 as ec2Refs, aws_emr as emrRefs, aws_iam as iamRefs, aws_kms as kmsRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::EMR::Cluster` resource specifies an Amazon EMR cluster.
  *
@@ -15,10 +15,10 @@ import * as service from "aws-cdk-lib/aws-emr";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-cluster.html
  */
-export declare class CfnClusterPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::Cluster`.
      *
@@ -1562,10 +1562,10 @@ export interface CfnClusterMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancefleetconfig.html
  */
-export declare class CfnInstanceFleetConfigPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnInstanceFleetConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInstanceFleetConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::InstanceFleetConfig`.
      *
@@ -2062,10 +2062,10 @@ export interface CfnInstanceFleetConfigMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html
  */
-export declare class CfnInstanceGroupConfigPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnInstanceGroupConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInstanceGroupConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::InstanceGroupConfig`.
      *
@@ -2559,10 +2559,10 @@ export interface CfnInstanceGroupConfigMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html
  */
-export declare class CfnSecurityConfigurationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnSecurityConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSecurityConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::SecurityConfiguration`.
      *
@@ -2612,10 +2612,10 @@ export interface CfnSecurityConfigurationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html
  */
-export declare class CfnStepPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnStepPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStepMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::Step`.
      *
@@ -2759,10 +2759,10 @@ export interface CfnStepMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html
  */
-export declare class CfnStudioPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnStudioPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStudioMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::Studio`.
      *
@@ -2798,7 +2798,7 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-defaults3location
      */
-    readonly defaultS3Location?: string;
+    readonly defaultS3Location?: s3Refs.IBucketRef | string;
     /**
      * A detailed description of the Amazon EMR Studio.
      *
@@ -2810,7 +2810,7 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-encryptionkeyarn
      */
-    readonly encryptionKeyArn?: string;
+    readonly encryptionKeyArn?: kmsRefs.IKeyRef | string;
     /**
      * The ID of the Amazon EMR Studio Engine security group.
      *
@@ -2818,7 +2818,7 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-enginesecuritygroupid
      */
-    readonly engineSecurityGroupId?: string;
+    readonly engineSecurityGroupId?: ec2Refs.ISecurityGroupRef | string;
     /**
      * The ARN of the IAM Identity Center instance the Studio application belongs to.
      *
@@ -2860,7 +2860,7 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-servicerole
      */
-    readonly serviceRole?: string;
+    readonly serviceRole?: iamRefs.IRoleRef | string;
     /**
      * A list of subnet IDs to associate with the Amazon EMR Studio.
      *
@@ -2868,7 +2868,7 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-subnetids
      */
-    readonly subnetIds?: Array<string>;
+    readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * An array of key-value pairs to apply to this resource.
      *
@@ -2892,13 +2892,13 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-userrole
      */
-    readonly userRole?: string;
+    readonly userRole?: iamRefs.IRoleRef | string;
     /**
      * The ID of the Amazon Virtual Private Cloud (Amazon VPC) to associate with the Studio.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-vpcid
      */
-    readonly vpcId?: string;
+    readonly vpcId?: ec2Refs.IVPCRef | string;
     /**
      * The ID of the Workspace security group associated with the Amazon EMR Studio.
      *
@@ -2906,7 +2906,7 @@ export interface CfnStudioMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-workspacesecuritygroupid
      */
-    readonly workspaceSecurityGroupId?: string;
+    readonly workspaceSecurityGroupId?: ec2Refs.ISecurityGroupRef | string;
 }
 /**
  * The `AWS::EMR::StudioSessionMapping` resource is an Amazon EMR resource type that maps a user or group to the Amazon EMR Studio specified by `StudioId` , and applies a session policy that defines Studio permissions for that user or group.
@@ -2916,10 +2916,10 @@ export interface CfnStudioMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html
  */
-export declare class CfnStudioSessionMappingPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnStudioSessionMappingPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStudioSessionMappingMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::StudioSessionMapping`.
      *
@@ -2965,13 +2965,13 @@ export interface CfnStudioSessionMappingMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html#cfn-emr-studiosessionmapping-sessionpolicyarn
      */
-    readonly sessionPolicyArn?: string;
+    readonly sessionPolicyArn?: iamRefs.IManagedPolicyRef | string;
     /**
      * The ID of the Amazon EMR Studio to which the user or group will be mapped.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html#cfn-emr-studiosessionmapping-studioid
      */
-    readonly studioId?: string;
+    readonly studioId?: emrRefs.IStudioRef | string;
 }
 /**
  * http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-walworkspace.html.
@@ -2981,10 +2981,10 @@ export interface CfnStudioSessionMappingMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-walworkspace.html
  */
-export declare class CfnWALWorkspacePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnWALWorkspacePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnWALWorkspaceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EMR::WALWorkspace`.
      *