aws-sdk-emr 1.0.0.rc8 → 1.0.0.rc9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c32572156ef70ad133eeadc96a81b4f5442c985e
4
- data.tar.gz: 3f682c5cb5ac8ba9714c717d74006125fab04526
3
+ metadata.gz: 49b5433fbe993ed6673f6de414b1eac3dca8d135
4
+ data.tar.gz: 8fd102908b3c189a1a549c1f11959f05a2e37b5b
5
5
  SHA512:
6
- metadata.gz: a6caab21b807d9251300bd2f1cf7c4ea5970dea5e7ecd7f3a82df2e10ef616a4c03f923ed98f71a8991a024a678c7c6ed794e341c57c1e625f0eeb5ddca590ed
7
- data.tar.gz: d9d387c7479973cd5e22160d6affea2c9968f375acb2a185880449fbd1134bd9b16c6fb44503f4400527aebd1b28b14cf0146291170bfed8d08e6916e331e70c
6
+ metadata.gz: 2f286017d53829114f6ad8866cbf367c996f17f74be98b3135829bf030a5210789e281aedd82b1bc3cceb4ad8d3ea8053c2be98c0f53f6740256cae8585dc7c5
7
+ data.tar.gz: b2c1d604a11b0abe7bb5bdf86fc231b64782d039919efaba82a485b3b1d242e7bd98d74cc1e6358f53fe513c4df97aa17f1a01ff4b592458e608e924859e168b
data/lib/aws-sdk-emr.rb CHANGED
@@ -43,6 +43,6 @@ require_relative 'aws-sdk-emr/customizations'
43
43
  # @service
44
44
  module Aws::EMR
45
45
 
46
- GEM_VERSION = '1.0.0.rc8'
46
+ GEM_VERSION = '1.0.0.rc9'
47
47
 
48
48
  end
@@ -584,7 +584,7 @@ module Aws::EMR
584
584
  # resp.cluster.id #=> String
585
585
  # resp.cluster.name #=> String
586
586
  # resp.cluster.status.state #=> String, one of "STARTING", "BOOTSTRAPPING", "RUNNING", "WAITING", "TERMINATING", "TERMINATED", "TERMINATED_WITH_ERRORS"
587
- # resp.cluster.status.state_change_reason.code #=> String, one of "INTERNAL_ERROR", "VALIDATION_ERROR", "INSTANCE_FAILURE", "BOOTSTRAP_FAILURE", "USER_REQUEST", "STEP_FAILURE", "ALL_STEPS_COMPLETED"
587
+ # resp.cluster.status.state_change_reason.code #=> String, one of "INTERNAL_ERROR", "VALIDATION_ERROR", "INSTANCE_FAILURE", "INSTANCE_FLEET_TIMEOUT", "BOOTSTRAP_FAILURE", "USER_REQUEST", "STEP_FAILURE", "ALL_STEPS_COMPLETED"
588
588
  # resp.cluster.status.state_change_reason.message #=> String
589
589
  # resp.cluster.status.timeline.creation_date_time #=> Time
590
590
  # resp.cluster.status.timeline.ready_date_time #=> Time
@@ -633,6 +633,9 @@ module Aws::EMR
633
633
  # resp.cluster.security_configuration #=> String
634
634
  # resp.cluster.auto_scaling_role #=> String
635
635
  # resp.cluster.scale_down_behavior #=> String, one of "TERMINATE_AT_INSTANCE_HOUR", "TERMINATE_AT_TASK_COMPLETION"
636
+ # resp.cluster.custom_ami_id #=> String
637
+ # resp.cluster.ebs_root_volume_size #=> Integer
638
+ # resp.cluster.repo_upgrade_on_boot #=> String, one of "SECURITY", "NONE"
636
639
  #
637
640
  # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeCluster AWS API Documentation
638
641
  #
@@ -932,7 +935,7 @@ module Aws::EMR
932
935
  # resp.clusters[0].id #=> String
933
936
  # resp.clusters[0].name #=> String
934
937
  # resp.clusters[0].status.state #=> String, one of "STARTING", "BOOTSTRAPPING", "RUNNING", "WAITING", "TERMINATING", "TERMINATED", "TERMINATED_WITH_ERRORS"
