Merge branch 'main' into awsgh-28426

packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.latest.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json

@@ -38,7 +38,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "3c88aacdb6b48767fb52367e6dc0fe01602cfdc730dee4c4e3bebe0cec85ff9e.zip"
+     "S3Key": "eed45a32a57f32bc36031539054db0b27239d161061c528482bb55be51068664.zip"
     },
     "Environment": {
      "Variables": {

packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-create-cluster.ts

@@ -582,13 +582,17 @@ export namespace EmrCreateCluster {
     /**
      * The bid price for each EC2 Spot instance type as defined by InstanceType. Expressed in USD.
      *
+     * Cannot specify both `bidPrice` and `bidPriceAsPercentageOfOnDemandPrice`.
+     *
      * @default - None
      */
     readonly bidPrice?: string;
 
     /**
      * The bid price, as a percentage of On-Demand price.
      *
+     * Cannot specify both `bidPrice` and `bidPriceAsPercentageOfOnDemandPrice`.
+     *
      * @default - None
      */
     readonly bidPriceAsPercentageOfOnDemandPrice?: number;
@@ -713,6 +717,8 @@ export namespace EmrCreateCluster {
 
     /**
      * The spot provisioning timeout period in minutes.
+     *
+     * The value must be between 5 and 1440.
      */
     readonly timeoutDurationMinutes: number;
   }
@@ -781,14 +787,26 @@ export namespace EmrCreateCluster {
     /**
      * The target capacity of On-Demand units for the instance fleet, which determines how many On-Demand instances to provision.
      *
+     * If not specified or set to 0, only Spot Instances are provisioned for the instance fleet using `targetSpotCapacity`.
+     *
+     * At least one of `targetSpotCapacity` and `targetOnDemandCapacity` should be greater than 0.
+     * For a master instance fleet, only one of `targetSpotCapacity` and `targetOnDemandCapacity` can be specified, and its value
+     * must be 1.
+     *
      * @default No targetOnDemandCapacity
      */
     readonly targetOnDemandCapacity?: number;
 
     /**
      * The target capacity of Spot units for the instance fleet, which determines how many Spot instances to provision
      *
-     * @default No targetSpotCapacity
+     * If not specified or set to 0, only On-Demand Instances are provisioned for the instance fleet using `targetOnDemandCapacity`.
+     *
+     * At least one of `targetSpotCapacity` and `targetOnDemandCapacity` should be greater than 0.
+     * For a master instance fleet, only one of `targetSpotCapacity` and `targetOnDemandCapacity` can be specified, and its value
+     * must be 1.
+     *
+    * @default No targetSpotCapacity
      */
     readonly targetSpotCapacity?: number;
   }

packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/private/cluster-utils.ts

@@ -105,6 +105,10 @@ export function EbsConfigurationPropertyToJson(property: EmrCreateCluster.EbsCon
  * @param property
  */
 export function InstanceTypeConfigPropertyToJson(property: EmrCreateCluster.InstanceTypeConfigProperty) {
+  if (property.bidPrice && property.bidPriceAsPercentageOfOnDemandPrice) {
+    throw new Error('Cannot specify both bidPrice and bidPriceAsPercentageOfOnDemandPrice');
+  }
+
   return {
     BidPrice: cdk.stringToCloudFormation(property.bidPrice),
     BidPriceAsPercentageOfOnDemandPrice: cdk.numberToCloudFormation(property.bidPriceAsPercentageOfOnDemandPrice),
@@ -146,6 +150,9 @@ function SpotProvisioningSpecificationPropertyToJson(property?: EmrCreateCluster
   if (!property) {
     return undefined;
   }
+  if (!cdk.Token.isUnresolved(property.timeoutDurationMinutes) && (property.timeoutDurationMinutes < 5 || property.timeoutDurationMinutes > 1440)) {
+    throw new Error(`timeoutDurationMinutes must be between 5 and 1440, got ${property.timeoutDurationMinutes}`);
+  }
   return {
     AllocationStrategy: cdk.stringToCloudFormation(property.allocationStrategy),
     BlockDurationMinutes: cdk.numberToCloudFormation(property.blockDurationMinutes),
@@ -160,6 +167,20 @@ function SpotProvisioningSpecificationPropertyToJson(property?: EmrCreateCluster
  * @param property
  */
 export function InstanceFleetConfigPropertyToJson(property: EmrCreateCluster.InstanceFleetConfigProperty) {
+  if (!property.targetSpotCapacity && !property.targetOnDemandCapacity) {
+    throw new Error('At least one of targetSpotCapacity and targetOnDemandCapacity should be greater than 0');
+  }
+  if (property.instanceFleetType === EmrCreateCluster.InstanceRoleType.MASTER) {
+    if (property.targetSpotCapacity && property.targetOnDemandCapacity) {
+      throw new Error('For a master instance fleet, only one of targetSpotCapacity and targetOnDemandCapacity can be specified');
+    }
+    if (property.targetSpotCapacity && property.targetSpotCapacity !== 1) {
+      throw new Error(`For a master instance fleet, targetSpotCapacity cannot be a number other than 1, got ${property.targetSpotCapacity}`);
+    }
+    if (property.targetOnDemandCapacity && property.targetOnDemandCapacity !== 1) {
+      throw new Error(`For a master instance fleet, targetOnDemandCapacity cannot be a number other than 1, got ${property.targetOnDemandCapacity}`);
+    }
+  }
   return {
     InstanceFleetType: cdk.stringToCloudFormation(property.instanceFleetType?.valueOf()),
     InstanceTypeConfigs: cdk.listMapper(InstanceTypeConfigPropertyToJson)(property.instanceTypeConfigs),