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

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

@@ -1,6 +1,84 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as service from "aws-cdk-lib/aws-workspaces";
 import * as events from "aws-cdk-lib/aws-events";
+/**
+ * EventBridge event pattern for aws.workspaces@WorkSpacesAccess
+ */
+export declare class WorkSpacesAccess {
+    /**
+     * EventBridge event pattern for WorkSpaces Access
+     */
+    static workSpacesAccessPattern(options?: WorkSpacesAccess.WorkSpacesAccessProps): events.EventPattern;
+}
+export declare namespace WorkSpacesAccess {
+    /**
+     * Props type for aws.workspaces@WorkSpacesAccess event
+     */
+    interface WorkSpacesAccessProps {
+        /**
+         * clientIpAddress property
+         *
+         * Specify an array of string values to match this event if the actual value of clientIpAddress is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly clientIpAddress?: Array<string>;
+        /**
+         * actionType property
+         *
+         * Specify an array of string values to match this event if the actual value of actionType is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly actionType?: Array<string>;
+        /**
+         * workspacesClientProductName property
+         *
+         * Specify an array of string values to match this event if the actual value of workspacesClientProductName is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly workspacesClientProductName?: Array<string>;
+        /**
+         * loginTime property
+         *
+         * Specify an array of string values to match this event if the actual value of loginTime is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly loginTime?: Array<string>;
+        /**
+         * clientPlatform property
+         *
+         * Specify an array of string values to match this event if the actual value of clientPlatform is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly clientPlatform?: Array<string>;
+        /**
+         * directoryId property
+         *
+         * Specify an array of string values to match this event if the actual value of directoryId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly directoryId?: Array<string>;
+        /**
+         * workspaceId property
+         *
+         * Specify an array of string values to match this event if the actual value of workspaceId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Filter with the Workspace reference
+         */
+        readonly workspaceId?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}
 /**
  * EventBridge event patterns for Workspace
  */
@@ -17,81 +95,5 @@ export declare class WorkspaceEvents {
     /**
      * EventBridge event pattern for Workspace WorkSpaces Access
      */
-    workSpacesAccessPattern(options?: WorkspaceEvents.WorkSpacesAccess.WorkSpacesAccessProps): events.EventPattern;
-}
-export declare namespace WorkspaceEvents {
-    /**
-     * aws.workspaces@WorkSpacesAccess event types for Workspace
-     */
-    class WorkSpacesAccess {
-    }
-    namespace WorkSpacesAccess {
-        /**
-         * Props type for Workspace aws.workspaces@WorkSpacesAccess event
-         */
-        interface WorkSpacesAccessProps {
-            /**
-             * clientIpAddress property
-             *
-             * Specify an array of string values to match this event if the actual value of clientIpAddress is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly clientIpAddress?: Array<string>;
-            /**
-             * actionType property
-             *
-             * Specify an array of string values to match this event if the actual value of actionType is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly actionType?: Array<string>;
-            /**
-             * workspacesClientProductName property
-             *
-             * Specify an array of string values to match this event if the actual value of workspacesClientProductName is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly workspacesClientProductName?: Array<string>;
-            /**
-             * loginTime property
-             *
-             * Specify an array of string values to match this event if the actual value of loginTime is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly loginTime?: Array<string>;
-            /**
-             * clientPlatform property
-             *
-             * Specify an array of string values to match this event if the actual value of clientPlatform is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly clientPlatform?: Array<string>;
-            /**
-             * directoryId property
-             *
-             * Specify an array of string values to match this event if the actual value of directoryId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly directoryId?: Array<string>;
-            /**
-             * workspaceId property
-             *
-             * Specify an array of string values to match this event if the actual value of workspaceId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Filter with the Workspace reference
-             */
-            readonly workspaceId?: Array<string>;
-            /**
-             * EventBridge event metadata
-             *
-             * @default - -
-             */
-            readonly eventMetadata?: cdk.AWSEventMetadataProps;
-        }
-    }
+    workSpacesAccessPattern(options?: WorkSpacesAccess.WorkSpacesAccessProps): events.EventPattern;
 }

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

@@ -1,32 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkspaceEvents = void 0;
+exports.WorkspaceEvents = exports.WorkSpacesAccess = void 0;
 const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /**
- * EventBridge event patterns for Workspace
+ * EventBridge event pattern for aws.workspaces@WorkSpacesAccess
  */
-class WorkspaceEvents {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspaces.events.WorkspaceEvents", version: "2.241.0-alpha.0" };
-    /**
-     * Create WorkspaceEvents from a Workspace reference
-     */
-    static fromWorkspace(workspaceRef) {
-        return new WorkspaceEvents(workspaceRef);
-    }
+class WorkSpacesAccess {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspaces.events.WorkSpacesAccess", version: "2.242.0-alpha.0" };
     /**
-     * Reference to the Workspace construct
-     */
-    workspaceRef;
-    constructor(workspaceRef) {
-        this.workspaceRef = workspaceRef;
-    }
-    /**
-     * EventBridge event pattern for Workspace WorkSpaces Access
+     * EventBridge event pattern for WorkSpaces Access
      */
-    workSpacesAccessPattern(options) {
+    static workSpacesAccessPattern(options) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_workspaces_events_WorkspaceEvents_WorkSpacesAccess_WorkSpacesAccessProps(options);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_workspaces_events_WorkSpacesAccess_WorkSpacesAccessProps(options);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -37,23 +24,14 @@ class WorkspaceEvents {
         return {
             source: ["aws.workspaces"],
             detailType: ["WorkSpaces Access"],
-            detail: convertWorkSpacesAccessDetailToEventPattern(options, this.workspaceRef),
+            detail: convertWorkSpacesAccessDetailToEventPattern(options),
             version: options?.eventMetadata?.version,
             resources: options?.eventMetadata?.resources,
             region: options?.eventMetadata?.region
         };
     }
 }
-exports.WorkspaceEvents = WorkspaceEvents;
-(function (WorkspaceEvents) {
-    /**
-     * aws.workspaces@WorkSpacesAccess event types for Workspace
-     */
-    class WorkSpacesAccess {
-        static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspaces.events.WorkspaceEvents.WorkSpacesAccess", version: "2.241.0-alpha.0" };
-    }
-    WorkspaceEvents.WorkSpacesAccess = WorkSpacesAccess;
-})(WorkspaceEvents || (exports.WorkspaceEvents = WorkspaceEvents = {}));
+exports.WorkSpacesAccess = WorkSpacesAccess;
 // @ts-ignore TS6133
 function convertWorkSpacesAccessDetailToEventPattern(obj, iRef) {
     const ret = {
@@ -63,7 +41,7 @@ function convertWorkSpacesAccessDetailToEventPattern(obj, iRef) {
         loginTime: obj?.loginTime,
         clientPlatform: obj?.clientPlatform,
         directoryId: obj?.directoryId,
-        workspaceId: (obj?.workspaceId ?? [iRef.workspaceRef.workspaceId])
+        workspaceId: (obj?.workspaceId ?? [iRef?.workspaceRef.workspaceId])
     };
     for (const [key, value] of Object.entries(ret)) {
         if ((value === undefined))
@@ -74,3 +52,45 @@ function convertWorkSpacesAccessDetailToEventPattern(obj, iRef) {
     ;
     return ret;
 }
+/**
+ * EventBridge event patterns for Workspace
+ */
+class WorkspaceEvents {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspaces.events.WorkspaceEvents", version: "2.242.0-alpha.0" };
+    /**
+     * Create WorkspaceEvents from a Workspace reference
+     */
+    static fromWorkspace(workspaceRef) {
+        return new WorkspaceEvents(workspaceRef);
+    }
+    /**
+     * Reference to the Workspace construct
+     */
+    workspaceRef;
+    constructor(workspaceRef) {
+        this.workspaceRef = workspaceRef;
+    }
+    /**
+     * EventBridge event pattern for Workspace WorkSpaces Access
+     */
+    workSpacesAccessPattern(options) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_workspaces_events_WorkSpacesAccess_WorkSpacesAccessProps(options);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.workSpacesAccessPattern);
+            }
+            throw error;
+        }
+        return {
+            source: ["aws.workspaces"],
+            detailType: ["WorkSpaces Access"],
+            detail: convertWorkSpacesAccessDetailToEventPattern(options, this.workspaceRef),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+}
+exports.WorkspaceEvents = WorkspaceEvents;

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-workspacesinstances";
 export declare class CfnVolumePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnVolumeMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkspacesInstances::Volume`.
      *
@@ -123,7 +123,7 @@ export interface CfnVolumeMixinProps {
 export declare class CfnVolumeAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnVolumeAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkspacesInstances::VolumeAssociation`.
      *
@@ -184,7 +184,7 @@ export interface CfnVolumeAssociationMixinProps {
 export declare class CfnWorkspaceInstancePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnWorkspaceInstanceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkspacesInstances::WorkspaceInstance`.
      *

package/lib/services/aws-workspacesinstances/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-workspacesinstances");
 /**
  * Resource Type definition for AWS::WorkspacesInstances::Volume - Manages WorkSpaces Volume resources.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-workspacesinstances");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesinstances-volume.html
  */
 class CfnVolumePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesinstances.mixins.CfnVolumePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesinstances.mixins.CfnVolumePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZone", "encrypted", "iops", "kmsKeyId", "sizeInGb", "snapshotId", "tagSpecifications", "throughput", "volumeType"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnVolumePropsMixin 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 CfnVolumePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVolumePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVolumePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVolumePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,7 +66,7 @@ exports.CfnVolumePropsMixin = CfnVolumePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesinstances-volumeassociation.html
  */
 class CfnVolumeAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesinstances.mixins.CfnVolumeAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesinstances.mixins.CfnVolumeAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["device", "disassociateMode", "volumeId", "workspaceInstanceId"];
     props;
     strategy;
@@ -95,7 +89,7 @@ class CfnVolumeAssociationPropsMixin 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
@@ -108,12 +102,7 @@ class CfnVolumeAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVolumeAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVolumeAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVolumeAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -127,7 +116,7 @@ exports.CfnVolumeAssociationPropsMixin = CfnVolumeAssociationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesinstances-workspaceinstance.html
  */
 class CfnWorkspaceInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesinstances.mixins.CfnWorkspaceInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesinstances.mixins.CfnWorkspaceInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["managedInstance", "tags"];
     props;
     strategy;
@@ -150,7 +139,7 @@ class CfnWorkspaceInstancePropsMixin 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
@@ -163,12 +152,7 @@ class CfnWorkspaceInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnWorkspaceInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnWorkspaceInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnWorkspaceInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

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

package/lib/services/aws-workspacesthinclient/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-workspacesthinclient");
 /**
  * Describes an environment.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-workspacesthinclient");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesthinclient-environment.html
  */
 class CfnEnvironmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesthinclient.mixins.CfnEnvironmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_workspacesthinclient.mixins.CfnEnvironmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["desiredSoftwareSetId", "desktopArn", "desktopEndpoint", "deviceCreationTags", "kmsKeyArn", "maintenanceWindow", "name", "softwareSetUpdateMode", "softwareSetUpdateSchedule", "tags"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnEnvironmentPropsMixin 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 CfnEnvironmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-workspacesweb";
 export declare class CfnBrowserSettingsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBrowserSettingsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::BrowserSettings`.
      *
@@ -117,7 +117,7 @@ export interface CfnBrowserSettingsMixinProps {
 export declare class CfnIdentityProviderPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdentityProviderMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::IdentityProvider`.
      *
@@ -221,7 +221,7 @@ export interface CfnIdentityProviderMixinProps {
 export declare class CfnIpAccessSettingsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIpAccessSettingsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::IpAccessSettings`.
      *
@@ -329,7 +329,7 @@ export interface CfnIpAccessSettingsMixinProps {
 export declare class CfnNetworkSettingsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnNetworkSettingsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::NetworkSettings`.
      *
@@ -404,7 +404,7 @@ export interface CfnNetworkSettingsMixinProps {
 export declare class CfnPortalPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPortalMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::Portal`.
      *
@@ -553,7 +553,7 @@ export interface CfnPortalMixinProps {
 export declare class CfnTrustStorePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTrustStoreMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::TrustStore`.
      *
@@ -610,7 +610,7 @@ export interface CfnTrustStoreMixinProps {
 export declare class CfnUserAccessLoggingSettingsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserAccessLoggingSettingsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::UserAccessLoggingSettings`.
      *
@@ -663,7 +663,7 @@ export interface CfnUserAccessLoggingSettingsMixinProps {
 export declare class CfnUserSettingsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserSettingsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::UserSettings`.
      *
@@ -1058,7 +1058,7 @@ export interface CfnUserSettingsMixinProps {
 export declare class CfnDataProtectionSettingsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDataProtectionSettingsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::DataProtectionSettings`.
      *
@@ -1285,7 +1285,7 @@ export interface CfnDataProtectionSettingsMixinProps {
 export declare class CfnSessionLoggerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSessionLoggerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::WorkSpacesWeb::SessionLogger`.
      *