935
- # resp.clusters[0].status.state_change_reason.code #=> String, one of "INTERNAL_ERROR", "VALIDATION_ERROR", "INSTANCE_FAILURE", "BOOTSTRAP_FAILURE", "USER_REQUEST", "STEP_FAILURE", "ALL_STEPS_COMPLETED"
938
+ # resp.clusters[0].status.state_change_reason.code #=> String, one of "INTERNAL_ERROR", "VALIDATION_ERROR", "INSTANCE_FAILURE", "INSTANCE_FLEET_TIMEOUT", "BOOTSTRAP_FAILURE", "USER_REQUEST", "STEP_FAILURE", "ALL_STEPS_COMPLETED"
936
939
  # resp.clusters[0].status.state_change_reason.message #=> String
937
940
  # resp.clusters[0].status.timeline.creation_date_time #=> Time
938
941
  # resp.clusters[0].status.timeline.ready_date_time #=> Time
@@ -1110,11 +1113,10 @@ module Aws::EMR
1110
1113
  req.send_request(options)
1111
1114
  end
1112
1115
 
1113
- # Provides information about the cluster instances that Amazon EMR
1114
- # provisions on behalf of a user when it creates the cluster. For
1115
- # example, this operation indicates when the EC2 instances reach the
1116
- # Ready state, when instances become available to Amazon EMR to use for
1117
- # jobs, and the IP addresses for cluster instances, etc.
1116
+ # Provides information for all active EC2 instances and EC2 instances
1117
+ # terminated in the last 30 days, up to a maximum of 2,000. EC2
1118
+ # instances in any of the following states are considered active:
1119
+ # AWAITING\_FULFILLMENT, PROVISIONING, BOOTSTRAPPING, RUNNING.
1118
1120
  #
1119
1121
  # @option params [required, String] :cluster_id
1120
1122
  # The identifier of the cluster for which to list the instances.
@@ -1589,27 +1591,20 @@ module Aws::EMR
1589
1591
  # A JSON string for selecting additional features.
1590
1592
  #
1591
1593
  # @option params [String] :ami_version
1592
- # <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
1593
- # greater, use ReleaseLabel.
1594
- #
1595
- # </note>
1596
- #
1597
- # The version of the Amazon Machine Image (AMI) to use when launching
1598
- # Amazon EC2 instances in the job flow. The following values are valid:
1599
- #
1600
- # * The version number of the AMI to use, for example, "2.0."
1601
- #
1602
- # ^
1594
+ # For Amazon EMR AMI versions 3.x and 2.x. For Amazon EMR releases 4.0
1595
+ # and later, the Linux AMI is determined by the `ReleaseLabel` specified
1596
+ # or by `CustomAmiID`. The version of the Amazon Machine Image (AMI) to
1597
+ # use when launching Amazon EC2 instances in the job flow. For details
1598
+ # about the AMI versions currently supported in EMR version 3.x and 2.x,
1599
+ # see [AMI Versions Supported in
1600
+ # EMR](ElasticMapReduce/latest/DeveloperGuide/emr-dg.pdf#nameddest=ami-versions-supported)
1601
+ # in the *Amazon EMR Developer Guide*.
1603
1602
  #
1604
1603
  # If the AMI supports multiple versions of Hadoop (for example, AMI 1.0
1605
- # supports both Hadoop 0.18 and 0.20) you can use the
1604
+ # supports both Hadoop 0.18 and 0.20), you can use the
1606
1605
  # JobFlowInstancesConfig `HadoopVersion` parameter to modify the version
1607
1606
  # of Hadoop from the defaults shown above.
1608
1607
  #
1609
- # For details about the AMI versions currently supported by Amazon
1610
- # Elastic MapReduce, see [AMI Versions Supported in Elastic
1611
- # MapReduce][1] in the *Amazon Elastic MapReduce Developer Guide.*
1612
- #
1613
1608
  # <note markdown="1"> Previously, the EMR AMI version API parameter options allowed you to
1614
1609
  # use latest for the latest AMI version rather than specify a numerical
1615
1610
  # value. Some regions no longer support this deprecated option as they
@@ -1618,17 +1613,9 @@ module Aws::EMR
1618
1613
  #
1619
1614
  # </note>
1620
1615
  #
1621
- #
1622
- #
1623
- # [1]: http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/EnvironmentConfig_AMIVersion.html#ami-versions-supported
1624
- #
1625
1616
  # @option params [String] :release_label
1626
- # <note markdown="1"> Amazon EMR releases 4.x or later.
1627
- #
1628
- # </note>
1629
- #
1630
1617
  # The release label for the Amazon EMR release. For Amazon EMR 3.x and
1631
- # 2.x AMIs, use amiVersion instead instead of ReleaseLabel.
1618
+ # 2.x AMIs, use `AmiVersion` instead.
1632
1619
  #
