feat(stepfunctions-tasks): adding on demand option + allocation s…

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

@@ -563,13 +563,48 @@ export namespace EmrCreateCluster {
   }
 
   /**
-   * The launch specification for Spot instances in the instance fleet, which determines the defined duration and provisioning timeout behavior.
+   * Different allocation strategies that can be used by the EMR cluster
+   */
+  export class AllocationStrategy {
+    /** lowest-price allocation strategy. */
+    public static readonly LOWEST_PRICE = new AllocationStrategy('lowest-price');
+    /** capacity-optimized allocation strategy */
+    public static readonly CAPACITY_OPTIMIZED = new AllocationStrategy('capacity-optimized');
+
+    /**
+     * Create a new AllocationStrategy with an arbitrary allocation strategy.
+     *
+     * @param customAllocationStrategy the allocation strategy string,
+     *   for example "lowest-price"
+     */
+    public static of(customAllocationStrategy: string): AllocationStrategy {
+      return new AllocationStrategy(customAllocationStrategy);
+    }
+
+    /** The name of the allocation strategy to be used in EMR task parameters */
+    public readonly name: string;
+
+    private constructor(name: string) {
+      this.name = name;
+    }
+  }
+
+  /**
+   * The launch specification for Spot Instances in the fleet, which determines the defined duration, provisioning timeout behavior, and allocation strategy.
    *
    * @see https://docs.aws.amazon.com/emr/latest/APIReference/API_SpotProvisioningSpecification.html
    *
    * @experimental
    */
   export interface SpotProvisioningSpecificationProperty {
+
+    /**
+     * Specifies the strategy to use in launching Spot Instance fleets.
+     *
+     * @default AllocationStrategy.CAPACITY_OPTIMIZED
+     */
+    readonly allocationStrategy?: AllocationStrategy;
+
     /**
      * The defined duration for Spot instances (also known as Spot blocks) in minutes.
      *
@@ -589,19 +624,46 @@ export namespace EmrCreateCluster {
   }
 
   /**
-   * The launch specification for Spot instances in the fleet, which determines the defined duration and provisioning timeout behavior.
+   * The launch specification for On-demand instances in the instance fleet, which determines the allocation strategy.
+   *
+   * @see https://docs.aws.amazon.com/emr/latest/APIReference/API_OnDemandProvisioningSpecification.html
+   *
+   * @experimental
+   */
+  export interface OnDemandProvisioningSpecificationProperty {
+
+    /**
+     * Specifies the strategy to use in launching On-Demand Instance fleets.
+     *
+     * @default AllocationStrategy.LOWEST_PRICE
+     */
+    readonly allocationStrategy?: AllocationStrategy;
+  }
+
+  /**
+   * The launch specification for Spot Instances in the fleet, which determines the defined duration, provisioning timeout behavior, and allocation strategy.
    *
    * @see https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceFleetProvisioningSpecifications.html
    *
    * @experimental
    */
   export interface InstanceFleetProvisioningSpecificationsProperty {
     /**
-     * The launch specification for Spot instances in the fleet, which determines the defined duration and provisioning timeout behavior.
+     * The launch specification for Spot Instances in the fleet, which determines the defined duration, provisioning timeout behavior, and allocation strategy.
+     *
+     * @default - None
      */
-    readonly spotSpecification: SpotProvisioningSpecificationProperty;
+    readonly spotSpecification?: SpotProvisioningSpecificationProperty;
+
+    /**
+     * The launch specification for On-Demand Instances in the instance fleet, which determines the allocation strategy.
+     *
+     * @default - None
+     */
+    readonly onDemandSpecification?: OnDemandProvisioningSpecificationProperty;
   }
 
+
   /**
    * The configuration that defines an instance fleet.
    *

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

@@ -115,18 +115,46 @@ export function InstanceTypeConfigPropertyToJson(property: EmrCreateCluster.Inst
   };
 }
 
+/**
+ * Render the SpotProvisioningSpecificationProperty to JSON
+ *
+ * @param property
+ */
+export function SpotProvisioningSpecificationPropertyToJson(property: EmrCreateCluster.SpotProvisioningSpecificationProperty) {
+  return {
+    AllocationStrategy: cdk.stringToCloudFormation(property.allocationStrategy?.name),
+    BlockDurationMinutes: cdk.numberToCloudFormation(property.blockDurationMinutes),
+    TimeoutAction: cdk.stringToCloudFormation(property.timeoutAction?.valueOf()),
+    TimeoutDurationMinutes: cdk.numberToCloudFormation(property.timeoutDurationMinutes),
+  };
+}
+
+/**
+ * Render the SpotProvisioningSpecificationProperty to JSON
+ *
+ * @param property
+ */
+export function OnDemandProvisioningSpecificationPropertyToJson(property: EmrCreateCluster.OnDemandProvisioningSpecificationProperty) {
+  return {
+    AllocationStrategy: cdk.stringToCloudFormation(property.allocationStrategy?.name),
+  };
+}
+
 /**
  * Render the InstanceFleetProvisioningSpecificationsProperty to JSON
  *
  * @param property
  */
 export function InstanceFleetProvisioningSpecificationsPropertyToJson(property: EmrCreateCluster.InstanceFleetProvisioningSpecificationsProperty) {
   return {
-    SpotSpecification: {
-      BlockDurationMinutes: cdk.numberToCloudFormation(property.spotSpecification.blockDurationMinutes),
-      TimeoutAction: cdk.stringToCloudFormation(property.spotSpecification.timeoutAction?.valueOf()),
-      TimeoutDurationMinutes: cdk.numberToCloudFormation(property.spotSpecification.timeoutDurationMinutes),
-    },
+    SpotSpecification:
+      property.spotSpecification === undefined
+        ? property.spotSpecification
+        : SpotProvisioningSpecificationPropertyToJson(property.spotSpecification),
+    OnDemandSpecification:
+      property.onDemandSpecification === undefined
+        ? property.onDemandSpecification
+        : OnDemandProvisioningSpecificationPropertyToJson(property.onDemandSpecification),
   };
 }
 

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

@@ -756,6 +756,117 @@ test('Create Cluster with InstanceFleet', () => {
   });
 });
 
