diff --git a/.changes/2.27.0.json b/.changes/2.27.0.json new file mode 100644 index 0000000000..496d272664 --- /dev/null +++ b/.changes/2.27.0.json @@ -0,0 +1,17 @@ +[ + { + "type": "bugfix", + "category": "TemporaryCredentials", + "description": "Ensure master credentials are not expired before using them to refresh temporary credentials" + }, + { + "type": "feature", + "category": "CodeDeploy", + "description": "Add paginators for Codedeploy" + }, + { + "type": "feature", + "category": "EMR", + "description": "This release includes support for instance fleets in Amazon EMR" + } +] \ No newline at end of file diff --git a/.changes/next-release/bugfix-TemporaryCredentials-685384e2.json b/.changes/next-release/bugfix-TemporaryCredentials-685384e2.json deleted file mode 100644 index c281780f46..0000000000 --- a/.changes/next-release/bugfix-TemporaryCredentials-685384e2.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "bugfix", - "category": "TemporaryCredentials", - "description": "Ensure master credentials are not expired before using them to refresh temporary credentials" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bb4769afe8..74239ac4e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Changelog for AWS SDK for JavaScript - + +## 2.27.0 +* bugfix: TemporaryCredentials: Ensure master credentials are not expired before using them to refresh temporary credentials +* feature: CodeDeploy: Add paginators for Codedeploy +* feature: EMR: This release includes support for instance fleets in Amazon EMR + ## 2.26.0 * feature: APIGateway: API Gateway has added support for ACM certificates on custom domain names. Both Amazon-issued certificates and uploaded third-part certificates are supported. * feature: CloudDirectory: Introduces a new Cloud Directory API that enables you to retrieve all available parent paths for any type of object (a node, leaf node, policy node, and index node) in a hierarchy. diff --git a/README.md b/README.md index e0ad37afb5..8f7ca1dd33 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ to work with the new major version. To use the SDK in the browser, simply add the following script tag to your HTML pages: - + You can also build a custom browser SDK with your specified set of AWS services. This can allow you to reduce the SDK's size, specify different API versions of diff --git a/apis/codedeploy-2014-10-06.paginators.json b/apis/codedeploy-2014-10-06.paginators.json index 5677bd8e4a..aa398f003b 100644 --- a/apis/codedeploy-2014-10-06.paginators.json +++ b/apis/codedeploy-2014-10-06.paginators.json @@ -1,4 +1,34 @@ { "pagination": { + "ListApplicationRevisions": { + "input_token": "nextToken", + "output_token": "nextToken", + "result_key": "revisions" + }, + "ListApplications": { + "input_token": "nextToken", + "output_token": "nextToken", + "result_key": "applications" + }, + "ListDeploymentConfigs": { + "input_token": "nextToken", + "output_token": "nextToken", + "result_key": "deploymentConfigsList" + }, + "ListDeploymentGroups": { + "input_token": "nextToken", + "output_token": "nextToken", + "result_key": "deploymentGroups" + }, + "ListDeploymentInstances": { + "input_token": "nextToken", + "output_token": "nextToken", + "result_key": "instancesList" + }, + "ListDeployments": { + "input_token": "nextToken", + "output_token": "nextToken", + "result_key": "deployments" + } } -} +} \ No newline at end of file diff --git a/apis/elasticmapreduce-2009-03-31.min.json b/apis/elasticmapreduce-2009-03-31.min.json index 5ff73b0a6c..04fa7c4615 100644 --- a/apis/elasticmapreduce-2009-03-31.min.json +++ b/apis/elasticmapreduce-2009-03-31.min.json @@ -1,7 +1,6 @@ { "version": "2.0", "metadata": { - "uid": "elasticmapreduce-2009-03-31", "apiVersion": "2009-03-31", "endpointPrefix": "elasticmapreduce", "jsonVersion": "1.1", @@ -10,9 +9,32 @@ "serviceFullName": "Amazon Elastic MapReduce", "signatureVersion": "v4", "targetPrefix": "ElasticMapReduce", - "timestampFormat": "unixTimestamp" + "timestampFormat": "unixTimestamp", + "uid": "elasticmapreduce-2009-03-31" }, "operations": { + "AddInstanceFleet": { + "input": { + "type": "structure", + "required": [ + "ClusterId", + "InstanceFleet" + ], + "members": { + "ClusterId": {}, + "InstanceFleet": { + "shape": "S3" + } + } + }, + "output": { + "type": "structure", + "members": { + "ClusterId": {}, + "InstanceFleetId": {} + } + } + }, "AddInstanceGroups": { "input": { "type": "structure", @@ -22,7 +44,7 @@ ], "members": { "InstanceGroups": { - "shape": "S2" + "shape": "Sq" }, "JobFlowId": {} } @@ -48,7 +70,7 @@ "members": { "JobFlowId": {}, "Steps": { - "shape": "S10" + "shape": "S1b" } } }, @@ -56,7 +78,7 @@ "type": "structure", "members": { "StepIds": { - "shape": "S19" + "shape": "S1k" } } } @@ -71,7 +93,7 @@ "members": { "ResourceId": {}, "Tags": { - "shape": "S1c" + "shape": "S1n" } } }, @@ -86,7 +108,7 @@ "members": { "ClusterId": {}, "StepIds": { - "shape": "S19" + "shape": "S1k" } } }, @@ -167,26 +189,33 @@ "Id": {}, "Name": {}, "Status": { - "shape": "S1u" + "shape": "S25" }, "Ec2InstanceAttributes": { "type": "structure", "members": { "Ec2KeyName": {}, "Ec2SubnetId": {}, + "RequestedEc2SubnetIds": { + "shape": "S2b" + }, "Ec2AvailabilityZone": {}, + "RequestedEc2AvailabilityZones": { + "shape": "S2b" + }, "IamInstanceProfile": {}, "EmrManagedMasterSecurityGroup": {}, "EmrManagedSlaveSecurityGroup": {}, "ServiceAccessSecurityGroup": {}, "AdditionalMasterSecurityGroups": { - "shape": "S20" + "shape": "S2c" }, "AdditionalSlaveSecurityGroups": { - "shape": "S20" + "shape": "S2c" } } }, + "InstanceCollectionType": {}, "LogUri": {}, "RequestedAmiVersion": {}, "RunningAmiVersion": {}, @@ -201,10 +230,10 @@ "type": "boolean" }, "Applications": { - "shape": "S22" + "shape": "S2f" }, "Tags": { - "shape": "S1c" + "shape": "S1n" }, "ServiceRole": {}, "NormalizedInstanceHours": { @@ -212,7 +241,7 @@ }, "MasterPublicDnsName": {}, "Configurations": { - "shape": "S9" + "shape": "Sh" }, "SecurityConfiguration": {}, "AutoScalingRole": {}, @@ -233,7 +262,7 @@ "type": "timestamp" }, "JobFlowIds": { - "shape": "S17" + "shape": "S1i" }, "JobFlowStates": { "type": "list", @@ -346,7 +375,7 @@ "Ec2KeyName": {}, "Ec2SubnetId": {}, "Placement": { - "shape": "S2g" + "shape": "S2t" }, "KeepJobFlowAliveWhenNoSteps": { "type": "boolean" @@ -367,7 +396,7 @@ ], "members": { "StepConfig": { - "shape": "S11" + "shape": "S1c" }, "ExecutionStatusDetail": { "type": "structure", @@ -398,13 +427,13 @@ "type": "structure", "members": { "BootstrapActionConfig": { - "shape": "S2n" + "shape": "S30" } } } }, "SupportedProducts": { - "shape": "S2p" + "shape": "S32" }, "VisibleToAllUsers": { "type": "boolean" @@ -462,11 +491,11 @@ "Id": {}, "Name": {}, "Config": { - "shape": "S2v" + "shape": "S38" }, "ActionOnFailure": {}, "Status": { - "shape": "S2w" + "shape": "S39" } } } @@ -495,7 +524,7 @@ "Name": {}, "ScriptPath": {}, "Args": { - "shape": "S20" + "shape": "S2c" } } } @@ -532,7 +561,7 @@ "Id": {}, "Name": {}, "Status": { - "shape": "S1u" + "shape": "S25" }, "NormalizedInstanceHours": { "type": "integer" @@ -544,6 +573,102 @@ } } }, + "ListInstanceFleets": { + "input": { + "type": "structure", + "required": [ + "ClusterId" + ], + "members": { + "ClusterId": {}, + "Marker": {} + } + }, + "output": { + "type": "structure", + "members": { + "InstanceFleets": { + "type": "list", + "member": { + "type": "structure", + "members": { + "Id": {}, + "Name": {}, + "Status": { + "type": "structure", + "members": { + "State": {}, + "StateChangeReason": { + "type": "structure", + "members": { + "Code": {}, + "Message": {} + } + }, + "Timeline": { + "type": "structure", + "members": { + "CreationDateTime": { + "type": "timestamp" + }, + "ReadyDateTime": { + "type": "timestamp" + }, + "EndDateTime": { + "type": "timestamp" + } + } + } + } + }, + "InstanceFleetType": {}, + "TargetOnDemandCapacity": { + "type": "integer" + }, + "TargetSpotCapacity": { + "type": "integer" + }, + "ProvisionedOnDemandCapacity": { + "type": "integer" + }, + "ProvisionedSpotCapacity": { + "type": "integer" + }, + "InstanceTypeSpecifications": { + "type": "list", + "member": { + "type": "structure", + "members": { + "InstanceType": {}, + "WeightedCapacity": { + "type": "integer" + }, + "BidPrice": {}, + "BidPriceAsPercentageOfOnDemandPrice": { + "type": "double" + }, + "Configurations": { + "shape": "Sh" + }, + "EbsBlockDevices": { + "shape": "S40" + }, + "EbsOptimized": { + "type": "boolean" + } + } + } + }, + "LaunchSpecifications": { + "shape": "Sk" + } + } + } + }, + "Marker": {} + } + } + }, "ListInstanceGroups": { "input": { "type": "structure", @@ -603,28 +728,19 @@ } }, "Configurations": { - "shape": "S9" + "shape": "Sh" }, "EbsBlockDevices": { - "type": "list", - "member": { - "type": "structure", - "members": { - "VolumeSpecification": { - "shape": "Sg" - }, - "Device": {} - } - } + "shape": "S40" }, "EbsOptimized": { "type": "boolean" }, "ShrinkPolicy": { - "shape": "S3o" + "shape": "S4c" }, "AutoScalingPolicy": { - "shape": "S3s" + "shape": "S4g" } } } @@ -646,6 +762,8 @@ "type": "list", "member": {} }, + "InstanceFleetId": {}, + "InstanceFleetType": {}, "InstanceStates": { "type": "list", "member": {} @@ -695,6 +813,9 @@ } }, "InstanceGroupId": {}, + "InstanceFleetId": {}, + "Market": {}, + "InstanceType": {}, "EbsVolumes": { "type": "list", "member": { @@ -751,7 +872,7 @@ "member": {} }, "StepIds": { - "shape": "S17" + "shape": "S1i" }, "Marker": {} } @@ -767,11 +888,11 @@ "Id": {}, "Name": {}, "Config": { - "shape": "S2v" + "shape": "S38" }, "ActionOnFailure": {}, "Status": { - "shape": "S2w" + "shape": "S39" } } } @@ -780,6 +901,33 @@ } } }, + "ModifyInstanceFleet": { + "input": { + "type": "structure", + "required": [ + "ClusterId", + "InstanceFleet" + ], + "members": { + "ClusterId": {}, + "InstanceFleet": { + "type": "structure", + "required": [ + "InstanceFleetId" + ], + "members": { + "InstanceFleetId": {}, + "TargetOnDemandCapacity": { + "type": "integer" + }, + "TargetSpotCapacity": { + "type": "integer" + } + } + } + } + } + }, "ModifyInstanceGroups": { "input": { "type": "structure", @@ -802,7 +950,7 @@ "member": {} }, "ShrinkPolicy": { - "shape": "S3o" + "shape": "S4c" } } } @@ -822,7 +970,7 @@ "ClusterId": {}, "InstanceGroupId": {}, "AutoScalingPolicy": { - "shape": "Si" + "shape": "Su" } } }, @@ -832,7 +980,7 @@ "ClusterId": {}, "InstanceGroupId": {}, "AutoScalingPolicy": { - "shape": "S3s" + "shape": "S4g" } } } @@ -864,7 +1012,7 @@ "members": { "ResourceId": {}, "TagKeys": { - "shape": "S20" + "shape": "S2c" } } }, @@ -895,11 +1043,17 @@ "type": "integer" }, "InstanceGroups": { - "shape": "S2" + "shape": "Sq" + }, + "InstanceFleets": { + "type": "list", + "member": { + "shape": "S3" + } }, "Ec2KeyName": {}, "Placement": { - "shape": "S2g" + "shape": "S2t" }, "KeepJobFlowAliveWhenNoSteps": { "type": "boolean" @@ -909,28 +1063,31 @@ }, "HadoopVersion": {}, "Ec2SubnetId": {}, + "Ec2SubnetIds": { + "shape": "S2b" + }, "EmrManagedMasterSecurityGroup": {}, "EmrManagedSlaveSecurityGroup": {}, "ServiceAccessSecurityGroup": {}, "AdditionalMasterSecurityGroups": { - "shape": "S4v" + "shape": "S5m" }, "AdditionalSlaveSecurityGroups": { - "shape": "S4v" + "shape": "S5m" } } }, "Steps": { - "shape": "S10" + "shape": "S1b" }, "BootstrapActions": { "type": "list", "member": { - "shape": "S2n" + "shape": "S30" } }, "SupportedProducts": { - "shape": "S2p" + "shape": "S32" }, "NewSupportedProducts": { "type": "list", @@ -939,16 +1096,16 @@ "members": { "Name": {}, "Args": { - "shape": "S17" + "shape": "S1i" } } } }, "Applications": { - "shape": "S22" + "shape": "S2f" }, "Configurations": { - "shape": "S9" + "shape": "Sh" }, "VisibleToAllUsers": { "type": "boolean" @@ -956,7 +1113,7 @@ "JobFlowRole": {}, "ServiceRole": {}, "Tags": { - "shape": "S1c" + "shape": "S1n" }, "SecurityConfiguration": {}, "AutoScalingRole": {}, @@ -979,7 +1136,7 @@ ], "members": { "JobFlowIds": { - "shape": "S17" + "shape": "S1i" }, "TerminationProtected": { "type": "boolean" @@ -996,7 +1153,7 @@ ], "members": { "JobFlowIds": { - "shape": "S17" + "shape": "S1i" }, "VisibleToAllUsers": { "type": "boolean" @@ -1012,102 +1169,173 @@ ], "members": { "JobFlowIds": { - "shape": "S17" + "shape": "S1i" } } } } }, "shapes": { - "S2": { - "type": "list", - "member": { - "type": "structure", - "required": [ - "InstanceRole", - "InstanceType", - "InstanceCount" - ], - "members": { - "Name": {}, - "Market": {}, - "InstanceRole": {}, - "BidPrice": {}, - "InstanceType": {}, - "InstanceCount": { - "type": "integer" - }, - "Configurations": { - "shape": "S9" - }, - "EbsConfiguration": { + "S3": { + "type": "structure", + "required": [ + "InstanceFleetType" + ], + "members": { + "Name": {}, + "InstanceFleetType": {}, + "TargetOnDemandCapacity": { + "type": "integer" + }, + "TargetSpotCapacity": { + "type": "integer" + }, + "InstanceTypeConfigs": { + "type": "list", + "member": { "type": "structure", + "required": [ + "InstanceType" + ], "members": { - "EbsBlockDeviceConfigs": { - "type": "list", - "member": { - "type": "structure", - "required": [ - "VolumeSpecification" - ], - "members": { - "VolumeSpecification": { - "shape": "Sg" - }, - "VolumesPerInstance": { - "type": "integer" - } - } - } + "InstanceType": {}, + "WeightedCapacity": { + "type": "integer" }, - "EbsOptimized": { - "type": "boolean" + "BidPrice": {}, + "BidPriceAsPercentageOfOnDemandPrice": { + "type": "double" + }, + "EbsConfiguration": { + "shape": "Sa" + }, + "Configurations": { + "shape": "Sh" + } + } + } + }, + "LaunchSpecifications": { + "shape": "Sk" + } + } + }, + "Sa": { + "type": "structure", + "members": { + "EbsBlockDeviceConfigs": { + "type": "list", + "member": { + "type": "structure", + "required": [ + "VolumeSpecification" + ], + "members": { + "VolumeSpecification": { + "shape": "Sd" + }, + "VolumesPerInstance": { + "type": "integer" } } - }, - "AutoScalingPolicy": { - "shape": "Si" } + }, + "EbsOptimized": { + "type": "boolean" + } + } + }, + "Sd": { + "type": "structure", + "required": [ + "VolumeType", + "SizeInGB" + ], + "members": { + "VolumeType": {}, + "Iops": { + "type": "integer" + }, + "SizeInGB": { + "type": "integer" } } }, - "S9": { + "Sh": { "type": "list", "member": { "type": "structure", "members": { "Classification": {}, "Configurations": { - "shape": "S9" + "shape": "Sh" }, "Properties": { - "shape": "Sc" + "shape": "Sj" } } } }, - "Sc": { + "Sj": { "type": "map", "key": {}, "value": {} }, - "Sg": { + "Sk": { "type": "structure", "required": [ - "VolumeType", - "SizeInGB" + "SpotSpecification" ], "members": { - "VolumeType": {}, - "Iops": { - "type": "integer" - }, - "SizeInGB": { - "type": "integer" + "SpotSpecification": { + "type": "structure", + "required": [ + "TimeoutDurationMinutes", + "TimeoutAction" + ], + "members": { + "TimeoutDurationMinutes": { + "type": "integer" + }, + "TimeoutAction": {}, + "BlockDurationMinutes": { + "type": "integer" + } + } } } }, - "Si": { + "Sq": { + "type": "list", + "member": { + "type": "structure", + "required": [ + "InstanceRole", + "InstanceType", + "InstanceCount" + ], + "members": { + "Name": {}, + "Market": {}, + "InstanceRole": {}, + "BidPrice": {}, + "InstanceType": {}, + "InstanceCount": { + "type": "integer" + }, + "Configurations": { + "shape": "Sh" + }, + "EbsConfiguration": { + "shape": "Sa" + }, + "AutoScalingPolicy": { + "shape": "Su" + } + } + } + }, + "Su": { "type": "structure", "required": [ "Constraints", @@ -1115,14 +1343,14 @@ ], "members": { "Constraints": { - "shape": "Sj" + "shape": "Sv" }, "Rules": { - "shape": "Sk" + "shape": "Sw" } } }, - "Sj": { + "Sv": { "type": "structure", "required": [ "MinCapacity", @@ -1137,7 +1365,7 @@ } } }, - "Sk": { + "Sw": { "type": "list", "member": { "type": "structure", @@ -1219,13 +1447,13 @@ } } }, - "S10": { + "S1b": { "type": "list", "member": { - "shape": "S11" + "shape": "S1c" } }, - "S11": { + "S1c": { "type": "structure", "required": [ "Name", @@ -1253,21 +1481,21 @@ "Jar": {}, "MainClass": {}, "Args": { - "shape": "S17" + "shape": "S1i" } } } } }, - "S17": { + "S1i": { "type": "list", "member": {} }, - "S19": { + "S1k": { "type": "list", "member": {} }, - "S1c": { + "S1n": { "type": "list", "member": { "type": "structure", @@ -1277,7 +1505,7 @@ } } }, - "S1u": { + "S25": { "type": "structure", "members": { "State": {}, @@ -1304,11 +1532,15 @@ } } }, - "S20": { + "S2b": { "type": "list", "member": {} }, - "S22": { + "S2c": { + "type": "list", + "member": {} + }, + "S2f": { "type": "list", "member": { "type": "structure", @@ -1316,24 +1548,24 @@ "Name": {}, "Version": {}, "Args": { - "shape": "S20" + "shape": "S2c" }, "AdditionalInfo": { - "shape": "Sc" + "shape": "Sj" } } } }, - "S2g": { + "S2t": { "type": "structure", - "required": [ - "AvailabilityZone" - ], "members": { - "AvailabilityZone": {} + "AvailabilityZone": {}, + "AvailabilityZones": { + "shape": "S2b" + } } }, - "S2n": { + "S30": { "type": "structure", "required": [ "Name", @@ -1349,30 +1581,30 @@ "members": { "Path": {}, "Args": { - "shape": "S17" + "shape": "S1i" } } } } }, - "S2p": { + "S32": { "type": "list", "member": {} }, - "S2v": { + "S38": { "type": "structure", "members": { "Jar": {}, "Properties": { - "shape": "Sc" + "shape": "Sj" }, "MainClass": {}, "Args": { - "shape": "S20" + "shape": "S2c" } } }, - "S2w": { + "S39": { "type": "structure", "members": { "State": {}, @@ -1407,7 +1639,19 @@ } } }, - "S3o": { + "S40": { + "type": "list", + "member": { + "type": "structure", + "members": { + "VolumeSpecification": { + "shape": "Sd" + }, + "Device": {} + } + } + }, + "S4c": { "type": "structure", "members": { "DecommissionTimeout": { @@ -1417,10 +1661,10 @@ "type": "structure", "members": { "InstancesToTerminate": { - "shape": "S3q" + "shape": "S4e" }, "InstancesToProtect": { - "shape": "S3q" + "shape": "S4e" }, "InstanceTerminationTimeout": { "type": "integer" @@ -1429,11 +1673,11 @@ } } }, - "S3q": { + "S4e": { "type": "list", "member": {} }, - "S3s": { + "S4g": { "type": "structure", "members": { "Status": { @@ -1450,14 +1694,14 @@ } }, "Constraints": { - "shape": "Sj" + "shape": "Sv" }, "Rules": { - "shape": "Sk" + "shape": "Sw" } } }, - "S4v": { + "S5m": { "type": "list", "member": {} } diff --git a/apis/elasticmapreduce-2009-03-31.normal.json b/apis/elasticmapreduce-2009-03-31.normal.json index 0fbb65b4dc..9fce8e7544 100644 --- a/apis/elasticmapreduce-2009-03-31.normal.json +++ b/apis/elasticmapreduce-2009-03-31.normal.json @@ -1,7 +1,6 @@ { "version":"2.0", "metadata":{ - "uid":"elasticmapreduce-2009-03-31", "apiVersion":"2009-03-31", "endpointPrefix":"elasticmapreduce", "jsonVersion":"1.1", @@ -10,9 +9,24 @@ "serviceFullName":"Amazon Elastic MapReduce", "signatureVersion":"v4", "targetPrefix":"ElasticMapReduce", - "timestampFormat":"unixTimestamp" + "timestampFormat":"unixTimestamp", + "uid":"elasticmapreduce-2009-03-31" }, "operations":{ + "AddInstanceFleet":{ + "name":"AddInstanceFleet", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"AddInstanceFleetInput"}, + "output":{"shape":"AddInstanceFleetOutput"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"
Adds an instance fleet to a running cluster.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x.
AddJobFlowSteps adds new steps to a running job flow. A maximum of 256 steps are allowed in each job flow.
If your job flow is long-running (such as a Hive data warehouse) or complex, you may require more than 256 steps to process your data. You can bypass the 256-step limitation in various ways, including using the SSH shell to connect to the master node and submitting queries directly to the software running on the master node, such as Hive and Hadoop. For more information on how to do this, see Add More than 256 Steps to a Job Flow in the Amazon EMR Developer's Guide.
A step specifies the location of a JAR file stored either on the master node of the job flow or in Amazon S3. Each step is performed by the main function of the main class of the JAR file. The main class can be specified either in the manifest of the JAR or by using the MainFunction parameter of the step.
Amazon EMR executes each step in the order listed. For a step to be considered complete, the main function must exit with a zero exit code and all Hadoop jobs started while the step was running must have completed and run successfully.
You can only add steps to a job flow that is in one of the following states: STARTING, BOOTSTRAPPING, RUNNING, or WAITING.
" + "documentation":"AddJobFlowSteps adds new steps to a running cluster. A maximum of 256 steps are allowed in each job flow.
If your cluster is long-running (such as a Hive data warehouse) or complex, you may require more than 256 steps to process your data. You can bypass the 256-step limitation in various ways, including using SSH to connect to the master node and submitting queries directly to the software running on the master node, such as Hive and Hadoop. For more information on how to do this, see Add More than 256 Steps to a Cluster in the Amazon EMR Management Guide.
A step specifies the location of a JAR file stored either on the master node of the cluster or in Amazon S3. Each step is performed by the main function of the main class of the JAR file. The main class can be specified either in the manifest of the JAR or by using the MainFunction parameter of the step.
Amazon EMR executes each step in the order listed. For a step to be considered complete, the main function must exit with a zero exit code and all Hadoop jobs started while the step was running must have completed and run successfully.
You can only add steps to a cluster that is in one of the following states: STARTING, BOOTSTRAPPING, RUNNING, or WAITING.
" }, "AddTags":{ "name":"AddTags", @@ -179,6 +193,20 @@ ], "documentation":"Provides the status of all clusters visible to this AWS account. Allows you to filter the list of clusters based on certain criteria; for example, filtering by cluster creation date and time or by status. This call returns a maximum of 50 clusters per call, but returns a marker to track the paging of the cluster list across multiple ListClusters calls.
" }, + "ListInstanceFleets":{ + "name":"ListInstanceFleets", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListInstanceFleetsInput"}, + "output":{"shape":"ListInstanceFleetsOutput"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"Lists all available details about the instance fleets in a cluster.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
Provides a list of steps for the cluster in reverse order unless you specify stepIds with the request.
" }, + "ModifyInstanceFleet":{ + "name":"ModifyInstanceFleet", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ModifyInstanceFleetInput"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"Modifies the target On-Demand and target Spot capacities for the instance fleet with the specified InstanceFleetID within the cluster specified using ClusterID. The call either succeeds or fails atomically.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
RunJobFlow creates and starts running a new job flow. The job flow will run the steps specified. After the job flow completes, the cluster is stopped and the HDFS partition is lost. To prevent loss of data, configure the last step of the job flow to store results in Amazon S3. If the JobFlowInstancesConfig KeepJobFlowAliveWhenNoSteps
parameter is set to TRUE
, the job flow will transition to the WAITING state rather than shutting down after the steps have completed.
For additional protection, you can set the JobFlowInstancesConfig TerminationProtected
parameter to TRUE
to lock the job flow and prevent it from being terminated by API call, user intervention, or in the event of a job flow error.
A maximum of 256 steps are allowed in each job flow.
If your job flow is long-running (such as a Hive data warehouse) or complex, you may require more than 256 steps to process your data. You can bypass the 256-step limitation in various ways, including using the SSH shell to connect to the master node and submitting queries directly to the software running on the master node, such as Hive and Hadoop. For more information on how to do this, see Add More than 256 Steps to a Job Flow in the Amazon EMR Management Guide.
For long running job flows, we recommend that you periodically store your results.
" + "documentation":"RunJobFlow creates and starts running a new cluster (job flow). The cluster runs the steps specified. After the steps complete, the cluster stops and the HDFS partition is lost. To prevent loss of data, configure the last step of the job flow to store results in Amazon S3. If the JobFlowInstancesConfig KeepJobFlowAliveWhenNoSteps
parameter is set to TRUE
, the cluster transitions to the WAITING state rather than shutting down after the steps have completed.
For additional protection, you can set the JobFlowInstancesConfig TerminationProtected
parameter to TRUE
to lock the cluster and prevent it from being terminated by API call, user intervention, or in the event of a job flow error.
A maximum of 256 steps are allowed in each job flow.
If your cluster is long-running (such as a Hive data warehouse) or complex, you may require more than 256 steps to process your data. You can bypass the 256-step limitation in various ways, including using the SSH shell to connect to the master node and submitting queries directly to the software running on the master node, such as Hive and Hadoop. For more information on how to do this, see Add More than 256 Steps to a Cluster in the Amazon EMR Management Guide.
For long running clusters, we recommend that you periodically store your results.
The instance fleets configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions. The RunJobFlow request can contain InstanceFleets parameters or InstanceGroups parameters, but not both.
SetTerminationProtection locks a job flow so the EC2 instances in the cluster cannot be terminated by user intervention, an API call, or in the event of a job-flow error. The cluster still terminates upon successful completion of the job flow. Calling SetTerminationProtection on a job flow is analogous to calling the Amazon EC2 DisableAPITermination API on all of the EC2 instances in a cluster.
SetTerminationProtection is used to prevent accidental termination of a job flow and to ensure that in the event of an error, the instances will persist so you can recover any data stored in their ephemeral instance storage.
To terminate a job flow that has been locked by setting SetTerminationProtection to true
, you must first unlock the job flow by a subsequent call to SetTerminationProtection in which you set the value to false
.
For more information, seeProtecting a Job Flow from Termination in the Amazon EMR Guide.
" + "documentation":"SetTerminationProtection locks a cluster (job flow) so the EC2 instances in the cluster cannot be terminated by user intervention, an API call, or in the event of a job-flow error. The cluster still terminates upon successful completion of the job flow. Calling SetTerminationProtection
on a cluster is similar to calling the Amazon EC2 DisableAPITermination
API on all EC2 instances in a cluster.
SetTerminationProtection
is used to prevent accidental termination of a cluster and to ensure that in the event of an error, the instances persist so that you can recover any data stored in their ephemeral instance storage.
To terminate a cluster that has been locked by setting SetTerminationProtection
to true
, you must first unlock the job flow by a subsequent call to SetTerminationProtection
in which you set the value to false
.
For more information, seeManaging Cluster Termination in the Amazon EMR Management Guide.
" }, "SetVisibleToAllUsers":{ "name":"SetVisibleToAllUsers", @@ -316,7 +357,7 @@ "errors":[ {"shape":"InternalServerError"} ], - "documentation":"Sets whether all AWS Identity and Access Management (IAM) users under your account can access the specified job flows. This action works on running job flows. You can also set the visibility of a job flow when you launch it using the VisibleToAllUsers
parameter of RunJobFlow. The SetVisibleToAllUsers action can be called only by an IAM user who created the job flow or the AWS account that owns the job flow.
Sets whether all AWS Identity and Access Management (IAM) users under your account can access the specified clusters (job flows). This action works on running clusters. You can also set the visibility of a cluster when you launch it using the VisibleToAllUsers
parameter of RunJobFlow. The SetVisibleToAllUsers action can be called only by an IAM user who created the cluster or the AWS account that owns the cluster.
TerminateJobFlows shuts a list of job flows down. When a job flow is shut down, any step not yet completed is canceled and the EC2 instances on which the job flow is running are stopped. Any log files not already saved are uploaded to Amazon S3 if a LogUri was specified when the job flow was created.
The maximum number of JobFlows allowed is 10. The call to TerminateJobFlows is asynchronous. Depending on the configuration of the job flow, it may take up to 1-5 minutes for the job flow to completely terminate and release allocated resources, such as Amazon EC2 instances.
" + "documentation":"TerminateJobFlows shuts a list of clusters (job flows) down. When a job flow is shut down, any step not yet completed is canceled and the EC2 instances on which the cluster is running are stopped. Any log files not already saved are uploaded to Amazon S3 if a LogUri was specified when the cluster was created.
The maximum number of clusters allowed is 10. The call to TerminateJobFlows
is asynchronous. Depending on the configuration of the cluster, it may take up to 1-5 minutes for the cluster to completely terminate and release allocated resources, such as Amazon EC2 instances.
The unique identifier of the cluster.
" + }, + "InstanceFleet":{ + "shape":"InstanceFleetConfig", + "documentation":"Specifies the configuration of the instance fleet.
" + } + } + }, + "AddInstanceFleetOutput":{ + "type":"structure", + "members":{ + "ClusterId":{ + "shape":"XmlStringMaxLen256", + "documentation":"The unique identifier of the cluster.
" + }, + "InstanceFleetId":{ + "shape":"InstanceFleetId", + "documentation":"The unique identifier of the instance fleet.
" + } + } + }, "AddInstanceGroupsInput":{ "type":"structure", "required":[ @@ -453,7 +524,7 @@ "documentation":"This option is for advanced users only. This is meta information about third-party applications that third-party vendors use for testing purposes.
" } }, - "documentation":"An application is any Amazon or third-party software that you can add to the cluster. This structure contains a list of strings that indicates the software to use with the cluster and accepts a user argument list. Amazon EMR accepts and forwards the argument list to the corresponding installation script as bootstrap action argument. For more information, see Launch a Job Flow on the MapR Distribution for Hadoop. Currently supported values are:
\"mapr-m3\" - launch the job flow using MapR M3 Edition.
\"mapr-m5\" - launch the job flow using MapR M5 Edition.
\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition, respectively.
In Amazon EMR releases 4.0 and greater, the only accepted parameter is the application name. To pass arguments to applications, you supply a configuration for each application.
An application is any Amazon or third-party software that you can add to the cluster. This structure contains a list of strings that indicates the software to use with the cluster and accepts a user argument list. Amazon EMR accepts and forwards the argument list to the corresponding installation script as bootstrap action argument. For more information, see Using the MapR Distribution for Hadoop. Currently supported values are:
\"mapr-m3\" - launch the cluster using MapR M3 Edition.
\"mapr-m5\" - launch the cluster using MapR M5 Edition.
\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the cluster using MapR M3 or M5 Edition, respectively.
In Amazon EMR releases 4.0 and greater, the only accepted parameter is the application name. To pass arguments to applications, you supply a configuration for each application.
The code indicating the reason for the change in status.USER_REQUEST
indicates that the scaling policy status was changed by a user. PROVISION_FAILURE
indicates that the status change was because the policy failed to provision. CLEANUP_FAILURE
indicates something unclean happened.-->
The code indicating the reason for the change in status.USER_REQUEST
indicates that the scaling policy status was changed by a user. PROVISION_FAILURE
indicates that the status change was because the policy failed to provision. CLEANUP_FAILURE
indicates an error.
Indicates the status of the automatic scaling policy.
" }, "StateChangeReason":{ "shape":"AutoScalingPolicyStateChangeReason", @@ -574,7 +645,7 @@ "documentation":"A description of the bootstrap action.
" } }, - "documentation":"Reports the configuration of a bootstrap action in a job flow.
" + "documentation":"Reports the configuration of a bootstrap action in a cluster (job flow).
" }, "BootstrapActionDetailList":{ "type":"list", @@ -583,10 +654,20 @@ "CancelStepsInfo":{ "type":"structure", "members":{ - "StepId":{"shape":"StepId"}, - "Status":{"shape":"CancelStepsRequestStatus"}, - "Reason":{"shape":"String"} - } + "StepId":{ + "shape":"StepId", + "documentation":"The encrypted StepId of a step.
" + }, + "Status":{ + "shape":"CancelStepsRequestStatus", + "documentation":"The status of a CancelSteps Request. The value may be SUBMITTED or FAILED.
" + }, + "Reason":{ + "shape":"String", + "documentation":"The reason for the failure if the CancelSteps request fails.
" + } + }, + "documentation":"Specification of the status of a CancelSteps request. Available only in Amazon EMR version 4.8.0 and later, excluding version 5.0.0.
" }, "CancelStepsInfoList":{ "type":"list", @@ -690,6 +771,10 @@ "shape":"Ec2InstanceAttributes", "documentation":"Provides information about the EC2 instances in a cluster grouped by category. For example, key name, subnet ID, IAM instance profile, and so on.
" }, + "InstanceCollectionType":{ + "shape":"InstanceCollectionType", + "documentation":"The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The instance group configuration of the cluster. A value of INSTANCE_GROUP
indicates a uniform instance group configuration. A value of INSTANCE_FLEET
indicates an instance fleets configuration.
The path to the Amazon S3 location where logs for this cluster are stored.
" @@ -716,7 +801,7 @@ }, "VisibleToAllUsers":{ "shape":"Boolean", - "documentation":"Indicates whether the job flow is visible to all IAM users of the AWS account associated with the job flow. If this value is set to true
, all IAM users of that AWS account can view and manage the job flow if they have the proper policy permissions set. If this value is false
, only the IAM user that created the cluster can view and manage it. This value can be changed using the SetVisibleToAllUsers action.
Indicates whether the cluster is visible to all IAM users of the AWS account associated with the cluster. If this value is set to true
, all IAM users of that AWS account can view and manage the cluster if they have the proper policy permissions set. If this value is false
, only the IAM user that created the cluster can view and manage it. This value can be changed using the SetVisibleToAllUsers action.
An approximation of the cost of the job flow, represented in m1.small/hours. This value is incremented one time for every hour an m1.small instance runs. Larger instances are weighted more, so an EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.
" + "documentation":"An approximation of the cost of the cluster, represented in m1.small/hours. This value is incremented one time for every hour an m1.small instance runs. Larger instances are weighted more, so an EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.
" }, "MasterPublicDnsName":{ "shape":"String", @@ -835,7 +920,7 @@ }, "NormalizedInstanceHours":{ "shape":"Integer", - "documentation":"An approximation of the cost of the job flow, represented in m1.small/hours. This value is incremented one time for every hour an m1.small instance runs. Larger instances are weighted more, so an EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.
" + "documentation":"An approximation of the cost of the cluster, represented in m1.small/hours. This value is incremented one time for every hour an m1.small instance runs. Larger instances are weighted more, so an EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.
" } }, "documentation":"The summary description of the cluster.
" @@ -898,18 +983,18 @@ "members":{ "Classification":{ "shape":"String", - "documentation":"The classification of a configuration. For more information see, Amazon EMR Configurations.
" + "documentation":"The classification within a configuration.
" }, "Configurations":{ "shape":"ConfigurationList", - "documentation":"A list of configurations you apply to this configuration object.
" + "documentation":"A list of additional configurations to apply within a configuration object.
" }, "Properties":{ "shape":"StringMap", - "documentation":"A set of properties supplied to the Configuration object.
" + "documentation":"A set of properties specified within a configuration classification.
" } }, - "documentation":"Amazon EMR releases 4.x or later.
Specifies a hardware and software configuration of the EMR cluster. This includes configurations for applications and software bundled with Amazon EMR. The Configuration object is a JSON object which is defined by a classification and a set of properties. Configurations can be nested, so a configuration may have its own Configuration objects listed.
" + "documentation":"Amazon EMR releases 4.x or later.
An optional configuration specification to be used when provisioning cluster instances, which can include configurations for applications and software bundled with Amazon EMR. A configuration consists of a classification, properties, and optional nested configurations. A classification refers to an application-specific configuration file. Properties are the settings you want to change in that file. For more information, see Configuring Applications.
" }, "ConfigurationList":{ "type":"list", @@ -1159,15 +1244,23 @@ }, "Ec2SubnetId":{ "shape":"String", - "documentation":"To launch the job flow in Amazon VPC, set this parameter to the identifier of the Amazon VPC subnet where you want the job flow to launch. If you do not specify this value, the job flow is launched in the normal AWS cloud, outside of a VPC.
Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. Thus, you cannot specify the cc1.4xlarge instance type for nodes of a job flow launched in a VPC.
" + "documentation":"To launch the cluster in Amazon VPC, set this parameter to the identifier of the Amazon VPC subnet where you want the cluster to launch. If you do not specify this value, the cluster is launched in the normal AWS cloud, outside of a VPC.
Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. Thus, you cannot specify the cc1.4xlarge instance type for nodes of a cluster launched in a VPC.
" + }, + "RequestedEc2SubnetIds":{ + "shape":"XmlStringMaxLen256List", + "documentation":"Applies to clusters configured with the instance fleets option. Specifies the unique identifier of one or more Amazon EC2 subnets in which to launch EC2 cluster instances. Amazon EMR chooses the EC2 subnet with the best performance and cost characteristics from among the list of RequestedEc2SubnetIds and launches all cluster instances within that subnet. If this value is not specified, and the account supports EC2-Classic networks, the cluster launches instances in the EC2-Classic network and uses Requested
" }, "Ec2AvailabilityZone":{ "shape":"String", - "documentation":"The Availability Zone in which the cluster will run.
" + "documentation":"The Availability Zone in which the cluster will run.
" + }, + "RequestedEc2AvailabilityZones":{ + "shape":"XmlStringMaxLen256List", + "documentation":"Applies to clusters configured with the The list of availability zones to choose from. The service will choose the availability zone with the best mix of available capacity and lowest cost to launch the cluster. If you do not specify this value, the cluster is launched in any availability zone that the customer account has access to.
" }, "IamInstanceProfile":{ "shape":"String", - "documentation":"The IAM role that was specified when the job flow was launched. The EC2 instances of the job flow assume this role.
" + "documentation":"The IAM role that was specified when the cluster was launched. The EC2 instances of the cluster assume this role.
" }, "EmrManagedMasterSecurityGroup":{ "shape":"String", @@ -1296,6 +1389,18 @@ "shape":"String", "documentation":"The identifier of the instance group to which this instance belongs.
" }, + "InstanceFleetId":{ + "shape":"InstanceFleetId", + "documentation":"The unique identifier of the instance fleet to which an EC2 instance belongs.
" + }, + "Market":{ + "shape":"MarketType", + "documentation":"The instance purchasing option. Valid values are ON_DEMAND
or SPOT
.
The EC2 instance type, for example m3.xlarge
.
The list of EBS volumes that are attached to this instance.
" @@ -1303,6 +1408,208 @@ }, "documentation":"Represents an EC2 instance provisioned as part of cluster.
" }, + "InstanceCollectionType":{ + "type":"string", + "enum":[ + "INSTANCE_FLEET", + "INSTANCE_GROUP" + ] + }, + "InstanceFleet":{ + "type":"structure", + "members":{ + "Id":{ + "shape":"InstanceFleetId", + "documentation":"The unique identifier of the instance fleet.
" + }, + "Name":{ + "shape":"XmlStringMaxLen256", + "documentation":"A friendly name for the instance fleet.
" + }, + "Status":{ + "shape":"InstanceFleetStatus", + "documentation":"The current status of the instance fleet.
" + }, + "InstanceFleetType":{ + "shape":"InstanceFleetType", + "documentation":"The node type that the instance fleet hosts. Valid values are MASTER, CORE, or TASK.
" + }, + "TargetOnDemandCapacity":{ + "shape":"WholeNumber", + "documentation":"The target capacity of On-Demand units for the instance fleet, which determines how many On-Demand instances to provision. When the instance fleet launches, Amazon EMR tries to provision On-Demand instances as specified by InstanceTypeConfig. Each instance configuration has a specified WeightedCapacity
. When an On-Demand instance is provisioned, the WeightedCapacity
units count toward the target capacity. Amazon EMR provisions instances until the target capacity is totally fulfilled, even if this results in an overage. For example, if there are 2 units remaining to fulfill capacity, and Amazon EMR can only provision an instance with a WeightedCapacity
of 5 units, the instance is provisioned, and the target capacity is exceeded by 3 units. You can use InstanceFleet$ProvisionedOnDemandCapacity to determine the Spot capacity units that have been provisioned for the instance fleet.
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.
The target capacity of Spot units for the instance fleet, which determines how many Spot instances to provision. When the instance fleet launches, Amazon EMR tries to provision Spot instances as specified by InstanceTypeConfig. Each instance configuration has a specified WeightedCapacity
. When a Spot instance is provisioned, the WeightedCapacity
units count toward the target capacity. Amazon EMR provisions instances until the target capacity is totally fulfilled, even if this results in an overage. For example, if there are 2 units remaining to fulfill capacity, and Amazon EMR can only provision an instance with a WeightedCapacity
of 5 units, the instance is provisioned, and the target capacity is exceeded by 3 units. You can use InstanceFleet$ProvisionedSpotCapacity to determine the Spot capacity units that have been provisioned for the instance fleet.
If not specified or set to 0, only On-Demand instances are provisioned for the instance fleet. 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.
The number of On-Demand units that have been provisioned for the instance fleet to fulfill TargetOnDemandCapacity
. This provisioned capacity might be less than or greater than TargetOnDemandCapacity
.
The number of Spot units that have been provisioned for this instance fleet to fulfill TargetSpotCapacity
. This provisioned capacity might be less than or greater than TargetSpotCapacity
.
The specification for the instance types that comprise an instance fleet. Up to five unique instance specifications may be defined for each instance fleet.
" + }, + "LaunchSpecifications":{ + "shape":"InstanceFleetProvisioningSpecifications", + "documentation":"Describes the launch specification for an instance fleet.
" + } + }, + "documentation":"Describes an instance fleet, which is a group of EC2 instances that host a particular node type (master, core, or task) in an Amazon EMR cluster. Instance fleets can consist of a mix of instance types and On-Demand and Spot instances, which are provisioned to meet a defined target capacity.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The friendly name of the instance fleet.
" + }, + "InstanceFleetType":{ + "shape":"InstanceFleetType", + "documentation":"The node type that the instance fleet hosts. Valid values are MASTER,CORE,and TASK.
" + }, + "TargetOnDemandCapacity":{ + "shape":"WholeNumber", + "documentation":"The target capacity of On-Demand units for the instance fleet, which determines how many On-Demand instances to provision. When the instance fleet launches, Amazon EMR tries to provision On-Demand instances as specified by InstanceTypeConfig. Each instance configuration has a specified WeightedCapacity
. When an On-Demand instance is provisioned, the WeightedCapacity
units count toward the target capacity. Amazon EMR provisions instances until the target capacity is totally fulfilled, even if this results in an overage. For example, if there are 2 units remaining to fulfill capacity, and Amazon EMR can only provision an instance with a WeightedCapacity
of 5 units, the instance is provisioned, and the target capacity is exceeded by 3 units.
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.
The target capacity of Spot units for the instance fleet, which determines how many Spot instances to provision. When the instance fleet launches, Amazon EMR tries to provision Spot instances as specified by InstanceTypeConfig. Each instance configuration has a specified WeightedCapacity
. When a Spot instance is provisioned, the WeightedCapacity
units count toward the target capacity. Amazon EMR provisions instances until the target capacity is totally fulfilled, even if this results in an overage. For example, if there are 2 units remaining to fulfill capacity, and Amazon EMR can only provision an instance with a WeightedCapacity
of 5 units, the instance is provisioned, and the target capacity is exceeded by 3 units.
If not specified or set to 0, only On-Demand instances are provisioned for the instance fleet. 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.
The instance type configurations that define the EC2 instances in the instance fleet.
" + }, + "LaunchSpecifications":{ + "shape":"InstanceFleetProvisioningSpecifications", + "documentation":"The launch specification for the instance fleet.
" + } + }, + "documentation":"The configuration that defines an instance fleet.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
A unique identifier for the instance fleet.
" + }, + "TargetOnDemandCapacity":{ + "shape":"WholeNumber", + "documentation":"The target capacity of On-Demand units for the instance fleet. For more information see InstanceFleetConfig$TargetOnDemandCapacity.
" + }, + "TargetSpotCapacity":{ + "shape":"WholeNumber", + "documentation":"The target capacity of Spot units for the instance fleet. For more information, see InstanceFleetConfig$TargetSpotCapacity.
" + } + }, + "documentation":"Configuration parameters for an instance fleet modification request.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The launch specification for Spot instances in the fleet, which determines the defined duration and provisioning timeout behavior.
" + } + }, + "documentation":"The launch specification for Spot instances in the fleet, which determines the defined duration and provisioning timeout behavior.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
A code corresponding to the reason the state change occurred.
" + }, + "Message":{ + "shape":"String", + "documentation":"An explanatory message.
" + } + }, + "documentation":"Provides status change reason details for the instance fleet.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
A code representing the instance fleet status.
" + }, + "StateChangeReason":{ + "shape":"InstanceFleetStateChangeReason", + "documentation":"Provides status change reason details for the instance fleet.
" + }, + "Timeline":{ + "shape":"InstanceFleetTimeline", + "documentation":"Provides historical timestamps for the instance fleet, including the time of creation, the time it became ready to run jobs, and the time of termination.
" + } + }, + "documentation":"The status of the instance fleet.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The time and date the instance fleet was created.
" + }, + "ReadyDateTime":{ + "shape":"Date", + "documentation":"The time and date the instance fleet was ready to run jobs.
" + }, + "EndDateTime":{ + "shape":"Date", + "documentation":"The time and date the instance fleet terminated.
" + } + }, + "documentation":"Provides historical timestamps for the instance fleet, including the time of creation, the time it became ready to run jobs, and the time of termination.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
An EC2 instance type, such as m3.xlarge
.
The number of units that a provisioned instance of this type provides toward fulfilling the target capacities defined in InstanceFleetConfig. This value is 1 for a master instance fleet, and must be greater than 0 for core and task instance fleets.
" + }, + "BidPrice":{ + "shape":"XmlStringMaxLen256", + "documentation":"The bid price for each EC2 Spot instance type as defined by InstanceType
. Expressed in USD. If neither BidPrice
nor BidPriceAsPercentageOfOnDemandPrice
is provided, BidPriceAsPercentageOfOnDemandPrice
defaults to 100%.
The bid price, as a percentage of On-Demand price, for each EC2 Spot instance as defined by InstanceType
. Expressed as a number between 0 and 1000 (for example, 20 specifies 20%). If neither BidPrice
nor BidPriceAsPercentageOfOnDemandPrice
is provided, BidPriceAsPercentageOfOnDemandPrice
defaults to 100%.
The configuration of Amazon Elastic Block Storage (EBS) attached to each instance as defined by InstanceType
.
A configuration classification that applies when provisioning cluster instances, which can include configurations for applications and software that run on the cluster.
" + } + }, + "documentation":"An instance type configuration for each instance type in an instance fleet, which determines the EC2 instances Amazon EMR attempts to provision to fulfill On-Demand and Spot target capacities. There can be a maximum of 5 instance type configurations in a fleet.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The EC2 instance type, for example m3.xlarge
.
The number of units that a provisioned instance of this type provides toward fulfilling the target capacities defined in InstanceFleetConfig. Capacity values represent performance characteristics such as vCPUs, memory, or I/O. If not specified, the default value is 1.
" + }, + "BidPrice":{ + "shape":"XmlStringMaxLen256", + "documentation":"The bid price for each EC2 Spot instance type as defined by InstanceType
. Expressed in USD.
The bid price, as a percentage of On-Demand price, for each EC2 Spot instance as defined by InstanceType
. Expressed as a number (for example, 20 specifies 20%).
A configuration classification that applies when provisioning cluster instances, which can include configurations for applications and software bundled with Amazon EMR.
" + }, + "EbsBlockDevices":{ + "shape":"EbsBlockDeviceList", + "documentation":"The configuration of Amazon Elastic Block Storage (EBS) attached to each instance as defined by InstanceType
.
Evaluates to TRUE
when the specified InstanceType
is EBS-optimized.
The configuration specification for each instance type in an instance fleet.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
Specifies whether the job flow is visible to all IAM users of the AWS account associated with the job flow. If this value is set to true
, all IAM users of that AWS account can view and (if they have the proper policy permissions set) manage the job flow. If it is set to false
, only the IAM user that created the job flow can view and manage it. This value can be changed using the SetVisibleToAllUsers action.
Specifies whether the cluster is visible to all IAM users of the AWS account associated with the cluster. If this value is set to true
, all IAM users of that AWS account can view and (if they have the proper policy permissions set) manage the cluster. If it is set to false
, only the IAM user that created the cluster can view and manage it. This value can be changed using the SetVisibleToAllUsers action.
The way that individual Amazon EC2 instances terminate when an automatic scale-in activity occurs or an instance group is resized. TERMINATE_AT_INSTANCE_HOUR
indicates that Amazon EMR terminates nodes at the instance-hour boundary, regardless of when the request to terminate the instance was submitted. This option is only available with Amazon EMR 5.1.0 and later and is the default for clusters created using that version. TERMINATE_AT_TASK_COMPLETION
indicates that Amazon EMR blacklists and drains tasks from nodes before terminating the Amazon EC2 instances, regardless of the instance-hour boundary. With either behavior, Amazon EMR removes the least active nodes first and blocks instance termination if it could lead to HDFS corruption. TERMINATE_AT_TASK_COMPLETION
available only in Amazon EMR version 4.1.0 and later, and is the default for versions of Amazon EMR earlier than 5.1.0.
A description of a job flow.
" + "documentation":"A description of a cluster (job flow).
" }, "JobFlowDetailList":{ "type":"list", @@ -1881,7 +2261,7 @@ "documentation":"Description of the job flow last changed state.
" } }, - "documentation":"Describes the status of the job flow.
" + "documentation":"Describes the status of the cluster (job flow).
" }, "JobFlowInstancesConfig":{ "type":"structure", @@ -1896,11 +2276,15 @@ }, "InstanceCount":{ "shape":"Integer", - "documentation":"The number of EC2 instances used to execute the job flow.
" + "documentation":"The number of EC2 instances in the cluster.
" }, "InstanceGroups":{ "shape":"InstanceGroupConfigList", - "documentation":"Configuration for the job flow's instance groups.
" + "documentation":"Configuration for the instance groups in a cluster.
" + }, + "InstanceFleets":{ + "shape":"InstanceFleetConfigList", + "documentation":"The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
Describes the EC2 instances and instance configurations for clusters that use the instance fleet configuration.
" }, "Ec2KeyName":{ "shape":"XmlStringMaxLen256", @@ -1908,23 +2292,27 @@ }, "Placement":{ "shape":"PlacementType", - "documentation":"The Availability Zone the job flow will run in.
" + "documentation":"The Availability Zone in which the cluster runs.
" }, "KeepJobFlowAliveWhenNoSteps":{ "shape":"Boolean", - "documentation":"Specifies whether the job flow should be kept alive after completing all steps.
" + "documentation":"Specifies whether the cluster should remain available after completing all steps.
" }, "TerminationProtected":{ "shape":"Boolean", - "documentation":"Specifies whether to lock the job flow to prevent the Amazon EC2 instances from being terminated by API call, user intervention, or in the event of a job flow error.
" + "documentation":"Specifies whether to lock the cluster to prevent the Amazon EC2 instances from being terminated by API call, user intervention, or in the event of a job-flow error.
" }, "HadoopVersion":{ "shape":"XmlStringMaxLen256", - "documentation":"The Hadoop version for the job flow. Valid inputs are \"0.18\" (deprecated), \"0.20\" (deprecated), \"0.20.205\" (deprecated), \"1.0.3\", \"2.2.0\", or \"2.4.0\". If you do not set this value, the default of 0.18 is used, unless the AmiVersion parameter is set in the RunJobFlow call, in which case the default version of Hadoop for that AMI version is used.
" + "documentation":"The Hadoop version for the cluster. Valid inputs are \"0.18\" (deprecated), \"0.20\" (deprecated), \"0.20.205\" (deprecated), \"1.0.3\", \"2.2.0\", or \"2.4.0\". If you do not set this value, the default of 0.18 is used, unless the AmiVersion parameter is set in the RunJobFlow call, in which case the default version of Hadoop for that AMI version is used.
" }, "Ec2SubnetId":{ "shape":"XmlStringMaxLen256", - "documentation":"To launch the job flow in Amazon Virtual Private Cloud (Amazon VPC), set this parameter to the identifier of the Amazon VPC subnet where you want the job flow to launch. If you do not specify this value, the job flow is launched in the normal Amazon Web Services cloud, outside of an Amazon VPC.
Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. Thus you cannot specify the cc1.4xlarge instance type for nodes of a job flow launched in a Amazon VPC.
" + "documentation":"Applies to clusters that use the uniform instance group configuration. To launch the cluster in Amazon Virtual Private Cloud (Amazon VPC), set this parameter to the identifier of the Amazon VPC subnet where you want the cluster to launch. If you do not specify this value, the cluster launches in the normal Amazon Web Services cloud, outside of an Amazon VPC, if the account launching the cluster supports EC2 Classic networks in the region where the cluster launches.
Amazon VPC currently does not support cluster compute quadruple extra large (cc1.4xlarge) instances. Thus you cannot specify the cc1.4xlarge instance type for clusters launched in an Amazon VPC.
" + }, + "Ec2SubnetIds":{ + "shape":"XmlStringMaxLen256List", + "documentation":"Applies to clusters that use the instance fleet configuration. When multiple EC2 subnet IDs are specified, Amazon EMR evaluates them and launches instances in the optimal subnet.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
A list of additional Amazon EC2 security group IDs for the slave nodes.
" } }, - "documentation":"A description of the Amazon EC2 instance running the job flow. A valid JobFlowInstancesConfig must contain at least InstanceGroups, which is the recommended configuration. However, a valid alternative is to have MasterInstanceType, SlaveInstanceType, and InstanceCount (all three must be present).
" + "documentation":"A description of the Amazon EC2 instance on which the cluster (job flow) runs. A valid JobFlowInstancesConfig must contain either InstanceGroups or InstanceFleets, which is the recommended configuration. They cannot be used together. You may also have MasterInstanceType, SlaveInstanceType, and InstanceCount (all three must be present), but we don't recommend this configuration.
" }, "JobFlowInstancesDetail":{ "type":"structure", @@ -1979,38 +2367,38 @@ }, "InstanceGroups":{ "shape":"InstanceGroupDetailList", - "documentation":"Details about the job flow's instance groups.
" + "documentation":"Details about the instance groups in a cluster.
" }, "NormalizedInstanceHours":{ "shape":"Integer", - "documentation":"An approximation of the cost of the job flow, represented in m1.small/hours. This value is incremented one time for every hour that an m1.small runs. Larger instances are weighted more, so an Amazon EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.
" + "documentation":"An approximation of the cost of the cluster, represented in m1.small/hours. This value is incremented one time for every hour that an m1.small runs. Larger instances are weighted more, so an Amazon EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.
" }, "Ec2KeyName":{ "shape":"XmlStringMaxLen256", - "documentation":"The name of an Amazon EC2 key pair that can be used to ssh to the master node of job flow.
" + "documentation":"The name of an Amazon EC2 key pair that can be used to ssh to the master node.
" }, "Ec2SubnetId":{ "shape":"XmlStringMaxLen256", - "documentation":"For job flows launched within Amazon Virtual Private Cloud, this value specifies the identifier of the subnet where the job flow was launched.
" + "documentation":"For clusters launched within Amazon Virtual Private Cloud, this is the identifier of the subnet where the cluster was launched.
" }, "Placement":{ "shape":"PlacementType", - "documentation":"The Amazon EC2 Availability Zone for the job flow.
" + "documentation":"The Amazon EC2 Availability Zone for the cluster.
" }, "KeepJobFlowAliveWhenNoSteps":{ "shape":"Boolean", - "documentation":"Specifies whether the job flow should terminate after completing all steps.
" + "documentation":"Specifies whether the cluster should remain available after completing all steps.
" }, "TerminationProtected":{ "shape":"Boolean", - "documentation":"Specifies whether the Amazon EC2 instances in the cluster are protected from termination by API calls, user intervention, or in the event of a job flow error.
" + "documentation":"Specifies whether the Amazon EC2 instances in the cluster are protected from termination by API calls, user intervention, or in the event of a job-flow error.
" }, "HadoopVersion":{ "shape":"XmlStringMaxLen256", - "documentation":"The Hadoop version for the job flow.
" + "documentation":"The Hadoop version for the cluster.
" } }, - "documentation":"Specify the type of Amazon EC2 instances to run the job flow on.
" + "documentation":"Specify the type of Amazon EC2 instances that the cluster (job flow) runs on.
" }, "KeyValue":{ "type":"structure", @@ -2095,6 +2483,33 @@ }, "documentation":"This contains a ClusterSummaryList with the cluster details; for example, the cluster IDs, names, and status.
" }, + "ListInstanceFleetsInput":{ + "type":"structure", + "required":["ClusterId"], + "members":{ + "ClusterId":{ + "shape":"ClusterId", + "documentation":"The unique identifier of the cluster.
" + }, + "Marker":{ + "shape":"Marker", + "documentation":"The pagination token that indicates the next set of results to retrieve.
" + } + } + }, + "ListInstanceFleetsOutput":{ + "type":"structure", + "members":{ + "InstanceFleets":{ + "shape":"InstanceFleetList", + "documentation":"The list of instance fleets for the cluster and given filters.
" + }, + "Marker":{ + "shape":"Marker", + "documentation":"The pagination token that indicates the next set of results to retrieve.
" + } + } + }, "ListInstanceGroupsInput":{ "type":"structure", "required":["ClusterId"], @@ -2140,6 +2555,14 @@ "shape":"InstanceGroupTypeList", "documentation":"The type of instance group for which to list the instances.
" }, + "InstanceFleetId":{ + "shape":"InstanceFleetId", + "documentation":"The unique identifier of the instance fleet.
" + }, + "InstanceFleetType":{ + "shape":"InstanceFleetType", + "documentation":"The node type of the instance fleet. For example MASTER, CORE, or TASK.
" + }, "InstanceStates":{ "shape":"InstanceStateList", "documentation":"A list of instance states that will filter the instances returned with this request.
" @@ -2244,12 +2667,29 @@ "documentation":"The dimension value.
" } }, - "documentation":"A CloudWatch dimension, which is specified using a Key
(known as a Name
in CloudWatch), Value pair. By default, Amazon EMR uses one dimension whose Key
is JobFlowID
and Value
is a variable representing the cluster ID, which is ${emr:cluster_id}
. This enables the rule to bootstrap when the cluster ID becomes available, and also enables a single automatic scaling policy to be reused for multiple clusters and instance groups.
A CloudWatch dimension, which is specified using a Key
(known as a Name
in CloudWatch), Value
pair. By default, Amazon EMR uses one dimension whose Key
is JobFlowID
and Value
is a variable representing the cluster ID, which is ${emr.clusterId}
. This enables the rule to bootstrap when the cluster ID becomes available.
The unique identifier of the cluster.
" + }, + "InstanceFleet":{ + "shape":"InstanceFleetModifyConfig", + "documentation":"The unique identifier of the instance fleet.
" + } + } + }, "ModifyInstanceGroupsInput":{ "type":"structure", "members":{ @@ -2274,14 +2714,17 @@ }, "PlacementType":{ "type":"structure", - "required":["AvailabilityZone"], "members":{ "AvailabilityZone":{ "shape":"XmlString", - "documentation":"The Amazon EC2 Availability Zone for the job flow.
" + "documentation":"The Amazon EC2 Availability Zone for the cluster. AvailabilityZone
is used for uniform instance groups, while AvailabilityZones
(plural) is used for instance fleets.
When multiple Availability Zones are specified, Amazon EMR evaluates them and launches instances in the optimal Availability Zone. AvailabilityZones
is used for instance fleets, while AvailabilityZone
(singular) is used for uniform instance groups.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The Amazon EC2 location for the job flow.
" + "documentation":"The Amazon EC2 Availability Zone configuration of the cluster (job flow).
" }, "PutAutoScalingPolicyInput":{ "type":"structure", @@ -2398,23 +2841,23 @@ }, "Instances":{ "shape":"JobFlowInstancesConfig", - "documentation":"A specification of the number and type of Amazon EC2 instances on which to run the job flow.
" + "documentation":"A specification of the number and type of Amazon EC2 instances.
" }, "Steps":{ "shape":"StepConfigList", - "documentation":"A list of steps to be executed by the job flow.
" + "documentation":"A list of steps to run.
" }, "BootstrapActions":{ "shape":"BootstrapActionConfigList", - "documentation":"A list of bootstrap actions that will be run before Hadoop is started on the cluster nodes.
" + "documentation":"A list of bootstrap actions to run before Hadoop starts on the cluster nodes.
" }, "SupportedProducts":{ "shape":"SupportedProductsList", - "documentation":"For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and greater, use Applications.
A list of strings that indicates third-party software to use with the job flow. For more information, see Use Third Party Applications with Amazon EMR. Currently supported values are:
\"mapr-m3\" - launch the job flow using MapR M3 Edition.
\"mapr-m5\" - launch the job flow using MapR M5 Edition.
For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and greater, use Applications.
A list of strings that indicates third-party software to use. For more information, see Use Third Party Applications with Amazon EMR. Currently supported values are:
\"mapr-m3\" - launch the job flow using MapR M3 Edition.
\"mapr-m5\" - launch the job flow using MapR M5 Edition.
For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and greater, use Applications.
A list of strings that indicates third-party software to use with the job flow that accepts a user argument list. EMR accepts and forwards the argument list to the corresponding installation script as bootstrap action arguments. For more information, see Launch a Job Flow on the MapR Distribution for Hadoop. Currently supported values are:
\"mapr-m3\" - launch the cluster using MapR M3 Edition.
\"mapr-m5\" - launch the cluster using MapR M5 Edition.
\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition respectively.
\"mapr-m7\" - launch the cluster using MapR M7 Edition.
\"hunk\" - launch the cluster with the Hunk Big Data Analtics Platform.
\"hue\"- launch the cluster with Hue installed.
\"spark\" - launch the cluster with Apache Spark installed.
\"ganglia\" - launch the cluster with the Ganglia Monitoring System installed.
For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and greater, use Applications.
A list of strings that indicates third-party software to use with the job flow that accepts a user argument list. EMR accepts and forwards the argument list to the corresponding installation script as bootstrap action arguments. For more information, see \"Launch a Job Flow on the MapR Distribution for Hadoop\" in the Amazon EMR Developer Guide. Supported values are:
\"mapr-m3\" - launch the cluster using MapR M3 Edition.
\"mapr-m5\" - launch the cluster using MapR M5 Edition.
\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the job flow using MapR M3 or M5 Edition respectively.
\"mapr-m7\" - launch the cluster using MapR M7 Edition.
\"hunk\" - launch the cluster with the Hunk Big Data Analtics Platform.
\"hue\"- launch the cluster with Hue installed.
\"spark\" - launch the cluster with Apache Spark installed.
\"ganglia\" - launch the cluster with the Ganglia Monitoring System installed.
Whether the job flow is visible to all IAM users of the AWS account associated with the job flow. If this value is set to true
, all IAM users of that AWS account can view and (if they have the proper policy permissions set) manage the job flow. If it is set to false
, only the IAM user that created the job flow can view and manage it.
Whether the cluster is visible to all IAM users of the AWS account associated with the cluster. If this value is set to true
, all IAM users of that AWS account can view and (if they have the proper policy permissions set) manage the cluster. If it is set to false
, only the IAM user that created the cluster can view and manage it.
A list of strings that uniquely identify the job flows to protect. This identifier is returned by RunJobFlow and can also be obtained from DescribeJobFlows .
" + "documentation":"A list of strings that uniquely identify the clusters to protect. This identifier is returned by RunJobFlow and can also be obtained from DescribeJobFlows .
" }, "TerminationProtected":{ "shape":"Boolean", - "documentation":"A Boolean that indicates whether to protect the job flow and prevent the Amazon EC2 instances in the cluster from shutting down due to API calls, user intervention, or job-flow error.
" + "documentation":"A Boolean that indicates whether to protect the cluster and prevent the Amazon EC2 instances in the cluster from shutting down due to API calls, user intervention, or job-flow error.
" } }, "documentation":"The input argument to the TerminationProtection operation.
" @@ -2615,7 +3058,7 @@ }, "VisibleToAllUsers":{ "shape":"Boolean", - "documentation":"Whether the specified job flows are visible to all IAM users of the AWS account associated with the job flow. If this value is set to True, all IAM users of that AWS account can view and, if they have the proper IAM policy permissions set, manage the job flows. If it is set to False, only the IAM user that created a job flow can view and manage it.
" + "documentation":"Whether the specified clusters are visible to all IAM users of the AWS account associated with the cluster. If this value is set to True, all IAM users of that AWS account can view and, if they have the proper IAM policy permissions set, manage the clusters. If it is set to False, only the IAM user that created a cluster can view and manage it.
" } }, "documentation":"The input to the SetVisibleToAllUsers action.
" @@ -2640,7 +3083,7 @@ "members":{ "AdjustmentType":{ "shape":"AdjustmentType", - "documentation":"The way in which EC2 instances are added (if ScalingAdjustment
is a positive number) or terminated (if ScalingAdjustment
is a negative number) each time the scaling activity is triggered. CHANGE_IN_CAPACITY
is the default. CHANGE_IN_CAPACITY
indicates that the EC2 instance count increments or decrements by ScalingAdjustment
, which should be expressed as an integer. PERCENT_CHANGE_IN_CAPACITY
indicates the instance count increments or decrements by the percentage specified by ScalingAdjustment
, which should be expressed as a decimal, for example, 0.20 indicates an increase in 20% increments of cluster capacity. EXACT_CAPACITY
indicates the scaling activity results in an instance group with the number of EC2 instances specified by ScalingAdjustment
, which should be expressed as a positive integer.
The way in which EC2 instances are added (if ScalingAdjustment
is a positive number) or terminated (if ScalingAdjustment
is a negative number) each time the scaling activity is triggered. CHANGE_IN_CAPACITY
is the default. CHANGE_IN_CAPACITY
indicates that the EC2 instance count increments or decrements by ScalingAdjustment
, which should be expressed as an integer. PERCENT_CHANGE_IN_CAPACITY
indicates the instance count increments or decrements by the percentage specified by ScalingAdjustment
, which should be expressed as a decimal. For example, 0.20 indicates an increase in 20% increments of cluster capacity. EXACT_CAPACITY
indicates the scaling activity results in an instance group with the number of EC2 instances specified by ScalingAdjustment
, which should be expressed as a positive integer.
An automatic scaling configuration, which describes how the policy adds or removes instances, the cooldown period, and the number of EC2 instances that will be added each time the CloudWatch metric alarm condition is satisfied.
" }, + "SpotProvisioningSpecification":{ + "type":"structure", + "required":[ + "TimeoutDurationMinutes", + "TimeoutAction" + ], + "members":{ + "TimeoutDurationMinutes":{ + "shape":"WholeNumber", + "documentation":"The spot provisioning timeout period in minutes. If Spot instances are not provisioned within this time period, the TimeOutAction
is taken. Minimum value is 5 and maximum value is 1440. The timeout applies only during initial provisioning, when the cluster is first created.
The action to take when TargetSpotCapacity
has not been fulfilled when the TimeoutDurationMinutes
has expired. Spot instances are not uprovisioned within the Spot provisioining timeout. Valid values are TERMINATE_CLUSTER
and SWITCH_TO_ON_DEMAND
to fulfill the remaining capacity.
The defined duration for Spot instances (also known as Spot blocks) in minutes. When specified, the Spot instance does not terminate before the defined duration expires, and defined duration pricing for Spot instances applies. Valid values are 60, 120, 180, 240, 300, or 360. The duration period starts as soon as a Spot instance receives its instance ID. At the end of the duration, Amazon EC2 marks the Spot instance for termination and provides a Spot instance termination notice, which gives the instance a two-minute warning before it terminates.
" + } + }, + "documentation":"The launch specification for Spot instances in the instance fleet, which determines the defined duration and provisioning timeout behavior.
The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x versions.
The name of the job flow step.
" + "documentation":"The name of the step.
" }, "ActionOnFailure":{ "shape":"ActionOnFailure", - "documentation":"The action to take if the job flow step fails.
" + "documentation":"The action to take if the step fails.
" }, "HadoopJarStep":{ "shape":"HadoopJarStepConfig", - "documentation":"The JAR file used for the job flow step.
" + "documentation":"The JAR file used for the step.
" } }, - "documentation":"Specification of a job flow step.
" + "documentation":"Specification of a cluster (job flow) step.
" }, "StepConfigList":{ "type":"list", @@ -2758,7 +3230,7 @@ "members":{ "State":{ "shape":"StepExecutionState", - "documentation":"The state of the job flow step.
" + "documentation":"The state of the step.
" }, "CreationDateTime":{ "shape":"Date", @@ -2999,6 +3471,10 @@ }, "documentation":"EBS volume specifications such as volume type, IOPS, and size (GiB) that will be requested for the EBS volume attached to an EC2 instance in the cluster.
" }, + "WholeNumber":{ + "type":"integer", + "min":0 + }, "XmlString":{ "type":"string", "max":10280, @@ -3014,6 +3490,10 @@ "max":256, "min":0, "pattern":"[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*" + }, + "XmlStringMaxLen256List":{ + "type":"list", + "member":{"shape":"XmlStringMaxLen256"} } }, "documentation":"Amazon EMR is a web service that makes it easy to process large amounts of data efficiently. Amazon EMR uses Hadoop processing combined with several AWS products to do tasks such as web indexing, data mining, log file analysis, machine learning, scientific simulation, and data warehousing.
" diff --git a/apis/elasticmapreduce-2009-03-31.paginators.json b/apis/elasticmapreduce-2009-03-31.paginators.json index 87f282d779..dafb1d93d0 100644 --- a/apis/elasticmapreduce-2009-03-31.paginators.json +++ b/apis/elasticmapreduce-2009-03-31.paginators.json @@ -13,6 +13,11 @@ "output_token": "Marker", "result_key": "Clusters" }, + "ListInstanceFleets": { + "input_token": "Marker", + "output_token": "Marker", + "result_key": "InstanceFleets" + }, "ListInstanceGroups": { "input_token": "Marker", "output_token": "Marker", @@ -29,4 +34,4 @@ "result_key": "Steps" } } -} +} \ No newline at end of file diff --git a/apis/elasticmapreduce-2009-03-31.waiters2.json b/apis/elasticmapreduce-2009-03-31.waiters2.json index 829f1b1ac8..abba8c3c29 100644 --- a/apis/elasticmapreduce-2009-03-31.waiters2.json +++ b/apis/elasticmapreduce-2009-03-31.waiters2.json @@ -62,6 +62,25 @@ "expected": "CANCELLED" } ] + }, + "ClusterTerminated": { + "delay": 30, + "operation": "DescribeCluster", + "maxAttempts": 60, + "acceptors": [ + { + "state": "success", + "matcher": "path", + "argument": "Cluster.Status.State", + "expected": "TERMINATED" + }, + { + "state": "failure", + "matcher": "path", + "argument": "Cluster.Status.State", + "expected": "TERMINATED_WITH_ERRORS" + } + ] } } } diff --git a/clients/emr.d.ts b/clients/emr.d.ts index 18351817d7..9064f45833 100644 --- a/clients/emr.d.ts +++ b/clients/emr.d.ts @@ -11,6 +11,14 @@ declare class EMR extends Service { */ constructor(options?: EMR.Types.ClientConfiguration) config: Config & EMR.Types.ClientConfiguration; + /** + * Adds an instance fleet to a running cluster. The instance fleet configuration is available only in Amazon EMR versions 4.8.0 and later, excluding 5.0.x. + */ + addInstanceFleet(params: EMR.Types.AddInstanceFleetInput, callback?: (err: AWSError, data: EMR.Types.AddInstanceFleetOutput) => void): Requestw((N-r)/S)&&s("overflow"),r+=(p-t)*S,t=p,u=0;u >1,l=23===s?Math.pow(2,-24)-Math.pow(2,-77):0,d=i?0:a-1,y=i?1:-1,b=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(n=isNaN(t)?1:0,o=c):(o=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-o))<1&&(o--,u*=2),t+=o+m>=1?l/u:l*Math.pow(2,1-m),t*u>=2&&(o++,u/=2),o+m>=c?(n=0,o=c):o+m>=1?(n=(t*u-1)*Math.pow(2,s),o+=m):(n=t*Math.pow(2,m-1)*Math.pow(2,s),o=0));s>=8;e[r+d]=255&n,d+=y,n/=256,s-=8);for(o=o< w((N-r)/S)&&i("overflow"),r+=(p-t)*S,t=p,u=0;u >1,l=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,d=s?0:a-1,y=s?1:-1,b=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(o=isNaN(t)?1:0,n=c):(n=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-n))<1&&(n--,u*=2),t+=n+m>=1?l/u:l*Math.pow(2,1-m),t*u>=2&&(n++,u/=2),n+m>=c?(o=0,n=c):n+m>=1?(o=(t*u-1)*Math.pow(2,i),n+=m):(o=t*Math.pow(2,m-1)*Math.pow(2,i),n=0));i>=8;e[r+d]=255&o,d+=y,o/=256,i-=8);for(n=n<0;e[r+d]=255&n,d+=y,n/=256,p-=8);e[r+d-y]|=128*b}},{}],287:[function(e,t,r){var s={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==s.call(e)}},{}],288:[function(e,t,r){function s(e,t){if(e.length%o!=0){var r=e.length+(o-e.length%o);e=n.concat([e,u],r)}for(var s=[],i=t?e.readInt32BE:e.readInt32LE,a=0;a>16&255,n[p++]=a>>8&255,n[p++]=255&a;return 2===o?(a=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,n[p++]=255&a):1===o&&(a=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,n[p++]=a>>8&255,n[p++]=255&a),n}function o(e){return p[e>>18&63]+p[e>>12&63]+p[e>>6&63]+p[63&e]}function n(e,t,r){for(var i,s=[],a=t;a0;e[r+d]=255&o,d+=y,o/=256,p-=8);e[r+d-y]|=128*b}},{}],287:[function(e,t,r){var i={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==i.call(e)}},{}],288:[function(e,t,r){function i(e,t){if(e.length%n!=0){var r=e.length+(n-e.length%n);e=o.concat([e,u],r)}for(var i=[],s=t?e.readInt32BE:e.readInt32LE,a=0;a-1&&r.splice(i,1)}return this},removeAllListeners:function(e){return e?delete this._events[e]:this._events={},this},emit:function(e,t,r){r||(r=function(){});var s=this.listeners(e),i=s.length;return this.callListeners(s,t,r),i>0},callListeners:function(e,t,r,i){function a(i){if(i&&(o=s.util.error(o||new Error,i),n._haltHandlersOnError))return r.call(n,o);n.callListeners(e,t,r,o)}for(var n=this,o=i||null;e.length>0;){var u=e.shift();if(u._isAsync)return void u.apply(n,t.concat([a]));try{u.apply(n,t)}catch(e){o=s.util.error(o||new Error,e)}if(o&&n._haltHandlersOnError)return void r.call(n,o)}r.call(n,o)},addListeners:function(e){var t=this;return e._events&&(e=e._events),s.util.each(e,function(e,r){"function"==typeof r&&(r=[r]),s.util.arrayEach(r,function(r){t.on(e,r)})}),t},addNamedListener:function(e,t,r){return this[e]=r,this.addListener(t,r),this},addNamedAsyncListener:function(e,t,r){return r._isAsync=!0,this.addNamedListener(e,t,r)},addNamedListeners:function(e){var t=this;return e(function(){t.addNamedListener.apply(t,arguments)},function(){t.addNamedAsyncListener.apply(t,arguments)}),this}}),s.SequentialExecutor.prototype.addListener=s.SequentialExecutor.prototype.on,t.exports=s.SequentialExecutor},{"./core":210}],248:[function(e,t,r){var s=e("./core"),i=e("./model/api"),a=e("./region_config"),n=s.util.inherit,o=0;s.Service=n({constructor:function(e){if(!this.loadServiceClass)throw s.util.error(new Error,"Service must be constructed with `new' operator");var t=this.loadServiceClass(e||{});if(t){var r=s.util.copy(e),i=new t(e);return Object.defineProperty(i,"_originalConfig",{get:function(){return r},enumerable:!1,configurable:!0}),i._clientId=++o,i}this.initialize(e)},initialize:function(e){var t=s.config[this.serviceIdentifier];this.config=new s.Config(s.config),t&&this.config.update(t,!0),e&&this.config.update(e,!0),this.validateService(),this.config.endpoint||a(this),this.config.endpoint=this.endpointFromTemplate(this.config.endpoint),this.setEndpoint(this.config.endpoint)},validateService:function(){},loadServiceClass:function(e){var t=e;if(s.util.isEmpty(this.api)){if(t.apiConfig)return s.Service.defineServiceApi(this.constructor,t.apiConfig);if(this.constructor.services){t=new s.Config(s.config),t.update(e,!0);var r=t.apiVersions[this.constructor.serviceIdentifier];return r=r||t.apiVersion,this.getLatestServiceClass(r)}return null}return null},getLatestServiceClass:function(e){return e=this.getLatestServiceVersion(e),null===this.constructor.services[e]&&s.Service.defineServiceApi(this.constructor,e),this.constructor.services[e]},getLatestServiceVersion:function(e){if(!this.constructor.services||0===this.constructor.services.length)throw new Error("No services defined on "+this.constructor.serviceIdentifier);if(e?s.util.isType(e,Date)&&(e=s.util.date.iso8601(e).split("T")[0]):e="latest",Object.hasOwnProperty(this.constructor.services,e))return e;for(var t=Object.keys(this.constructor.services).sort(),r=null,i=t.length-1;i>=0;i--)if("*"!==t[i][t[i].length-1]&&(r=t[i]),t[i].substr(0,10)<=e)return r;throw new Error("Could not find "+this.constructor.serviceIdentifier+" API to satisfy version constraint `"+e+"'")},api:{},defaultRetryCount:3,customizeRequests:function(e){if(e){if("function"!=typeof e)throw new Error("Invalid callback type '"+typeof e+"' provided in customizeRequests");this.customRequestHandler=e}else this.customRequestHandler=null},makeRequest:function(e,t,r){if("function"==typeof t&&(r=t,t=null),t=t||{},this.config.params){var i=this.api.operations[e];i&&(t=s.util.copy(t),s.util.each(this.config.params,function(e,r){i.input.members[e]&&(void 0!==t[e]&&null!==t[e]||(t[e]=r))}))}var a=new s.Request(this,e,t);return this.addAllRequestListeners(a),r&&a.send(r),a},makeUnauthenticatedRequest:function(e,t,r){"function"==typeof t&&(r=t,t={});var s=this.makeRequest(e,t).toUnauthenticated();return r?s.send(r):s},waitFor:function(e,t,r){return new s.ResourceWaiter(this,e).wait(t,r)},addAllRequestListeners:function(e){for(var t=[s.events,s.EventListeners.Core,this.serviceInterface(),s.EventListeners.CorePost],r=0;r0&&this._events[e].length>r&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace()),this},s.prototype.on=s.prototype.addListener,s.prototype.once=function(e,t){function r(){this.removeListener(e,r),s||(s=!0,t.apply(this,arguments))}if(!i(t))throw TypeError("listener must be a function");var s=!1;return r.listener=t,this.on(e,r),this},s.prototype.removeListener=function(e,t){var r,s,a,o;if(!i(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(r=this._events[e],a=r.length,s=-1,r===t||i(r.listener)&&r.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(n(r)){for(o=a;o-- >0;)if(r[o]===t||r[o].listener&&r[o].listener===t){s=o;break}if(s<0)return this;1===r.length?(r.length=0,delete this._events[e]):r.splice(s,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},s.prototype.removeAllListeners=function(e){var t,r;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(r=this._events[e],i(r))this.removeListener(e,r);else if(r)for(;r.length;)this.removeListener(e,r[r.length-1]);return delete this._events[e],this},s.prototype.listeners=function(e){return this._events&&this._events[e]?i(this._events[e])?[this._events[e]]:this._events[e].slice():[]},s.prototype.listenerCount=function(e){if(this._events){var t=this._events[e];if(i(t))return 1;if(t)return t.length}return 0},s.listenerCount=function(e,t){return e.listenerCount(t)}},{}],276:[function(e,t,r){function s(){throw new Error("setTimeout has not been defined")}function i(){throw new Error("clearTimeout has not been defined")}function a(e){if(m===setTimeout)return setTimeout(e,0);if((m===s||!m)&&setTimeout)return m=setTimeout,setTimeout(e,0);try{return m(e,0)}catch(t){try{return m.call(null,e,0)}catch(t){return m.call(this,e,0)}}}function n(e){if(l===clearTimeout)return clearTimeout(e);if((l===i||!l)&&clearTimeout)return l=clearTimeout,clearTimeout(e);try{return l(e)}catch(t){try{return l.call(null,e)}catch(t){return l.call(this,e)}}}function o(){h&&y&&(h=!1,y.length?b=y.concat(b):S=-1,b.length&&u())}function u(){if(!h){var e=a(o);h=!0;for(var t=b.length;t;){for(y=b,b=[];++S239?4:a>223?3:a>191?2:1;if(i+o<=r){var u,p,c,m;switch(o){case 1:a<128&&(n=a);break;case 2:u=e[i+1],128==(192&u)&&(m=(31&a)<<6|63&u)>127&&(n=m);break;case 3:u=e[i+1],p=e[i+2],128==(192&u)&&128==(192&p)&&(m=(15&a)<<12|(63&u)<<6|63&p)>2047&&(m<55296||m>57343)&&(n=m);break;case 4:u=e[i+1],p=e[i+2],c=e[i+3],128==(192&u)&&128==(192&p)&&128==(192&c)&&(m=(15&a)<<18|(63&u)<<12|(63&p)<<6|63&c)>65535&&m<1114112&&(n=m)}}null===n?(n=65533,o=1):n>65535&&(n-=65536,s.push(n>>>10&1023|55296),n=56320|1023&n),s.push(n),i+=o}return P(s)}function P(e){var t=e.length;if(t<=$)return String.fromCharCode.apply(String,e);for(var r="",s=0;s55295&&r<57344){if(!i){if(r>56319){(t-=3)>-1&&a.push(239,191,189);continue}if(n+1===s){(t-=3)>-1&&a.push(239,191,189);continue}i=r;continue}if(r<56320){(t-=3)>-1&&a.push(239,191,189),i=r;continue}r=65536+(i-55296<<10|r-56320)}else i&&(t-=3)>-1&&a.push(239,191,189);if(i=null,r<128){if((t-=1)<0)break;a.push(r)}else if(r<2048){if((t-=2)<0)break;a.push(r>>6|192,63&r|128)}else if(r<65536){if((t-=3)<0)break;a.push(r>>12|224,r>>6&63|128,63&r|128)}else{if(!(r<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;a.push(r>>18|240,r>>12&63|128,r>>6&63|128,63&r|128)}}return a}function z(e){for(var t=[],r=0;r=t.length||i>=e.length);++i)t[i+r]=e[i];return i}function Q(e){return e!==e}var X=e("base64-js"),J=e("ieee754"),Y=e("isarray");r.Buffer=a,r.SlowBuffer=b,r.INSPECT_MAX_BYTES=50,a.TYPED_ARRAY_SUPPORT=void 0!==t.TYPED_ARRAY_SUPPORT?t.TYPED_ARRAY_SUPPORT:function(){try{var e=new Uint8Array(1);return e.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===e.foo()&&"function"==typeof e.subarray&&0===e.subarray(1,1).byteLength}catch(e){return!1}}(),r.kMaxLength=s(),a.poolSize=8192,a._augment=function(e){return e.__proto__=a.prototype,e},a.from=function(e,t,r){return n(null,e,t,r)},a.TYPED_ARRAY_SUPPORT&&(a.prototype.__proto__=Uint8Array.prototype,a.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&a[Symbol.species]===a&&Object.defineProperty(a,Symbol.species,{value:null,configurable:!0})),a.alloc=function(e,t,r){return u(null,e,t,r)},a.allocUnsafe=function(e){return p(null,e)},a.allocUnsafeSlow=function(e){return p(null,e)},a.isBuffer=function(e){return!(null==e||!e._isBuffer)},a.compare=function(e,t){if(!a.isBuffer(e)||!a.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var r=e.length,s=t.length,i=0,n=Math.min(r,s);i=0)return!0;if(r.indexOf(e)>=0)return!0;if(!(s.indexOf(e[0])>=0))return!1;try{return JSON.parse(e),!0}catch(e){return!1}}};var A={};A.EOF=0,A.UnquotedIdentifier=0,A.QuotedIdentifier=0,A.Rbracket=0,A.Rparen=0,A.Comma=0,A.Rbrace=0,A.Number=0,A.Current=0,A.Expref=0,A.Pipe=1,A.Or=2,A.And=3,A.EQ=5,A.GT=5,A.LT=5,A.GTE=5,A.LTE=5,A.NE=5,A.Flatten=9,A.Star=20,A.Filter=21,A.Dot=40,A.Not=45,A.Lbrace=50,A.Lbracket=55,A.Lparen=60,c.prototype={parse:function(e){this._loadTokens(e),this.index=0;var t=this.expression(0);if("EOF"!==this._lookahead(0)){var r=this._lookaheadToken(0),s=new Error("Unexpected token type: "+r.type+", value: "+r.value);throw s.name="ParserError",s}return t},_loadTokens:function(e){var t=new p,r=t.tokenize(e);r.push({type:"EOF",value:"",start:e.length}),this.tokens=r},expression:function(e){var t=this._lookaheadToken(0);this._advance();for(var r=this.nud(t),s=this._lookahead(0);e=0?this.expression(e):"Lbracket"===t?(this._match("Lbracket"),this._parseMultiselectList()):"Lbrace"===t?(this._match("Lbrace"),this._parseMultiselectHash()):void 0},_parseProjectionRHS:function(e){var t;if(A[this._lookahead(0)]<10)t={type:"Identity"};else if("Lbracket"===this._lookahead(0))t=this.expression(e);else if("Filter"===this._lookahead(0))t=this.expression(e);else{if("Dot"!==this._lookahead(0)){var r=this._lookaheadToken(0),s=new Error("Sytanx error, unexpected token: "+r.value+"("+r.type+")");throw s.name="ParserError",s}this._match("Dot"),t=this._parseDotRHS(e)}return t},_parseMultiselectList:function(){for(var e=[];"Rbracket"!==this._lookahead(0);){var t=this.expression(0);if(e.push(t),"Comma"===this._lookahead(0)&&(this._match("Comma"),"Rbracket"===this._lookahead(0)))throw new Error("Unexpected token Rbracket")}return this._match("Rbracket"),{type:"MultiSelectList",children:e}},_parseMultiselectHash:function(){for(var e,t,r,s,i=[],a=["UnquotedIdentifier","QuotedIdentifier"];;){if(e=this._lookaheadToken(0),a.indexOf(e.type)<0)throw new Error("Expecting an identifier token, got: "+e.type);if(t=e.value,this._advance(),this._match("Colon"),r=this.expression(0),s={type:"KeyValuePair",name:t,value:r},i.push(s),"Comma"===this._lookahead(0))this._match("Comma");else if("Rbrace"===this._lookahead(0)){this._match("Rbrace");break}}return{type:"MultiSelectHash",children:i}}},m.prototype={search:function(e,t){return this.visit(e,t)},visit:function(e,n){var o,u,p,c,m,l,d,y,b;switch(e.type){case"Field":return null===n?null:r(n)?(l=n[e.name],void 0===l?null:l):null;case"Subexpression":for(p=this.visit(e.children[0],n),b=1;b