1633
1620
  # @option params [required, Types::JobFlowInstancesConfig] :instances
1634
1621
  # A specification of the number and type of Amazon EC2 instances.
@@ -1642,7 +1629,7 @@ module Aws::EMR
1642
1629
  #
1643
1630
  # @option params [Array<String>] :supported_products
1644
1631
  # <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
1645
- # greater, use Applications.
1632
+ # later, use Applications.
1646
1633
  #
1647
1634
  # </note>
1648
1635
  #
@@ -1660,7 +1647,7 @@ module Aws::EMR
1660
1647
  #
1661
1648
  # @option params [Array<Types::SupportedProductConfig>] :new_supported_products
1662
1649
  # <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
1663
- # greater, use Applications.
1650
+ # later, use Applications.
1664
1651
  #
1665
1652
  # </note>
1666
1653
  #
@@ -1696,21 +1683,13 @@ module Aws::EMR
1696
1683
  # [1]: http://docs.aws.amazon.com/http:/docs.aws.amazon.com/emr/latest/DeveloperGuide/emr-dg.pdf
1697
1684
  #
1698
1685
  # @option params [Array<Types::Application>] :applications
1699
- # <note markdown="1"> Amazon EMR releases 4.x or later.
1700
- #
1701
- # </note>
1702
- #
1703
- # A list of applications for the cluster. Valid values are: "Hadoop",
1704
- # "Hive", "Mahout", "Pig", and "Spark." They are case
1705
- # insensitive.
1686
+ # For Amazon EMR releases 4.0 and later. A list of applications for the
1687
+ # cluster. Valid values are: "Hadoop", "Hive", "Mahout", "Pig",
1688
+ # and "Spark." They are case insensitive.
1706
1689
  #
1707
1690
  # @option params [Array<Types::Configuration>] :configurations
1708
- # <note markdown="1"> Amazon EMR releases 4.x or later.
1709
- #
1710
- # </note>
1711
- #
1712
- # The list of configurations supplied for the EMR cluster you are
1713
- # creating.
1691
+ # For Amazon EMR releases 4.0 and later. The list of configurations
1692
+ # supplied for the EMR cluster you are creating.
1714
1693
  #
1715
1694
  # @option params [Boolean] :visible_to_all_users
1716
1695
  # Whether the cluster is visible to all IAM users of the AWS account
@@ -1758,6 +1737,39 @@ module Aws::EMR
1758
1737
  # EMR version 4.1.0 and later, and is the default for versions of Amazon
1759
1738
  # EMR earlier than 5.1.0.
1760
1739
  #
1740
+ # @option params [String] :custom_ami_id
1741
+ # Available only in Amazon EMR version 5.7.0 and later. The ID of a
1742
+ # custom Amazon EBS-backed Linux AMI. If specified, Amazon EMR uses this
1743
+ # AMI when it launches cluster EC2 instances. For more information about
1744
+ # custom AMIs in Amazon EMR, see [Using a Custom AMI][1] in the *Amazon
1745
+ # EMR Management Guide*. If omitted, the cluster uses the base Linux AMI
1746
+ # for the `ReleaseLabel` specified. For Amazon EMR versions 2.x and 3.x,
1747
+ # use `AmiVersion` instead.
1748
+ #
1749
+ # For information about creating a custom AMI, see [Creating an Amazon
1750
+ # EBS-Backed Linux AMI][2] in the *Amazon Elastic Compute Cloud User
1751
+ # Guide for Linux Instances*. For information about finding an AMI ID,
1752
+ # see [Finding a Linux AMI][3].
1753
+ #
1754
+ #
1755
+ #
1756
+ # [1]: http://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-custom-ami.html
1757
+ # [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html
1758
+ # [3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html
1759
+ #
1760
+ # @option params [Integer] :ebs_root_volume_size
1761
+ # The size, in GiB, of the EBS root device volume of the Linux AMI that
1762
+ # is used for each EC2 instance. Available in Amazon EMR version 4.x and
1763
+ # later.
1764
+ #
1765
+ # @option params [String] :repo_upgrade_on_boot
1766
+ # Applies only when `CustomAmiID` is used. Specifies which updates from
1767
+ # the Amazon Linux AMI package repositories to apply automatically when
1768
+ # the instance boots using the AMI. If omitted, the default is
1769
+ # `SECURITY`, which indicates that only security updates are applied. If
1770
+ # `NONE` is specified, no updates are applied, and all updates must be
1771
+ # applied manually.
1772
+ #
1761
1773
  # @return [Types::RunJobFlowOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
