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

package/lib/services/aws-batch/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-batch";
+import { aws_batch as batchRefs, aws_ec2 as ec2Refs, aws_iam as iamRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::Batch::ComputeEnvironment` resource defines your AWS Batch compute environment.
  *
@@ -42,7 +43,7 @@ import * as service from "aws-cdk-lib/aws-batch";
 export declare class CfnComputeEnvironmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnComputeEnvironmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Batch::ComputeEnvironment`.
      *
@@ -220,7 +221,7 @@ export declare namespace CfnComputeEnvironmentPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancerole
          */
-        readonly instanceRole?: string;
+        readonly instanceRole?: iamRefs.IInstanceProfileRef | iamRefs.IRoleRef | string;
         /**
          * The instances types that can be launched.
          *
@@ -280,7 +281,7 @@ export declare namespace CfnComputeEnvironmentPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-placementgroup
          */
-        readonly placementGroup?: string;
+        readonly placementGroup?: ec2Refs.IPlacementGroupRef | string;
         /**
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-scalingpolicy
          */
@@ -294,7 +295,7 @@ export declare namespace CfnComputeEnvironmentPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-securitygroupids
          */
-        readonly securityGroupIds?: Array<string>;
+        readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
         /**
          * The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a `SPOT` compute environment.
          *
@@ -304,7 +305,7 @@ export declare namespace CfnComputeEnvironmentPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-spotiamfleetrole
          */
-        readonly spotIamFleetRole?: string;
+        readonly spotIamFleetRole?: iamRefs.IRoleRef | string;
         /**
          * The VPC subnets where the compute resources are launched.
          *
@@ -318,7 +319,7 @@ export declare namespace CfnComputeEnvironmentPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-subnets
          */
-        readonly subnets?: Array<string>;
+        readonly subnets?: Array<ec2Refs.ISubnetRef | string>;
         /**
          * Key-value pair tags to be applied to Amazon EC2 resources that are launched in the compute environment.
          *
@@ -442,7 +443,7 @@ export declare namespace CfnComputeEnvironmentPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-launchtemplatespecification.html#cfn-batch-computeenvironment-launchtemplatespecification-launchtemplateid
          */
-        readonly launchTemplateId?: string;
+        readonly launchTemplateId?: ec2Refs.ILaunchTemplateRef | string;
         /**
          * The name of the launch template.
          *
@@ -630,7 +631,7 @@ export interface CfnComputeEnvironmentMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-servicerole
      */
-    readonly serviceRole?: string;
+    readonly serviceRole?: iamRefs.IRoleRef | string;
     /**
      * The state of the compute environment.
      *
@@ -693,7 +694,7 @@ export interface CfnComputeEnvironmentMixinProps {
 export declare class CfnJobDefinitionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnJobDefinitionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Batch::JobDefinition`.
      *
@@ -2714,7 +2715,7 @@ export interface CfnJobDefinitionMixinProps {
 export declare class CfnJobQueuePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnJobQueueMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Batch::JobQueue`.
      *
@@ -2749,7 +2750,7 @@ export declare namespace CfnJobQueuePropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html#cfn-batch-jobqueue-computeenvironmentorder-computeenvironment
          */
-        readonly computeEnvironment?: string;
+        readonly computeEnvironment?: batchRefs.IComputeEnvironmentRef | string;
         /**
          * The order of the compute environment.
          *
@@ -2881,7 +2882,7 @@ export interface CfnJobQueueMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-schedulingpolicyarn
      */
-    readonly schedulingPolicyArn?: string;
+    readonly schedulingPolicyArn?: batchRefs.ISchedulingPolicyRef | string;
     /**
      * The order of the service environment associated with the job queue.
      *
@@ -2920,7 +2921,7 @@ export interface CfnJobQueueMixinProps {
 export declare class CfnSchedulingPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSchedulingPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Batch::SchedulingPolicy`.
      *
@@ -3057,7 +3058,7 @@ export interface CfnSchedulingPolicyMixinProps {
 export declare class CfnConsumableResourcePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConsumableResourceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Batch::ConsumableResource`.
      *
@@ -3125,7 +3126,7 @@ export interface CfnConsumableResourceMixinProps {
 export declare class CfnServiceEnvironmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServiceEnvironmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Batch::ServiceEnvironment`.
      *

package/lib/services/aws-batch/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-batch");
 /**
  * The `AWS::Batch::ComputeEnvironment` resource defines your AWS Batch compute environment.
@@ -46,7 +45,7 @@ const service = require("aws-cdk-lib/aws-batch");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html
  */
 class CfnComputeEnvironmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnComputeEnvironmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnComputeEnvironmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["computeEnvironmentName", "computeResources", "context", "eksConfiguration", "replaceComputeEnvironment", "serviceRole", "state", "tags", "type", "unmanagedvCpus", "updatePolicy"];
     props;
     strategy;
@@ -68,8 +67,11 @@ class CfnComputeEnvironmentPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnComputeEnvironmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -82,16 +84,58 @@ class CfnComputeEnvironmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnComputeEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnComputeEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnComputeEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnComputeEnvironmentPropsMixin = CfnComputeEnvironmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnComputeEnvironmentPropsMixinLaunchTemplateSpecificationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        launchTemplateId: (!props.launchTemplateId ? undefined : cdk.getRefProperty(props.launchTemplateId?.launchTemplateRef, 'launchTemplateId') ?? cdk.ensureStringOrUndefined(props.launchTemplateId, "launchTemplateId", "ec2.ILaunchTemplateRef | string")),
+        launchTemplateName: (!props.launchTemplateName ? undefined : props.launchTemplateName),
+        overrides: (!props.overrides ? undefined : props.overrides),
+        userdataType: (!props.userdataType ? undefined : props.userdataType),
+        version: (!props.version ? undefined : props.version)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnComputeEnvironmentPropsMixinComputeResourcesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        allocationStrategy: (!props.allocationStrategy ? undefined : props.allocationStrategy),
+        bidPercentage: (!props.bidPercentage ? undefined : props.bidPercentage),
+        desiredvCpus: (!props.desiredvCpus ? undefined : props.desiredvCpus),
+        ec2Configuration: (!props.ec2Configuration ? undefined : props.ec2Configuration),
+        ec2KeyPair: (!props.ec2KeyPair ? undefined : props.ec2KeyPair),
+        imageId: (!props.imageId ? undefined : props.imageId),
+        instanceRole: (!props.instanceRole ? undefined : cdk.getRefProperty(props.instanceRole?.instanceProfileRef, 'instanceProfileArn') ?? cdk.getRefProperty(props.instanceRole?.instanceProfileRef, 'instanceProfileName') ?? cdk.getRefProperty(props.instanceRole?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(props.instanceRole, "instanceRole", "iam.IInstanceProfileRef | iam.IRoleRef | string")),
+        instanceTypes: (!props.instanceTypes ? undefined : props.instanceTypes),
+        launchTemplate: (!props.launchTemplate ? undefined : (!props.launchTemplate ? undefined : flattenCfnComputeEnvironmentPropsMixinLaunchTemplateSpecificationProperty(props.launchTemplate))),
+        maxvCpus: (!props.maxvCpus ? undefined : props.maxvCpus),
+        minvCpus: (!props.minvCpus ? undefined : props.minvCpus),
+        placementGroup: (!props.placementGroup ? undefined : cdk.getRefProperty(props.placementGroup?.placementGroupRef, 'groupName') ?? cdk.ensureStringOrUndefined(props.placementGroup, "placementGroup", "ec2.IPlacementGroupRef | string")),
+        scalingPolicy: (!props.scalingPolicy ? undefined : props.scalingPolicy),
+        securityGroupIds: (!props.securityGroupIds ? undefined : cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"))),
+        spotIamFleetRole: (!props.spotIamFleetRole ? undefined : cdk.getRefProperty(props.spotIamFleetRole?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(props.spotIamFleetRole, "spotIamFleetRole", "iam.IRoleRef | string")),
+        subnets: (!props.subnets ? undefined : cdk.mapArrayInPlace(props.subnets, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnets", "ec2.ISubnetRef | string"))),
+        tags: (!props.tags ? undefined : props.tags),
+        type: (!props.type ? undefined : props.type),
+        updateToLatestImageVersion: (!props.updateToLatestImageVersion ? undefined : props.updateToLatestImageVersion)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnComputeEnvironmentMixinProps(props) {
+    const ret = {};
+    if ((props.computeResources !== undefined))
+        ret.computeResources = flattenCfnComputeEnvironmentPropsMixinComputeResourcesProperty(props.computeResources);
+    if ((props.serviceRole !== undefined))
+        ret.serviceRole = cdk.getRefProperty(props.serviceRole?.roleRef, 'roleArn') ?? cdk.getRefProperty(props.serviceRole?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(props.serviceRole, "serviceRole", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The `AWS::Batch::JobDefinition` resource specifies the parameters for an AWS Batch job definition.
  *
@@ -103,7 +147,7 @@ exports.CfnComputeEnvironmentPropsMixin = CfnComputeEnvironmentPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html
  */
 class CfnJobDefinitionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnJobDefinitionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnJobDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["consumableResourceProperties", "containerProperties", "ecsProperties", "eksProperties", "jobDefinitionName", "nodeProperties", "parameters", "platformCapabilities", "propagateTags", "resourceRetentionPolicy", "retryStrategy", "schedulingPriority", "tags", "timeout", "type"];
     props;
     strategy;
@@ -126,7 +170,7 @@ class CfnJobDefinitionPropsMixin 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
@@ -139,12 +183,7 @@ class CfnJobDefinitionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -160,7 +199,7 @@ exports.CfnJobDefinitionPropsMixin = CfnJobDefinitionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html
  */
 class CfnJobQueuePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnJobQueuePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnJobQueuePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["computeEnvironmentOrder", "jobQueueName", "jobQueueType", "jobStateTimeLimitActions", "priority", "schedulingPolicyArn", "serviceEnvironmentOrder", "state", "tags"];
     props;
     strategy;
@@ -182,8 +221,11 @@ class CfnJobQueuePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnJobQueueMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -196,16 +238,29 @@ class CfnJobQueuePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnJobQueuePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnJobQueuePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnJobQueuePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnJobQueuePropsMixin = CfnJobQueuePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnJobQueuePropsMixinComputeEnvironmentOrderProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        computeEnvironment: (!props.computeEnvironment ? undefined : cdk.getRefProperty(props.computeEnvironment?.computeEnvironmentRef, 'computeEnvironmentArn') ?? cdk.ensureStringOrUndefined(props.computeEnvironment, "computeEnvironment", "batch.IComputeEnvironmentRef | string")),
+        order: (!props.order ? undefined : props.order)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnJobQueueMixinProps(props) {
+    const ret = {};
+    if ((props.computeEnvironmentOrder !== undefined))
+        ret.computeEnvironmentOrder = (cdk.isResolvableObject(props.computeEnvironmentOrder) ? props.computeEnvironmentOrder : cdk.mapArrayInPlace(props.computeEnvironmentOrder, (item) => flattenCfnJobQueuePropsMixinComputeEnvironmentOrderProperty(item)));
+    if ((props.schedulingPolicyArn !== undefined))
+        ret.schedulingPolicyArn = cdk.getRefProperty(props.schedulingPolicyArn?.schedulingPolicyRef, 'schedulingPolicyArn') ?? cdk.ensureStringOrUndefined(props.schedulingPolicyArn, "schedulingPolicyArn", "batch.ISchedulingPolicyRef | string");
+    return ret;
+}
 /**
  * The `AWS::Batch::SchedulingPolicy` resource specifies the parameters for an AWS Batch scheduling policy.
  *
@@ -217,7 +272,7 @@ exports.CfnJobQueuePropsMixin = CfnJobQueuePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-schedulingpolicy.html
  */
 class CfnSchedulingPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnSchedulingPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnSchedulingPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["fairsharePolicy", "name", "tags"];
     props;
     strategy;
@@ -240,7 +295,7 @@ class CfnSchedulingPolicyPropsMixin 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
@@ -253,12 +308,7 @@ class CfnSchedulingPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSchedulingPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSchedulingPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSchedulingPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -274,7 +324,7 @@ exports.CfnSchedulingPolicyPropsMixin = CfnSchedulingPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-consumableresource.html
  */
 class CfnConsumableResourcePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnConsumableResourcePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnConsumableResourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["consumableResourceName", "resourceType", "tags", "totalQuantity"];
     props;
     strategy;
@@ -297,7 +347,7 @@ class CfnConsumableResourcePropsMixin 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
@@ -310,12 +360,7 @@ class CfnConsumableResourcePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConsumableResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConsumableResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConsumableResourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -331,7 +376,7 @@ exports.CfnConsumableResourcePropsMixin = CfnConsumableResourcePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-serviceenvironment.html
  */
 class CfnServiceEnvironmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnServiceEnvironmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_batch.mixins.CfnServiceEnvironmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["capacityLimits", "serviceEnvironmentName", "serviceEnvironmentType", "state", "tags"];
     props;
     strategy;
@@ -354,7 +399,7 @@ class CfnServiceEnvironmentPropsMixin 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
@@ -367,12 +412,7 @@ class CfnServiceEnvironmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServiceEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServiceEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServiceEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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