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

package/lib/services/aws-ce/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-ce";
+import { aws_ce as ceRefs, aws_sns as snsRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::CE::AnomalyMonitor` resource is a Cost Explorer resource type that continuously inspects your account's cost data for anomalies, based on `MonitorType` and `MonitorSpecification` .
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-ce";
 export declare class CfnAnomalyMonitorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAnomalyMonitorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CE::AnomalyMonitor`.
      *
@@ -123,7 +124,7 @@ export interface CfnAnomalyMonitorMixinProps {
 export declare class CfnAnomalySubscriptionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAnomalySubscriptionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CE::AnomalySubscription`.
      *
@@ -177,7 +178,7 @@ export declare namespace CfnAnomalySubscriptionPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalysubscription-subscriber.html#cfn-ce-anomalysubscription-subscriber-address
          */
-        readonly address?: string;
+        readonly address?: snsRefs.ITopicRef | string;
         /**
          * Indicates if the subscriber accepts the notifications.
          *
@@ -213,7 +214,7 @@ export interface CfnAnomalySubscriptionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html#cfn-ce-anomalysubscription-monitorarnlist
      */
-    readonly monitorArnList?: Array<string>;
+    readonly monitorArnList?: Array<ceRefs.IAnomalyMonitorRef | string>;
     /**
      * Tags to assign to subscription.
      *
@@ -268,7 +269,7 @@ export interface CfnAnomalySubscriptionMixinProps {
 export declare class CfnCostCategoryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCostCategoryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CE::CostCategory`.
      *

package/lib/services/aws-ce/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-ce");
 /**
  * The `AWS::CE::AnomalyMonitor` resource is a Cost Explorer resource type that continuously inspects your account's cost data for anomalies, based on `MonitorType` and `MonitorSpecification` .
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-ce");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html
  */
 class CfnAnomalyMonitorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ce.mixins.CfnAnomalyMonitorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ce.mixins.CfnAnomalyMonitorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["monitorDimension", "monitorName", "monitorSpecification", "monitorType", "resourceTags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnAnomalyMonitorPropsMixin 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 CfnAnomalyMonitorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAnomalyMonitorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAnomalyMonitorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAnomalyMonitorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -80,7 +74,7 @@ exports.CfnAnomalyMonitorPropsMixin = CfnAnomalyMonitorPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html
  */
 class CfnAnomalySubscriptionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ce.mixins.CfnAnomalySubscriptionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ce.mixins.CfnAnomalySubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["frequency", "monitorArnList", "resourceTags", "subscribers", "subscriptionName", "threshold", "thresholdExpression"];
     props;
     strategy;
@@ -102,8 +96,11 @@ class CfnAnomalySubscriptionPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAnomalySubscriptionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -116,16 +113,30 @@ class CfnAnomalySubscriptionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAnomalySubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAnomalySubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAnomalySubscriptionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAnomalySubscriptionPropsMixin = CfnAnomalySubscriptionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAnomalySubscriptionPropsMixinSubscriberProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        address: (!props.address ? undefined : cdk.getRefProperty(props.address?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(props.address, "address", "sns.ITopicRef | string")),
+        status: (!props.status ? undefined : props.status),
+        type: (!props.type ? undefined : props.type)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnAnomalySubscriptionMixinProps(props) {
+    const ret = {};
+    if ((props.monitorArnList !== undefined))
+        ret.monitorArnList = cdk.mapArrayInPlace(props.monitorArnList, (item) => cdk.getRefProperty(item?.anomalyMonitorRef, 'monitorArn') ?? cdk.ensureStringOrUndefined(item, "monitorArnList", "ce.IAnomalyMonitorRef | string"));
+    if ((props.subscribers !== undefined))
+        ret.subscribers = (cdk.isResolvableObject(props.subscribers) ? props.subscribers : cdk.mapArrayInPlace(props.subscribers, (item) => flattenCfnAnomalySubscriptionPropsMixinSubscriberProperty(item)));
+    return ret;
+}
 /**
  * The `AWS::CE::CostCategory` resource creates groupings of cost that you can use across products in the Billing and Cost Management console, such as Cost Explorer and AWS Budgets.
  *
@@ -137,7 +148,7 @@ exports.CfnAnomalySubscriptionPropsMixin = CfnAnomalySubscriptionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html
  */
 class CfnCostCategoryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ce.mixins.CfnCostCategoryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ce.mixins.CfnCostCategoryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["defaultValue", "name", "rules", "ruleVersion", "splitChargeRules", "tags"];
     props;
     strategy;
@@ -160,7 +171,7 @@ class CfnCostCategoryPropsMixin 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
@@ -173,12 +184,7 @@ class CfnCostCategoryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCostCategoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCostCategoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCostCategoryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-certificatemanager";
 export declare class CfnAccountPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccountMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CertificateManager::Account`.
      *
@@ -85,7 +85,7 @@ export interface CfnAccountMixinProps {
 export declare class CfnCertificatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCertificateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CertificateManager::Certificate`.
      *

package/lib/services/aws-certificatemanager/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-certificatemanager");
 /**
  * The `AWS::CertificateManager::Account` resource defines the expiry event configuration that determines the number of days prior to expiry when ACM starts generating EventBridge events.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-certificatemanager");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-account.html
  */
 class CfnAccountPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_certificatemanager.mixins.CfnAccountPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_certificatemanager.mixins.CfnAccountPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["expiryEventsConfiguration"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnAccountPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -53,12 +52,7 @@ class CfnAccountPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccountPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccountPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccountPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -78,7 +72,7 @@ exports.CfnAccountPropsMixin = CfnAccountPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html
  */
 class CfnCertificatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_certificatemanager.mixins.CfnCertificatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_certificatemanager.mixins.CfnCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateAuthorityArn", "certificateExport", "certificateTransparencyLoggingPreference", "domainName", "domainValidationOptions", "keyAlgorithm", "subjectAlternativeNames", "tags", "validationMethod"];
     props;
     strategy;
@@ -101,7 +95,7 @@ class CfnCertificatePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -114,12 +108,7 @@ class CfnCertificatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

package/lib/services/aws-chatbot/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-chatbot";
+import { aws_iam as iamRefs, aws_sns as snsRefs } from "aws-cdk-lib/interfaces";
 /**
  * > AWS Chatbot is now  . [Learn more](https://docs.aws.amazon.com//chatbot/latest/adminguide/service-rename.html) >  > `Type` attribute values remain unchanged.
  *
@@ -17,7 +18,7 @@ import * as service from "aws-cdk-lib/aws-chatbot";
 export declare class CfnMicrosoftTeamsChannelConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMicrosoftTeamsChannelConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Chatbot::MicrosoftTeamsChannelConfiguration`.
      *
@@ -144,7 +145,7 @@ export interface CfnMicrosoftTeamsChannelConfigurationMixinProps {
 export declare class CfnSlackChannelConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSlackChannelConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Chatbot::SlackChannelConfiguration`.
      *
@@ -196,7 +197,7 @@ export interface CfnSlackChannelConfigurationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-iamrolearn
      */
-    readonly iamRoleArn?: string;
+    readonly iamRoleArn?: iamRefs.IRoleRef | string;
     /**
      * Specifies the logging level for this configuration. This property affects the log entries pushed to Amazon CloudWatch Logs.
      *
@@ -227,7 +228,7 @@ export interface CfnSlackChannelConfigurationMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-snstopicarns
      */
-    readonly snsTopicArns?: Array<string>;
+    readonly snsTopicArns?: Array<snsRefs.ITopicRef | string>;
     /**
      * The tags to add to the configuration.
      *
@@ -257,7 +258,7 @@ export interface CfnSlackChannelConfigurationMixinProps {
 export declare class CfnCustomActionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCustomActionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Chatbot::CustomAction`.
      *

package/lib/services/aws-chatbot/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-chatbot");
 /**
  * > AWS Chatbot is now  . [Learn more](https://docs.aws.amazon.com//chatbot/latest/adminguide/service-rename.html) >  > `Type` attribute values remain unchanged.
@@ -21,7 +20,7 @@ const service = require("aws-cdk-lib/aws-chatbot");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-microsoftteamschannelconfiguration.html
  */
 class CfnMicrosoftTeamsChannelConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_chatbot.mixins.CfnMicrosoftTeamsChannelConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_chatbot.mixins.CfnMicrosoftTeamsChannelConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["configurationName", "customizationResourceArns", "guardrailPolicies", "iamRoleArn", "loggingLevel", "snsTopicArns", "tags", "teamId", "teamsChannelId", "teamsChannelName", "teamsTenantId", "userRoleRequired"];
     props;
     strategy;
@@ -44,7 +43,7 @@ class CfnMicrosoftTeamsChannelConfigurationPropsMixin 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
@@ -57,12 +56,7 @@ class CfnMicrosoftTeamsChannelConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMicrosoftTeamsChannelConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMicrosoftTeamsChannelConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMicrosoftTeamsChannelConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -80,7 +74,7 @@ exports.CfnMicrosoftTeamsChannelConfigurationPropsMixin = CfnMicrosoftTeamsChann
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html
  */
 class CfnSlackChannelConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_chatbot.mixins.CfnSlackChannelConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_chatbot.mixins.CfnSlackChannelConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["configurationName", "customizationResourceArns", "guardrailPolicies", "iamRoleArn", "loggingLevel", "slackChannelId", "slackWorkspaceId", "snsTopicArns", "tags", "userRoleRequired"];
     props;
     strategy;
@@ -102,8 +96,11 @@ class CfnSlackChannelConfigurationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSlackChannelConfigurationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -116,16 +113,20 @@ class CfnSlackChannelConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSlackChannelConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSlackChannelConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSlackChannelConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSlackChannelConfigurationPropsMixin = CfnSlackChannelConfigurationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSlackChannelConfigurationMixinProps(props) {
+    const ret = {};
+    if ((props.iamRoleArn !== undefined))
+        ret.iamRoleArn = cdk.getRefProperty(props.iamRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.iamRoleArn, "iamRoleArn", "iam.IRoleRef | string");
+    if ((props.snsTopicArns !== undefined))
+        ret.snsTopicArns = cdk.mapArrayInPlace(props.snsTopicArns, (item) => cdk.getRefProperty(item?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(item, "snsTopicArns", "sns.ITopicRef | string"));
+    return ret;
+}
 /**
  * > AWS Chatbot is now  .
  *
@@ -139,7 +140,7 @@ exports.CfnSlackChannelConfigurationPropsMixin = CfnSlackChannelConfigurationPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-customaction.html
  */
 class CfnCustomActionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_chatbot.mixins.CfnCustomActionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_chatbot.mixins.CfnCustomActionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["actionName", "aliasName", "attachments", "definition", "tags"];
     props;
     strategy;
@@ -162,7 +163,7 @@ class CfnCustomActionPropsMixin 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
@@ -175,12 +176,7 @@ class CfnCustomActionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCustomActionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCustomActionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCustomActionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-cleanrooms";
 export declare class CfnAnalysisTemplatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAnalysisTemplateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::AnalysisTemplate`.
      *
@@ -416,7 +416,7 @@ export interface CfnAnalysisTemplateMixinProps {
 export declare class CfnCollaborationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCollaborationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::Collaboration`.
      *
@@ -797,7 +797,7 @@ export interface CfnCollaborationMixinProps {
 export declare class CfnConfiguredTablePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfiguredTableMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::ConfiguredTable`.
      *
@@ -1370,7 +1370,7 @@ export interface CfnConfiguredTableMixinProps {
 export declare class CfnConfiguredTableAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfiguredTableAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::ConfiguredTableAssociation`.
      *
@@ -1591,7 +1591,7 @@ export interface CfnConfiguredTableAssociationMixinProps {
 export declare class CfnMembershipPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMembershipMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::Membership`.
      *
@@ -1967,7 +1967,7 @@ export interface CfnMembershipMixinProps {
 export declare class CfnIdMappingTablePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdMappingTableMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::IdMappingTable`.
      *
@@ -2105,7 +2105,7 @@ export interface CfnIdMappingTableMixinProps {
 export declare class CfnIdNamespaceAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdNamespaceAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::IdNamespaceAssociation`.
      *
@@ -2245,7 +2245,7 @@ export interface CfnIdNamespaceAssociationMixinProps {
 export declare class CfnPrivacyBudgetTemplatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPrivacyBudgetTemplateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CleanRooms::PrivacyBudgetTemplate`.
      *