1762
1774
  #
1763
1775
  # * {Types::RunJobFlowOutput#job_flow_id #job_flow_id} => String
@@ -1975,6 +1987,9 @@ module Aws::EMR
1975
1987
  # security_configuration: "XmlString",
1976
1988
  # auto_scaling_role: "XmlString",
1977
1989
  # scale_down_behavior: "TERMINATE_AT_INSTANCE_HOUR", # accepts TERMINATE_AT_INSTANCE_HOUR, TERMINATE_AT_TASK_COMPLETION
1990
+ # custom_ami_id: "XmlStringMaxLen256",
1991
+ # ebs_root_volume_size: 1,
1992
+ # repo_upgrade_on_boot: "SECURITY", # accepts SECURITY, NONE
1978
1993
  # })
1979
1994
  #
1980
1995
  # @example Response structure
@@ -2125,7 +2140,7 @@ module Aws::EMR
2125
2140
  params: params,
2126
2141
  config: config)
2127
2142
  context[:gem_name] = 'aws-sdk-emr'
2128
- context[:gem_version] = '1.0.0.rc8'
2143
+ context[:gem_version] = '1.0.0.rc9'
2129
2144
  Seahorse::Client::Request.new(handlers, context)
2130
2145
  end
2131
2146
 
@@ -173,6 +173,7 @@ module Aws::EMR
173
173
  RemoveAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyOutput')
174
174
  RemoveTagsInput = Shapes::StructureShape.new(name: 'RemoveTagsInput')
175
175
  RemoveTagsOutput = Shapes::StructureShape.new(name: 'RemoveTagsOutput')
176
+ RepoUpgradeOnBoot = Shapes::StringShape.new(name: 'RepoUpgradeOnBoot')
176
177
  ResourceId = Shapes::StringShape.new(name: 'ResourceId')
177
178
  RunJobFlowInput = Shapes::StructureShape.new(name: 'RunJobFlowInput')
178
179
  RunJobFlowOutput = Shapes::StructureShape.new(name: 'RunJobFlowOutput')
@@ -337,6 +338,9 @@ module Aws::EMR
337
338
  Cluster.add_member(:security_configuration, Shapes::ShapeRef.new(shape: XmlString, location_name: "SecurityConfiguration"))
338
339
  Cluster.add_member(:auto_scaling_role, Shapes::ShapeRef.new(shape: XmlString, location_name: "AutoScalingRole"))
339
340
  Cluster.add_member(:scale_down_behavior, Shapes::ShapeRef.new(shape: ScaleDownBehavior, location_name: "ScaleDownBehavior"))
341
+ Cluster.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
342
+ Cluster.add_member(:ebs_root_volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "EbsRootVolumeSize"))
343
+ Cluster.add_member(:repo_upgrade_on_boot, Shapes::ShapeRef.new(shape: RepoUpgradeOnBoot, location_name: "RepoUpgradeOnBoot"))
340
344
  Cluster.struct_class = Types::Cluster
341
345
 
342
346
  ClusterStateChangeReason.add_member(:code, Shapes::ShapeRef.new(shape: ClusterStateChangeReasonCode, location_name: "Code"))
@@ -848,6 +852,9 @@ module Aws::EMR
848
852
  RunJobFlowInput.add_member(:security_configuration, Shapes::ShapeRef.new(shape: XmlString, location_name: "SecurityConfiguration"))
849
853
  RunJobFlowInput.add_member(:auto_scaling_role, Shapes::ShapeRef.new(shape: XmlString, location_name: "AutoScalingRole"))
850
854
  RunJobFlowInput.add_member(:scale_down_behavior, Shapes::ShapeRef.new(shape: ScaleDownBehavior, location_name: "ScaleDownBehavior"))
855
+ RunJobFlowInput.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
856
+ RunJobFlowInput.add_member(:ebs_root_volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "EbsRootVolumeSize"))
857
+ RunJobFlowInput.add_member(:repo_upgrade_on_boot, Shapes::ShapeRef.new(shape: RepoUpgradeOnBoot, location_name: "RepoUpgradeOnBoot"))
851
858
  RunJobFlowInput.struct_class = Types::RunJobFlowInput
852
859
 
853
860
  RunJobFlowOutput.add_member(:job_flow_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "JobFlowId"))
@@ -320,7 +320,7 @@ module Aws::EMR
320
320
  # "--edition,m5" - launch the cluster using MapR M3 or M5 Edition,
321
321
  # respectively.
322
322
  #
