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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-gamelift";
 export declare class CfnAliasPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAliasMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::Alias`.
      *
@@ -118,7 +118,7 @@ export interface CfnAliasMixinProps {
 export declare class CfnBuildPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBuildMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::Build`.
      *
@@ -246,7 +246,7 @@ export interface CfnBuildMixinProps {
 export declare class CfnFleetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFleetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::Fleet`.
      *
@@ -337,6 +337,12 @@ export declare namespace CfnFleetPropsMixin {
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationconfiguration.html#cfn-gamelift-fleet-locationconfiguration-locationcapacity
          */
         readonly locationCapacity?: cdk.IResolvable | CfnFleetPropsMixin.LocationCapacityProperty;
+        /**
+         * The player gateway status for the location.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationconfiguration.html#cfn-gamelift-fleet-locationconfiguration-playergatewaystatus
+         */
+        readonly playerGatewayStatus?: string;
     }
     /**
      * Current resource capacity settings for managed EC2 fleets and managed container fleets.
@@ -683,6 +689,21 @@ export declare namespace CfnFleetPropsMixin {
          */
         readonly targetValue?: number;
     }
+    /**
+     * Configuration for player gateway.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-playergatewayconfiguration.html
+     */
+    interface PlayerGatewayConfigurationProperty {
+        /**
+         * The IP protocol supported by the game server.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-playergatewayconfiguration.html#cfn-gamelift-fleet-playergatewayconfiguration-gameserveripprotocolsupported
+         */
+        readonly gameServerIpProtocolSupported?: string;
+    }
 }
 /**
  * Properties for CfnFleetPropsMixin
@@ -870,6 +891,18 @@ export interface CfnFleetMixinProps {
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-peervpcid
      */
     readonly peerVpcId?: string;
+    /**
+     * Configuration for player gateway.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-playergatewayconfiguration
+     */
+    readonly playerGatewayConfiguration?: cdk.IResolvable | CfnFleetPropsMixin.PlayerGatewayConfigurationProperty;
+    /**
+     * The player gateway mode for the fleet.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-playergatewaymode
+     */
+    readonly playerGatewayMode?: string;
     /**
      * A policy that limits the number of game sessions that an individual player can create on instances in this fleet within a specified span of time.
      *
@@ -955,7 +988,7 @@ export interface CfnFleetMixinProps {
 export declare class CfnGameServerGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGameServerGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::GameServerGroup`.
      *
@@ -1198,7 +1231,7 @@ export interface CfnGameServerGroupMixinProps {
 export declare class CfnGameSessionQueuePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGameSessionQueueMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::GameSessionQueue`.
      *
@@ -1416,7 +1449,7 @@ export interface CfnGameSessionQueueMixinProps {
 export declare class CfnLocationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::Location`.
      *
@@ -1469,7 +1502,7 @@ export interface CfnLocationMixinProps {
 export declare class CfnMatchmakingConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMatchmakingConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::MatchmakingConfiguration`.
      *
@@ -1674,7 +1707,7 @@ export interface CfnMatchmakingConfigurationMixinProps {
 export declare class CfnMatchmakingRuleSetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMatchmakingRuleSetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::MatchmakingRuleSet`.
      *
@@ -1737,7 +1770,7 @@ export interface CfnMatchmakingRuleSetMixinProps {
 export declare class CfnScriptPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScriptMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::Script`.
      *
@@ -1851,7 +1884,7 @@ export interface CfnScriptMixinProps {
 export declare class CfnContainerFleetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnContainerFleetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::ContainerFleet`.
      *
@@ -2110,6 +2143,12 @@ export declare namespace CfnContainerFleetPropsMixin {
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-containerfleet-locationconfiguration.html#cfn-gamelift-containerfleet-locationconfiguration-locationcapacity
          */
         readonly locationCapacity?: cdk.IResolvable | CfnContainerFleetPropsMixin.LocationCapacityProperty;
+        /**
+         * The player gateway status for the location.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-containerfleet-locationconfiguration.html#cfn-gamelift-containerfleet-locationconfiguration-playergatewaystatus
+         */
+        readonly playerGatewayStatus?: string;
         /**
          * A list of fleet actions that have been suspended in the fleet location.
          *
@@ -2370,6 +2409,12 @@ export interface CfnContainerFleetMixinProps {
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-containerfleet.html#cfn-gamelift-containerfleet-perinstancecontainergroupdefinitionname
      */
     readonly perInstanceContainerGroupDefinitionName?: string;
+    /**
+     * The player gateway mode for the container fleet.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-containerfleet.html#cfn-gamelift-containerfleet-playergatewaymode
+     */
+    readonly playerGatewayMode?: string;
     /**
      * A list of rules that control how a fleet is scaled.
      *
@@ -2400,7 +2445,7 @@ export interface CfnContainerFleetMixinProps {
 export declare class CfnContainerGroupDefinitionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnContainerGroupDefinitionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::GameLift::ContainerGroupDefinition`.
      *

package/lib/services/aws-gamelift/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-gamelift");
 /**
  * The `AWS::GameLift::Alias` resource creates an alias for an Amazon GameLift (GameLift) fleet destination.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-gamelift");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html
  */
 class CfnAliasPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnAliasPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnAliasPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "name", "routingStrategy", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnAliasPropsMixin 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 CfnAliasPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAliasPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAliasPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAliasPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnAliasPropsMixin = CfnAliasPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html
  */
 class CfnBuildPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnBuildPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnBuildPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "operatingSystem", "serverSdkVersion", "storageLocation", "tags", "version"];
     props;
     strategy;
@@ -99,7 +93,7 @@ class CfnBuildPropsMixin 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
@@ -112,12 +106,7 @@ class CfnBuildPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBuildPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBuildPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBuildPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,8 +122,8 @@ exports.CfnBuildPropsMixin = CfnBuildPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html
  */
 class CfnFleetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnFleetPropsMixin", version: "2.241.0-alpha.0" };
-    static CFN_PROPERTY_KEYS = ["anywhereConfiguration", "applyCapacity", "buildId", "certificateConfiguration", "computeType", "description", "desiredEc2Instances", "ec2InboundPermissions", "ec2InstanceType", "fleetType", "instanceRoleArn", "instanceRoleCredentialsProvider", "locations", "logPaths", "maxSize", "metricGroups", "minSize", "name", "newGameSessionProtectionPolicy", "peerVpcAwsAccountId", "peerVpcId", "resourceCreationLimitPolicy", "runtimeConfiguration", "scalingPolicies", "scriptId", "serverLaunchParameters", "serverLaunchPath", "tags"];
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnFleetPropsMixin", version: "2.242.0-alpha.0" };
+    static CFN_PROPERTY_KEYS = ["anywhereConfiguration", "applyCapacity", "buildId", "certificateConfiguration", "computeType", "description", "desiredEc2Instances", "ec2InboundPermissions", "ec2InstanceType", "fleetType", "instanceRoleArn", "instanceRoleCredentialsProvider", "locations", "logPaths", "maxSize", "metricGroups", "minSize", "name", "newGameSessionProtectionPolicy", "peerVpcAwsAccountId", "peerVpcId", "playerGatewayConfiguration", "playerGatewayMode", "resourceCreationLimitPolicy", "runtimeConfiguration", "scalingPolicies", "scriptId", "serverLaunchParameters", "serverLaunchPath", "tags"];
     props;
     strategy;
     /**
@@ -156,7 +145,7 @@ class CfnFleetPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -169,12 +158,7 @@ class CfnFleetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFleetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -203,7 +187,7 @@ exports.CfnFleetPropsMixin = CfnFleetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html
  */
 class CfnGameServerGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnGameServerGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnGameServerGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoScalingPolicy", "balancingStrategy", "deleteOption", "gameServerGroupName", "gameServerProtectionPolicy", "instanceDefinitions", "launchTemplate", "maxSize", "minSize", "roleArn", "tags", "vpcSubnets"];
     props;
     strategy;
@@ -226,7 +210,7 @@ class CfnGameServerGroupPropsMixin 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
@@ -239,12 +223,7 @@ class CfnGameServerGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGameServerGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGameServerGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGameServerGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -260,7 +239,7 @@ exports.CfnGameServerGroupPropsMixin = CfnGameServerGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html
  */
 class CfnGameSessionQueuePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnGameSessionQueuePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnGameSessionQueuePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["customEventData", "destinations", "filterConfiguration", "name", "notificationTarget", "playerLatencyPolicies", "priorityConfiguration", "tags", "timeoutInSeconds"];
     props;
     strategy;
@@ -283,7 +262,7 @@ class CfnGameSessionQueuePropsMixin 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
@@ -296,12 +275,7 @@ class CfnGameSessionQueuePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGameSessionQueuePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGameSessionQueuePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGameSessionQueuePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -315,7 +289,7 @@ exports.CfnGameSessionQueuePropsMixin = CfnGameSessionQueuePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-location.html
  */
 class CfnLocationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnLocationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnLocationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["locationName", "tags"];
     props;
     strategy;
@@ -338,7 +312,7 @@ class CfnLocationPropsMixin 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
@@ -351,12 +325,7 @@ class CfnLocationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -372,7 +341,7 @@ exports.CfnLocationPropsMixin = CfnLocationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html
  */
 class CfnMatchmakingConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnMatchmakingConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnMatchmakingConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["acceptanceRequired", "acceptanceTimeoutSeconds", "additionalPlayerCount", "backfillMode", "creationTime", "customEventData", "description", "flexMatchMode", "gameProperties", "gameSessionData", "gameSessionQueueArns", "name", "notificationTarget", "requestTimeoutSeconds", "ruleSetArn", "ruleSetName", "tags"];
     props;
     strategy;
@@ -395,7 +364,7 @@ class CfnMatchmakingConfigurationPropsMixin 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
@@ -408,12 +377,7 @@ class CfnMatchmakingConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMatchmakingConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMatchmakingConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMatchmakingConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -439,7 +403,7 @@ exports.CfnMatchmakingConfigurationPropsMixin = CfnMatchmakingConfigurationProps
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingruleset.html
  */
 class CfnMatchmakingRuleSetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnMatchmakingRuleSetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnMatchmakingRuleSetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "ruleSetBody", "tags"];
     props;
     strategy;
@@ -462,7 +426,7 @@ class CfnMatchmakingRuleSetPropsMixin 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
@@ -475,12 +439,7 @@ class CfnMatchmakingRuleSetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMatchmakingRuleSetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMatchmakingRuleSetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMatchmakingRuleSetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -496,7 +455,7 @@ exports.CfnMatchmakingRuleSetPropsMixin = CfnMatchmakingRuleSetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-script.html
  */
 class CfnScriptPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnScriptPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnScriptPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "nodeJsVersion", "storageLocation", "tags", "version"];
     props;
     strategy;
@@ -519,7 +478,7 @@ class CfnScriptPropsMixin 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
@@ -532,12 +491,7 @@ class CfnScriptPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnScriptPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnScriptPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnScriptPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -551,8 +505,8 @@ exports.CfnScriptPropsMixin = CfnScriptPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-containerfleet.html
  */
 class CfnContainerFleetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnContainerFleetPropsMixin", version: "2.241.0-alpha.0" };
-    static CFN_PROPERTY_KEYS = ["billingType", "deploymentConfiguration", "description", "fleetRoleArn", "gameServerContainerGroupDefinitionName", "gameServerContainerGroupsPerInstance", "gameSessionCreationLimitPolicy", "instanceConnectionPortRange", "instanceInboundPermissions", "instanceType", "locations", "logConfiguration", "metricGroups", "newGameSessionProtectionPolicy", "perInstanceContainerGroupDefinitionName", "scalingPolicies", "tags"];
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnContainerFleetPropsMixin", version: "2.242.0-alpha.0" };
+    static CFN_PROPERTY_KEYS = ["billingType", "deploymentConfiguration", "description", "fleetRoleArn", "gameServerContainerGroupDefinitionName", "gameServerContainerGroupsPerInstance", "gameSessionCreationLimitPolicy", "instanceConnectionPortRange", "instanceInboundPermissions", "instanceType", "locations", "logConfiguration", "metricGroups", "newGameSessionProtectionPolicy", "perInstanceContainerGroupDefinitionName", "playerGatewayMode", "scalingPolicies", "tags"];
     props;
     strategy;
     /**
@@ -574,7 +528,7 @@ class CfnContainerFleetPropsMixin 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
@@ -587,12 +541,7 @@ class CfnContainerFleetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnContainerFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnContainerFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnContainerFleetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -612,7 +561,7 @@ exports.CfnContainerFleetPropsMixin = CfnContainerFleetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-containergroupdefinition.html
  */
 class CfnContainerGroupDefinitionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnContainerGroupDefinitionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_gamelift.mixins.CfnContainerGroupDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["containerGroupType", "gameServerContainerDefinition", "name", "operatingSystem", "sourceVersionNumber", "supportContainerDefinitions", "tags", "totalMemoryLimitMebibytes", "totalVcpuLimit", "versionDescription"];
     props;
     strategy;
@@ -635,7 +584,7 @@ class CfnContainerGroupDefinitionPropsMixin 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
@@ -648,12 +597,7 @@ class CfnContainerGroupDefinitionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnContainerGroupDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnContainerGroupDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnContainerGroupDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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