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

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

@@ -4,7 +4,6 @@ exports.CfnRulePropsMixin = exports.CfnEventBusPolicyPropsMixin = exports.CfnEve
 /* 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-events");
 /**
  * Creates an API destination, which is an HTTP invocation endpoint configured as a target for events.
@@ -38,7 +37,7 @@ class CfnApiDestinationPropsMixin extends cdk.Mixin {
     constructor(props, options = {}) {
         super();
         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
@@ -51,12 +50,7 @@ class CfnApiDestinationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApiDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApiDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApiDestinationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -87,8 +81,11 @@ class CfnArchivePropsMixin extends cdk.Mixin {
      */
     constructor(props, options = {}) {
         super();
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnArchiveMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -101,16 +98,18 @@ class CfnArchivePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnArchivePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnArchivePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnArchivePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnArchivePropsMixin = CfnArchivePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnArchiveMixinProps(props) {
+    const ret = {};
+    if ((props.sourceArn !== undefined))
+        ret.sourceArn = cdk.getRefProperty(props.sourceArn?.eventBusRef, 'eventBusArn') ?? cdk.ensureStringOrUndefined(props.sourceArn, "sourceArn", "events.IEventBusRef | string");
+    return ret;
+}
 /**
  * Creates a connection.
  *
@@ -136,7 +135,7 @@ class CfnConnectionPropsMixin extends cdk.Mixin {
     constructor(props, options = {}) {
         super();
         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
@@ -149,12 +148,7 @@ class CfnConnectionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConnectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -182,7 +176,7 @@ class CfnEndpointPropsMixin extends cdk.Mixin {
     constructor(props, options = {}) {
         super();
         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
@@ -195,12 +189,7 @@ class CfnEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -230,7 +219,7 @@ class CfnEventBusPropsMixin extends cdk.Mixin {
     constructor(props, options = {}) {
         super();
         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
@@ -243,12 +232,7 @@ class CfnEventBusPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEventBusPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEventBusPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEventBusPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -284,7 +268,7 @@ class CfnEventBusPolicyPropsMixin extends cdk.Mixin {
     constructor(props, options = {}) {
         super();
         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
@@ -297,12 +281,7 @@ class CfnEventBusPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEventBusPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEventBusPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEventBusPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -347,8 +326,11 @@ class CfnRulePropsMixin extends cdk.Mixin {
      */
     constructor(props, options = {}) {
         super();
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRuleMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -361,13 +343,107 @@ 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);
         }
     }
 }
 exports.CfnRulePropsMixin = CfnRulePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinDeadLetterConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        arn: (!props.arn ? undefined : cdk.getRefProperty(props.arn?.queueRef, 'queueArn') ?? cdk.ensureStringOrUndefined(props.arn, "arn", "sqs.IQueueRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinAwsVpcConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        assignPublicIp: (!props.assignPublicIp ? undefined : props.assignPublicIp),
+        securityGroups: (!props.securityGroups ? undefined : cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"))),
+        subnets: (!props.subnets ? undefined : cdk.mapArrayInPlace(props.subnets, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnets", "ec2.ISubnetRef | string")))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinNetworkConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        awsVpcConfiguration: (!props.awsVpcConfiguration ? undefined : (!props.awsVpcConfiguration ? undefined : flattenCfnRulePropsMixinAwsVpcConfigurationProperty(props.awsVpcConfiguration)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinEcsParametersProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        capacityProviderStrategy: (!props.capacityProviderStrategy ? undefined : props.capacityProviderStrategy),
+        enableEcsManagedTags: (!props.enableEcsManagedTags ? undefined : props.enableEcsManagedTags),
+        enableExecuteCommand: (!props.enableExecuteCommand ? undefined : props.enableExecuteCommand),
+        group: (!props.group ? undefined : props.group),
+        launchType: (!props.launchType ? undefined : props.launchType),
+        networkConfiguration: (!props.networkConfiguration ? undefined : (!props.networkConfiguration ? undefined : flattenCfnRulePropsMixinNetworkConfigurationProperty(props.networkConfiguration))),
+        placementConstraints: (!props.placementConstraints ? undefined : props.placementConstraints),
+        placementStrategies: (!props.placementStrategies ? undefined : props.placementStrategies),
+        platformVersion: (!props.platformVersion ? undefined : props.platformVersion),
+        propagateTags: (!props.propagateTags ? undefined : props.propagateTags),
+        referenceId: (!props.referenceId ? undefined : props.referenceId),
+        tagList: (!props.tagList ? undefined : props.tagList),
+        taskCount: (!props.taskCount ? undefined : props.taskCount),
+        taskDefinitionArn: (!props.taskDefinitionArn ? undefined : cdk.getRefProperty(props.taskDefinitionArn?.taskDefinitionRef, 'taskDefinitionArn') ?? cdk.ensureStringOrUndefined(props.taskDefinitionArn, "taskDefinitionArn", "ecs.ITaskDefinitionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinRunCommandTargetProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        key: (!props.key ? undefined : props.key),
+        values: (!props.values ? undefined : cdk.mapArrayInPlace(props.values, (item) => cdk.getRefProperty(item?.instanceRef, 'instanceId') ?? cdk.ensureStringOrUndefined(item, "values", "ec2.IInstanceRef | string")))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinRunCommandParametersProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        runCommandTargets: (!props.runCommandTargets ? undefined : (cdk.isResolvableObject(props.runCommandTargets) ? props.runCommandTargets : cdk.mapArrayInPlace(props.runCommandTargets, (item) => flattenCfnRulePropsMixinRunCommandTargetProperty(item))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRulePropsMixinTargetProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        appSyncParameters: (!props.appSyncParameters ? undefined : props.appSyncParameters),
+        arn: (!props.arn ? undefined : cdk.getRefProperty(props.arn?.functionRef, 'functionArn') ?? cdk.getRefProperty(props.arn?.topicRef, 'topicArn') ?? cdk.getRefProperty(props.arn?.stateMachineRef, 'stateMachineArn') ?? cdk.getRefProperty(props.arn?.queueRef, 'queueArn') ?? cdk.getRefProperty(props.arn?.clusterRef, 'clusterArn') ?? cdk.getRefProperty(props.arn?.versionRef, 'functionArn') ?? cdk.getRefProperty(props.arn?.logGroupRef, 'logGroupArn') ?? cdk.getRefProperty(props.arn?.eventBusRef, 'eventBusArn') ?? cdk.getRefProperty(props.arn?.assessmentTemplateRef, 'assessmentTemplateArn') ?? cdk.getRefProperty(props.arn?.deliveryStreamRef, 'deliveryStreamArn') ?? cdk.getRefProperty(props.arn?.jobQueueRef, 'jobQueueArn') ?? cdk.getRefProperty(props.arn?.streamRef, 'streamArn') ?? cdk.ensureStringOrUndefined(props.arn, "arn", "lambda.IFunctionRef | sns.ITopicRef | stepfunctions.IStateMachineRef | sqs.IQueueRef | ecs.IClusterRef | lambda.IVersionRef | logs.ILogGroupRef | events.IEventBusRef | inspector.IAssessmentTemplateRef | kinesisfirehose.IDeliveryStreamRef | batch.IJobQueueRef | kinesis.IStreamRef | string")),
+        batchParameters: (!props.batchParameters ? undefined : props.batchParameters),
+        deadLetterConfig: (!props.deadLetterConfig ? undefined : (!props.deadLetterConfig ? undefined : flattenCfnRulePropsMixinDeadLetterConfigProperty(props.deadLetterConfig))),
+        ecsParameters: (!props.ecsParameters ? undefined : (!props.ecsParameters ? undefined : flattenCfnRulePropsMixinEcsParametersProperty(props.ecsParameters))),
+        httpParameters: (!props.httpParameters ? undefined : props.httpParameters),
+        id: (!props.id ? undefined : props.id),
+        input: (!props.input ? undefined : props.input),
+        inputPath: (!props.inputPath ? undefined : props.inputPath),
+        inputTransformer: (!props.inputTransformer ? undefined : props.inputTransformer),
+        kinesisParameters: (!props.kinesisParameters ? undefined : props.kinesisParameters),
+        redshiftDataParameters: (!props.redshiftDataParameters ? undefined : props.redshiftDataParameters),
+        retryPolicy: (!props.retryPolicy ? undefined : props.retryPolicy),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        runCommandParameters: (!props.runCommandParameters ? undefined : (!props.runCommandParameters ? undefined : flattenCfnRulePropsMixinRunCommandParametersProperty(props.runCommandParameters))),
+        sageMakerPipelineParameters: (!props.sageMakerPipelineParameters ? undefined : props.sageMakerPipelineParameters),
+        sqsParameters: (!props.sqsParameters ? undefined : props.sqsParameters)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRuleMixinProps(props) {
+    const ret = {};
+    if ((props.eventBusName !== undefined))
+        ret.eventBusName = cdk.getRefProperty(props.eventBusName?.eventBusRef, 'eventBusArn') ?? cdk.getRefProperty(props.eventBusName?.eventBusRef, 'eventBusName') ?? cdk.ensureStringOrUndefined(props.eventBusName, "eventBusName", "events.IEventBusRef | string");
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    if ((props.targets !== undefined))
+        ret.targets = (cdk.isResolvableObject(props.targets) ? props.targets : cdk.mapArrayInPlace(props.targets, (item) => flattenCfnRulePropsMixinTargetProperty(item)));
+    return ret;
+}

package/lib/services/aws-events/events.d.ts

@@ -0,0 +1 @@
+export * from './events.generated';

package/lib/services/aws-events/events.generated.d.ts

@@ -0,0 +1,24 @@
+import * as cdk from "aws-cdk-lib/core";
+import * as events from "aws-cdk-lib/aws-events";
+/**
+ * EventBridge event pattern for aws.events@ScheduledJson
+ */
+export declare class ScheduledJson {
+    /**
+     * EventBridge event pattern for Scheduled Event
+     */
+    static scheduledJsonPattern(options?: ScheduledJson.ScheduledJsonProps): events.EventPattern;
+}
+export declare namespace ScheduledJson {
+    /**
+     * Props type for aws.events@ScheduledJson event
+     */
+    interface ScheduledJsonProps {
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}

package/lib/services/aws-events/events.generated.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScheduledJson = void 0;
+/**
+ * EventBridge event pattern for aws.events@ScheduledJson
+ */
+class ScheduledJson {
+    /**
+     * EventBridge event pattern for Scheduled Event
+     */
+    static scheduledJsonPattern(options) {
+        return {
+            source: ["aws.events"],
+            detailType: ["Scheduled Event"],
+            detail: convertScheduledJsonDetailToEventPattern(options),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+}
+exports.ScheduledJson = ScheduledJson;
+// @ts-ignore TS6133
+function convertScheduledJsonDetailToEventPattern(obj) {
+    const ret = {};
+    for (const [key, value] of Object.entries(ret)) {
+        if ((value === undefined))
+            delete ret[key];
+    }
+    if (Object.keys(ret).length === 0)
+        return undefined;
+    ;
+    return ret;
+}

package/lib/services/aws-events/events.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./events.generated"), exports);

package/lib/services/aws-events/index.d.ts

@@ -1 +1,2 @@
+export * as events from './events';
 export * as mixins from './mixins';

package/lib/services/aws-events/index.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixins = void 0;
+exports.mixins = exports.events = void 0;
+exports.events = require("./events");
 exports.mixins = require("./mixins");

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

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

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

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

package/lib/services/aws-eventschemas/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-eventschemas";
+import { aws_events as eventsRefs, aws_eventschemas as eventSchemasRefs } from "aws-cdk-lib/interfaces";
 /**
  * Use the `AWS::EventSchemas::Discoverer` resource to specify a *discoverer* that is associated with an event bus.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-eventschemas";
 export declare class CfnDiscovererPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDiscovererMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EventSchemas::Discoverer`.
      *
@@ -81,7 +82,7 @@ export interface CfnDiscovererMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html#cfn-eventschemas-discoverer-sourcearn
      */
-    readonly sourceArn?: string;
+    readonly sourceArn?: eventsRefs.IEventBusRef | string;
     /**
      * Tags associated with the resource.
      *
@@ -102,7 +103,7 @@ export interface CfnDiscovererMixinProps {
 export declare class CfnRegistryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRegistryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EventSchemas::Registry`.
      *
@@ -161,7 +162,7 @@ export interface CfnRegistryMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html#cfn-eventschemas-registry-registryname
      */
-    readonly registryName?: string;
+    readonly registryName?: eventSchemasRefs.IRegistryPolicyRef | string;
     /**
      * Tags to associate with the registry.
      *
@@ -180,7 +181,7 @@ export interface CfnRegistryMixinProps {
 export declare class CfnRegistryPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRegistryPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EventSchemas::RegistryPolicy`.
      *
@@ -235,7 +236,7 @@ export interface CfnRegistryPolicyMixinProps {
 export declare class CfnSchemaPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSchemaMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EventSchemas::Schema`.
      *

package/lib/services/aws-eventschemas/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-eventschemas");
 /**
  * Use the `AWS::EventSchemas::Discoverer` resource to specify a *discoverer* that is associated with an event bus.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-eventschemas");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html
  */
 class CfnDiscovererPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnDiscovererPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnDiscovererPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["crossAccount", "description", "sourceArn", "tags"];
     props;
     strategy;
@@ -41,8 +40,11 @@ class CfnDiscovererPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDiscovererMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,16 +57,18 @@ class CfnDiscovererPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDiscovererPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDiscovererPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDiscovererPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDiscovererPropsMixin = CfnDiscovererPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDiscovererMixinProps(props) {
+    const ret = {};
+    if ((props.sourceArn !== undefined))
+        ret.sourceArn = cdk.getRefProperty(props.sourceArn?.eventBusRef, 'eventBusArn') ?? cdk.ensureStringOrUndefined(props.sourceArn, "sourceArn", "events.IEventBusRef | string");
+    return ret;
+}
 /**
  * Use the `AWS::EventSchemas::Registry` to specify a schema registry.
  *
@@ -76,7 +80,7 @@ exports.CfnDiscovererPropsMixin = CfnDiscovererPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html
  */
 class CfnRegistryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnRegistryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnRegistryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "registryName", "tags"];
     props;
     strategy;
@@ -98,8 +102,11 @@ class CfnRegistryPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRegistryMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -112,16 +119,18 @@ class CfnRegistryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRegistryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRegistryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRegistryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRegistryPropsMixin = CfnRegistryPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRegistryMixinProps(props) {
+    const ret = {};
+    if ((props.registryName !== undefined))
+        ret.registryName = cdk.getRefProperty(props.registryName?.registryPolicyRef, 'registryName') ?? cdk.ensureStringOrUndefined(props.registryName, "registryName", "eventschemas.IRegistryPolicyRef | string");
+    return ret;
+}
 /**
  * Use the `AWS::EventSchemas::RegistryPolicy` resource to specify resource-based policies for an EventBridge Schema Registry.
  *
@@ -131,7 +140,7 @@ exports.CfnRegistryPropsMixin = CfnRegistryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registrypolicy.html
  */
 class CfnRegistryPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnRegistryPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnRegistryPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policy", "registryName", "revisionId"];
     props;
     strategy;
@@ -154,7 +163,7 @@ class CfnRegistryPolicyPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -167,12 +176,7 @@ class CfnRegistryPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRegistryPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRegistryPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRegistryPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -186,7 +190,7 @@ exports.CfnRegistryPolicyPropsMixin = CfnRegistryPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html
  */
 class CfnSchemaPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnSchemaPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eventschemas.mixins.CfnSchemaPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["content", "description", "registryName", "schemaName", "tags", "type"];
     props;
     strategy;
@@ -209,7 +213,7 @@ class CfnSchemaPropsMixin 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
@@ -222,12 +226,7 @@ class CfnSchemaPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSchemaPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSchemaPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSchemaPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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