323
- # <note markdown="1"> In Amazon EMR releases 4.0 and greater, the only accepted parameter is
323
+ # <note markdown="1"> In Amazon EMR releases 4.x and later, the only accepted parameter is
324
324
  # the application name. To pass arguments to applications, you supply a
325
325
  # configuration for each application.
326
326
  #
@@ -749,8 +749,7 @@ module Aws::EMR
749
749
  # @return [String]
750
750
  #
751
751
  # @!attribute [rw] release_label
752
- # The release label for the Amazon EMR release. For Amazon EMR 3.x and
753
- # 2.x AMIs, use amiVersion instead instead of ReleaseLabel.
752
+ # The release label for the Amazon EMR release.
754
753
  # @return [String]
755
754
  #
756
755
  # @!attribute [rw] auto_terminate
@@ -802,11 +801,8 @@ module Aws::EMR
802
801
  # @return [String]
803
802
  #
804
803
  # @!attribute [rw] configurations
805
- # <note markdown="1"> Amazon EMR releases 4.x or later.
806
- #
807
- # </note>
808
- #
809
- # The list of Configurations supplied to the EMR cluster.
804
+ # Applies only to Amazon EMR releases 4.x and later. The list of
805
+ # Configurations supplied to the EMR cluster.
810
806
  # @return [Array<Types::Configuration>]
811
807
  #
812
808
  # @!attribute [rw] security_configuration
@@ -837,6 +833,23 @@ module Aws::EMR
837
833
  # versions of Amazon EMR earlier than 5.1.0.
838
834
  # @return [String]
839
835
  #
836
+ # @!attribute [rw] custom_ami_id
837
+ # Available only in Amazon EMR version 5.7.0 and later. The ID of a
838
+ # custom Amazon EBS-backed Linux AMI if the cluster uses a custom AMI.
839
+ # @return [String]
840
+ #
841
+ # @!attribute [rw] ebs_root_volume_size
842
+ # The size, in GiB, of the EBS root device volume of the Linux AMI
843
+ # that is used for each EC2 instance. Available in Amazon EMR version
844
+ # 4.x and later.
845
+ # @return [Integer]
846
+ #
847
+ # @!attribute [rw] repo_upgrade_on_boot
848
+ # Applies only when `CustomAmiID` is used. Specifies the type of
849
+ # updates that are applied from the Amazon Linux AMI package
850
+ # repositories when an instance boots using the AMI.
851
+ # @return [String]
852
+ #
840
853
  # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/Cluster AWS API Documentation
841
854
  #
842
855
  class Cluster < Struct.new(
@@ -860,7 +873,10 @@ module Aws::EMR
860
873
  :configurations,
861
874
  :security_configuration,
862
875
  :auto_scaling_role,
863
- :scale_down_behavior)
876
+ :scale_down_behavior,
877
+ :custom_ami_id,
878
+ :ebs_root_volume_size,
879
+ :repo_upgrade_on_boot)
864
880
  include Aws::Structure
865
881
  end
866
882
 
@@ -1402,12 +1418,16 @@ module Aws::EMR
1402
1418
  # @!attribute [rw] requested_ec2_subnet_ids
1403
1419
  # Applies to clusters configured with the instance fleets option.
1404
1420
  # Specifies the unique identifier of one or more Amazon EC2 subnets in
1405
- # which to launch EC2 cluster instances. Amazon EMR chooses the EC2
1406
- # subnet with the best performance and cost characteristics from among
1407
- # the list of RequestedEc2SubnetIds and launches all cluster instances
1408
- # within that subnet. If this value is not specified, and the account
1409
- # supports EC2-Classic networks, the cluster launches instances in the
1410
- # EC2-Classic network and uses Requested
1421
+ # which to launch EC2 cluster instances. Subnets must exist within the
1422
+ # same VPC. Amazon EMR chooses the EC2 subnet with the best fit from
1423
+ # among the list of `RequestedEc2SubnetIds`, and then launches all
1424
+ # cluster instances within that Subnet. If this value is not
1425
+ # specified, and the account and region support EC2-Classic networks,
1426
+ # the cluster launches instances in the EC2-Classic network and uses
1427
+ # `RequestedEc2AvailabilityZones` instead of this setting. If
1428
+ # EC2-Classic is not supported, and no Subnet is specified, Amazon EMR
1429
+ # chooses the subnet for you. `RequestedEc2SubnetIDs` and
1430
+ # `RequestedEc2AvailabilityZones` cannot be specified together.
1411
1431
  # @return [Array<String>]