+test('Create Cluster with InstanceFleet OnDemand AllocationStrategy', () => {
+  // WHEN
+  const task = new EmrCreateCluster(stack, 'Task', {
+    instances: {
+      instanceFleets: [{
+        instanceFleetType: EmrCreateCluster.InstanceRoleType.MASTER,
+        instanceTypeConfigs: [{
+          bidPrice: '1',
+          bidPriceAsPercentageOfOnDemandPrice: 1,
+          configurations: [{
+            classification: 'Classification',
+            properties: {
+              Key: 'Value',
+            },
+          }],
+          ebsConfiguration: {
+            ebsBlockDeviceConfigs: [{
+              volumeSpecification: {
+                iops: 1,
+                volumeSize: cdk.Size.gibibytes(1),
+                volumeType: EmrCreateCluster.EbsBlockDeviceVolumeType.STANDARD,
+              },
+              volumesPerInstance: 1,
+            }],
+            ebsOptimized: true,
+          },
+          instanceType: 'm5.xlarge',
+          weightedCapacity: 1,
+        }],
+        launchSpecifications: {
+          onDemandSpecification: {
+            allocationStrategy: EmrCreateCluster.AllocationStrategy.LOWEST_PRICE,
+          },
+        },
+        name: 'Master',
+        targetOnDemandCapacity: 1,
+        targetSpotCapacity: 1,
+      }],
+    },
+    clusterRole,
+    name: 'Cluster',
+    serviceRole,
+    integrationPattern: sfn.IntegrationPattern.REQUEST_RESPONSE,
+  });
+
+  // THEN
+  expect(stack.resolve(task.toStateJson())).toEqual({
+    Type: 'Task',
+    Resource: {
+      'Fn::Join': [
+        '',
+        [
+          'arn:',
+          {
+            Ref: 'AWS::Partition',
+          },
+          ':states:::elasticmapreduce:createCluster',
+        ],
+      ],
+    },
+    End: true,
+    Parameters: {
+      Name: 'Cluster',
+      Instances: {
+        KeepJobFlowAliveWhenNoSteps: true,
+        InstanceFleets: [{
+          InstanceFleetType: 'MASTER',
+          InstanceTypeConfigs: [{
+            BidPrice: '1',
+            BidPriceAsPercentageOfOnDemandPrice: 1,
+            Configurations: [{
+              Classification: 'Classification',
+              Properties: {
+                Key: 'Value',
+              },
+            }],
+            EbsConfiguration: {
+              EbsBlockDeviceConfigs: [{
+                VolumeSpecification: {
+                  Iops: 1,
+                  SizeInGB: 1,
+                  VolumeType: 'standard',
+                },
+                VolumesPerInstance: 1,
+              }],
+              EbsOptimized: true,
+            },
+            InstanceType: 'm5.xlarge',
+            WeightedCapacity: 1,
+          }],
+          LaunchSpecifications: {
+            OnDemandSpecification: {
+              AllocationStrategy: 'lowest-price',
+            },
+          },
+          Name: 'Master',
+          TargetOnDemandCapacity: 1,
+          TargetSpotCapacity: 1,
+        }],
+      },
+      VisibleToAllUsers: true,
+      JobFlowRole: {
+        Ref: 'ClusterRoleD9CA7471',
+      },
+      ServiceRole: {
+        Ref: 'ServiceRole4288B192',
+      },
+    },
+  });
+});
+
 test('Create Cluster with InstanceGroup', () => {
   // WHEN
   const task = new EmrCreateCluster(stack, 'Task', {