1412
1432
  #
1413
1433
  # @!attribute [rw] ec2_availability_zone
@@ -1415,12 +1435,15 @@ module Aws::EMR
1415
1435
  # @return [String]
1416
1436
  #
1417
1437
  # @!attribute [rw] requested_ec2_availability_zones
1418
- # Applies to clusters configured with the The list of availability
1419
- # zones to choose from. The service will choose the availability zone
1420
- # with the best mix of available capacity and lowest cost to launch
1421
- # the cluster. If you do not specify this value, the cluster is
1422
- # launched in any availability zone that the customer account has
1423
- # access to.
1438
+ # Applies to clusters configured with the instance fleets option.
1439
+ # Specifies one or more Availability Zones in which to launch EC2
1440
+ # cluster instances when the EC2-Classic network configuration is
1441
+ # supported. Amazon EMR chooses the Availability Zone with the best
1442
+ # fit from among the list of `RequestedEc2AvailabilityZones`, and then
1443
+ # launches all cluster instances within that Availability Zone. If you
1444
+ # do not specify this value, Amazon EMR chooses the Availability Zone
1445
+ # for you. `RequestedEc2SubnetIDs` and `RequestedEc2AvailabilityZones`
1446
+ # cannot be specified together.
1424
1447
  # @return [Array<String>]
1425
1448
  #
1426
1449
  # @!attribute [rw] iam_instance_profile
@@ -2633,7 +2656,8 @@ module Aws::EMR
2633
2656
  # The number of units that a provisioned instance of this type
2634
2657
  # provides toward fulfilling the target capacities defined in
2635
2658
  # InstanceFleetConfig. This value is 1 for a master instance fleet,
2636
- # and must be greater than 0 for core and task instance fleets.
2659
+ # and must be 1 or greater for core and task instance fleets. Defaults
2660
+ # to 1 if not specified.
2637
2661
  # @return [Integer]
2638
2662
  #
2639
2663
  # @!attribute [rw] bid_price
@@ -2645,9 +2669,9 @@ module Aws::EMR
2645
2669
  #
2646
2670
  # @!attribute [rw] bid_price_as_percentage_of_on_demand_price
2647
2671
  # The bid price, as a percentage of On-Demand price, for each EC2 Spot
2648
- # instance as defined by `InstanceType`. Expressed as a number between
2649
- # 0 and 1000 (for example, 20 specifies 20%). If neither `BidPrice`
2650
- # nor `BidPriceAsPercentageOfOnDemandPrice` is provided,
2672
+ # instance as defined by `InstanceType`. Expressed as a number (for
2673
+ # example, 20 specifies 20%). If neither `BidPrice` nor
2674
+ # `BidPriceAsPercentageOfOnDemandPrice` is provided,
2651
2675
  # `BidPriceAsPercentageOfOnDemandPrice` defaults to 100%.
2652
2676
  # @return [Float]
2653
2677
  #
@@ -2749,10 +2773,10 @@ module Aws::EMR
2749
2773
  # @return [String]
2750
2774
  #
2751
2775
  # @!attribute [rw] ami_version
2752
- # The version of the AMI used to initialize Amazon EC2 instances in
2753
- # the job flow. For a list of AMI versions currently supported by
2754
- # Amazon EMR, see [AMI Versions Supported in EMR][1] in the *Amazon
2755
- # EMR Developer Guide.*
2776
+ # Used only for version 2.x and 3.x of Amazon EMR. The version of the
2777
+ # AMI used to initialize Amazon EC2 instances in the job flow. For a
2778
+ # list of AMI versions supported by Amazon EMR, see [AMI Versions
2779
+ # Supported in EMR][1] in the *Amazon EMR Developer Guide.*
2756
2780
  #
2757
2781
  #
2758
2782
  #
@@ -4152,6 +4176,9 @@ module Aws::EMR
4152
4176
  # security_configuration: "XmlString",
4153
4177
  # auto_scaling_role: "XmlString",
4154
4178
  # scale_down_behavior: "TERMINATE_AT_INSTANCE_HOUR", # accepts TERMINATE_AT_INSTANCE_HOUR, TERMINATE_AT_TASK_COMPLETION
4179
+ # custom_ami_id: "XmlStringMaxLen256",
4180
+ # ebs_root_volume_size: 1,
4181
+ # repo_upgrade_on_boot: "SECURITY", # accepts SECURITY, NONE
4155
4182
  # }
4156
4183
  #
4157
4184
  # @!attribute [rw] name
@@ -4168,28 +4195,20 @@ module Aws::EMR
4168
4195
  # @return [String]
4169
4196
  #
4170
4197
  # @!attribute [rw] ami_version
4171
- # <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
4172
- # greater, use ReleaseLabel.
4173
- #
4174
- # </note>
4175
- #
4176
- # The version of the Amazon Machine Image (AMI) to use when launching
4177
- # Amazon EC2 instances in the job flow. The following values are
4178
- # valid:
4179
- #
4180
- # * The version number of the AMI to use, for example, "2.0."
4181
- #
4182
- # ^
4198
+ # For Amazon EMR AMI versions 3.x and 2.x. For Amazon EMR releases 4.0
4199
+ # and later, the Linux AMI is determined by the `ReleaseLabel`
4200
+ # specified or by `CustomAmiID`. The version of the Amazon Machine
4201
+ # Image (AMI) to use when launching Amazon EC2 instances in the job
4202
+ # flow. For details about the AMI versions currently supported in EMR
4203
+ # version 3.x and 2.x, see [AMI Versions Supported in
4204
+ # EMR](ElasticMapReduce/latest/DeveloperGuide/emr-dg.pdf#nameddest=ami-versions-supported)
4205
+ # in the *Amazon EMR Developer Guide*.
4183
4206
  #
4184
4207
  # If the AMI supports multiple versions of Hadoop (for example, AMI
4185
- # 1.0 supports both Hadoop 0.18 and 0.20) you can use the
4208
+ # 1.0 supports both Hadoop 0.18 and 0.20), you can use the
4186
4209
  # JobFlowInstancesConfig `HadoopVersion` parameter to modify the
4187
4210
  # version of Hadoop from the defaults shown above.
4188
4211
  #
4189
- # For details about the AMI versions currently supported by Amazon
4190
- # Elastic MapReduce, see [AMI Versions Supported in Elastic
4191
- # MapReduce][1] in the *Amazon Elastic MapReduce Developer Guide.*
4192
- #
4193
4212
  # <note markdown="1"> Previously, the EMR AMI version API parameter options allowed you to
4194
4213
  # use latest for the latest AMI version rather than specify a
4195
4214
  # numerical value. Some regions no longer support this deprecated
@@ -4198,19 +4217,11 @@ module Aws::EMR
4198
4217
  # later).
4199
4218
  #
4200
4219
  # </note>
4201
- #
4202
- #
4203
- #
4204
- # [1]: http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/EnvironmentConfig_AMIVersion.html#ami-versions-supported
4205
4220
  # @return [String]
4206
4221
  #
4207
4222
  # @!attribute [rw] release_label
4208
- # <note markdown="1"> Amazon EMR releases 4.x or later.
4209
- #
4210
- # </note>
4211
- #
4212
4223
  # The release label for the Amazon EMR release. For Amazon EMR 3.x and
4213
- # 2.x AMIs, use amiVersion instead instead of ReleaseLabel.
4224
+ # 2.x AMIs, use `AmiVersion` instead.
4214
4225
  # @return [String]
4215
4226
  #
4216
4227
  # @!attribute [rw] instances
@@ -4228,7 +4239,7 @@ module Aws::EMR
4228
4239
  #
4229
4240
  # @!attribute [rw] supported_products
4230
4241
  # <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
4231
- # greater, use Applications.
4242
+ # later, use Applications.
4232
4243
  #
4233
4244
  # </note>
4234
4245
  #
@@ -4247,7 +4258,7 @@ module Aws::EMR
4247
4258
  #
4248
4259
  # @!attribute [rw] new_supported_products
4249
4260
  # <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
4250
- # greater, use Applications.
4261
+ # later, use Applications.
4251
4262
  #
4252
4263
  # </note>
4253
4264
  #
@@ -4284,22 +4295,14 @@ module Aws::EMR
4284
4295
  # @return [Array<Types::SupportedProductConfig>]
4285
4296
  #
4286
4297
  # @!attribute [rw] applications
4287
- # <note markdown="1"> Amazon EMR releases 4.x or later.
4288
- #
4289
- # </note>
4290
- #
4291
- # A list of applications for the cluster. Valid values are:
4292
- # "Hadoop", "Hive", "Mahout", "Pig", and "Spark." They are
4293
- # case insensitive.
4298
+ # For Amazon EMR releases 4.0 and later. A list of applications for
4299
+ # the cluster. Valid values are: "Hadoop", "Hive", "Mahout",
4300
+ # "Pig", and "Spark." They are case insensitive.
4294
4301
  # @return [Array<Types::Application>]
4295
4302
  #
4296
4303
  # @!attribute [rw] configurations
4297
- # <note markdown="1"> Amazon EMR releases 4.x or later.
4298
- #
4299
- # </note>
4300
- #
4301
- # The list of configurations supplied for the EMR cluster you are
4302
- # creating.
4304
+ # For Amazon EMR releases 4.0 and later. The list of configurations
4305
+ # supplied for the EMR cluster you are creating.
4303
4306
  # @return [Array<Types::Configuration>]
4304
4307
  #
4305
4308
  # @!attribute [rw] visible_to_all_users
@@ -4356,6 +4359,42 @@ module Aws::EMR
4356
4359
  # earlier than 5.1.0.
4357
4360
  # @return [String]
4358
4361
  #
4362
+ # @!attribute [rw] custom_ami_id
4363
+ # Available only in Amazon EMR version 5.7.0 and later. The ID of a
4364
+ # custom Amazon EBS-backed Linux AMI. If specified, Amazon EMR uses
4365
+ # this AMI when it launches cluster EC2 instances. For more
4366
+ # information about custom AMIs in Amazon EMR, see [Using a Custom
4367
+ # AMI][1] in the *Amazon EMR Management Guide*. If omitted, the
4368
+ # cluster uses the base Linux AMI for the `ReleaseLabel` specified.
4369
+ # For Amazon EMR versions 2.x and 3.x, use `AmiVersion` instead.
4370
+ #
4371
+ # For information about creating a custom AMI, see [Creating an Amazon
4372
+ # EBS-Backed Linux AMI][2] in the *Amazon Elastic Compute Cloud User
4373
+ # Guide for Linux Instances*. For information about finding an AMI ID,
4374
+ # see [Finding a Linux AMI][3].
4375
+ #
4376
+ #
4377
+ #
4378
+ # [1]: http://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-custom-ami.html
4379
+ # [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html
4380
+ # [3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html
4381
+ # @return [String]
4382
+ #
4383
+ # @!attribute [rw] ebs_root_volume_size
4384
+ # The size, in GiB, of the EBS root device volume of the Linux AMI
4385
+ # that is used for each EC2 instance. Available in Amazon EMR version
4386
+ # 4.x and later.
4387
+ # @return [Integer]
4388
+ #
4389
+ # @!attribute [rw] repo_upgrade_on_boot
4390
+ # Applies only when `CustomAmiID` is used. Specifies which updates
4391
+ # from the Amazon Linux AMI package repositories to apply
4392
+ # automatically when the instance boots using the AMI. If omitted, the
4393
+ # default is `SECURITY`, which indicates that only security updates
4394
+ # are applied. If `NONE` is specified, no updates are applied, and all
4395
+ # updates must be applied manually.
4396
+ # @return [String]
4397
+ #
4359
4398
  # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RunJobFlowInput AWS API Documentation
4360
4399
  #
4361
4400
  class RunJobFlowInput < Struct.new(
@@ -4377,7 +4416,10 @@ module Aws::EMR
4377
4416
  :tags,
4378
4417
  :security_configuration,
4379
4418
  :auto_scaling_role,
4380
- :scale_down_behavior)
4419
+ :scale_down_behavior,
4420
+ :custom_ami_id,
4421
+ :ebs_root_volume_size,
4422
+ :repo_upgrade_on_boot)
4381
4423
  include Aws::Structure
4382
4424
  end
4383
4425
 
@@ -4791,8 +4833,10 @@ module Aws::EMR
4791
4833
  # The action to take when `TargetSpotCapacity` has not been fulfilled
4792
4834
  # when the `TimeoutDurationMinutes` has expired. Spot instances are
4793
4835
  # not uprovisioned within the Spot provisioining timeout. Valid values
4794
- # are `TERMINATE_CLUSTER` and `SWITCH_TO_ON_DEMAND` to fulfill the
4795
- # remaining capacity.
4836
+ # are `TERMINATE_CLUSTER` and `SWITCH_TO_ON_DEMAND`.
4837
+ # SWITCH\_TO\_ON\_DEMAND specifies that if no Spot instances are
4838
+ # available, On-Demand Instances should be provisioned to fulfill any
4839
+ # remaining Spot capacity.
4796
4840
  # @return [String]
4797
4841
  #
4798
4842
  # @!attribute [rw] block_duration_minutes
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aws-sdk-emr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc8
4
+ version: 1.0.0.rc9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Amazon Web Services
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-13 00:00:00.000000000 Z
11
+ date: 2017-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-core