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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32572156ef70ad133eeadc96a81b4f5442c985e
-  data.tar.gz: 3f682c5cb5ac8ba9714c717d74006125fab04526
+  metadata.gz: 49b5433fbe993ed6673f6de414b1eac3dca8d135
+  data.tar.gz: 8fd102908b3c189a1a549c1f11959f05a2e37b5b
 SHA512:
-  metadata.gz: a6caab21b807d9251300bd2f1cf7c4ea5970dea5e7ecd7f3a82df2e10ef616a4c03f923ed98f71a8991a024a678c7c6ed794e341c57c1e625f0eeb5ddca590ed
-  data.tar.gz: d9d387c7479973cd5e22160d6affea2c9968f375acb2a185880449fbd1134bd9b16c6fb44503f4400527aebd1b28b14cf0146291170bfed8d08e6916e331e70c
+  metadata.gz: 2f286017d53829114f6ad8866cbf367c996f17f74be98b3135829bf030a5210789e281aedd82b1bc3cceb4ad8d3ea8053c2be98c0f53f6740256cae8585dc7c5
+  data.tar.gz: b2c1d604a11b0abe7bb5bdf86fc231b64782d039919efaba82a485b3b1d242e7bd98d74cc1e6358f53fe513c4df97aa17f1a01ff4b592458e608e924859e168b

data/lib/aws-sdk-emr.rb

@@ -43,6 +43,6 @@ require_relative 'aws-sdk-emr/customizations'
 # @service
 module Aws::EMR
 
-  GEM_VERSION = '1.0.0.rc8'
+  GEM_VERSION = '1.0.0.rc9'
 
 end

data/lib/aws-sdk-emr/client.rb

@@ -584,7 +584,7 @@ module Aws::EMR
     #   resp.cluster.id #=> String
     #   resp.cluster.name #=> String
     #   resp.cluster.status.state #=> String, one of "STARTING", "BOOTSTRAPPING", "RUNNING", "WAITING", "TERMINATING", "TERMINATED", "TERMINATED_WITH_ERRORS"
-    #   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"
+    #   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"
     #   resp.cluster.status.state_change_reason.message #=> String
     #   resp.cluster.status.timeline.creation_date_time #=> Time
     #   resp.cluster.status.timeline.ready_date_time #=> Time
@@ -633,6 +633,9 @@ module Aws::EMR
     #   resp.cluster.security_configuration #=> String
     #   resp.cluster.auto_scaling_role #=> String
     #   resp.cluster.scale_down_behavior #=> String, one of "TERMINATE_AT_INSTANCE_HOUR", "TERMINATE_AT_TASK_COMPLETION"
+    #   resp.cluster.custom_ami_id #=> String
+    #   resp.cluster.ebs_root_volume_size #=> Integer
+    #   resp.cluster.repo_upgrade_on_boot #=> String, one of "SECURITY", "NONE"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeCluster AWS API Documentation
     #
@@ -932,7 +935,7 @@ module Aws::EMR
     #   resp.clusters[0].id #=> String
     #   resp.clusters[0].name #=> String
     #   resp.clusters[0].status.state #=> String, one of "STARTING", "BOOTSTRAPPING", "RUNNING", "WAITING", "TERMINATING", "TERMINATED", "TERMINATED_WITH_ERRORS"
-    #   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"
+    #   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"
     #   resp.clusters[0].status.state_change_reason.message #=> String
     #   resp.clusters[0].status.timeline.creation_date_time #=> Time
     #   resp.clusters[0].status.timeline.ready_date_time #=> Time
@@ -1110,11 +1113,10 @@ module Aws::EMR
       req.send_request(options)
     end
 
-    # Provides information about the cluster instances that Amazon EMR
-    # provisions on behalf of a user when it creates the cluster. For
-    # example, this operation indicates when the EC2 instances reach the
-    # Ready state, when instances become available to Amazon EMR to use for
-    # jobs, and the IP addresses for cluster instances, etc.
+    # Provides information for all active EC2 instances and EC2 instances
+    # terminated in the last 30 days, up to a maximum of 2,000. EC2
+    # instances in any of the following states are considered active:
+    # AWAITING\_FULFILLMENT, PROVISIONING, BOOTSTRAPPING, RUNNING.
     #
     # @option params [required, String] :cluster_id
     #   The identifier of the cluster for which to list the instances.
@@ -1589,27 +1591,20 @@ module Aws::EMR
     #   A JSON string for selecting additional features.
     #
     # @option params [String] :ami_version
-    #   <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
-    #   greater, use ReleaseLabel.
-    #
-    #    </note>
-    #
-    #   The version of the Amazon Machine Image (AMI) to use when launching
-    #   Amazon EC2 instances in the job flow. The following values are valid:
-    #
-    #   * The version number of the AMI to use, for example, "2.0."
-    #
-    #   ^
+    #   For Amazon EMR AMI versions 3.x and 2.x. For Amazon EMR releases 4.0
+    #   and later, the Linux AMI is determined by the `ReleaseLabel` specified
+    #   or by `CustomAmiID`. The version of the Amazon Machine Image (AMI) to
+    #   use when launching Amazon EC2 instances in the job flow. For details
+    #   about the AMI versions currently supported in EMR version 3.x and 2.x,
+    #   see [AMI Versions Supported in
+    #   EMR](ElasticMapReduce/latest/DeveloperGuide/emr-dg.pdf#nameddest=ami-versions-supported)
+    #   in the *Amazon EMR Developer Guide*.
     #
     #   If the AMI supports multiple versions of Hadoop (for example, AMI 1.0
-    #   supports both Hadoop 0.18 and 0.20) you can use the
+    #   supports both Hadoop 0.18 and 0.20), you can use the
     #   JobFlowInstancesConfig `HadoopVersion` parameter to modify the version
     #   of Hadoop from the defaults shown above.
     #
-    #   For details about the AMI versions currently supported by Amazon
-    #   Elastic MapReduce, see [AMI Versions Supported in Elastic
-    #   MapReduce][1] in the *Amazon Elastic MapReduce Developer Guide.*
-    #
     #   <note markdown="1"> Previously, the EMR AMI version API parameter options allowed you to
     #   use latest for the latest AMI version rather than specify a numerical
     #   value. Some regions no longer support this deprecated option as they
@@ -1618,17 +1613,9 @@ module Aws::EMR
     #
     #    </note>
     #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/EnvironmentConfig_AMIVersion.html#ami-versions-supported
-    #
     # @option params [String] :release_label
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
     #   The release label for the Amazon EMR release. For Amazon EMR 3.x and
-    #   2.x AMIs, use amiVersion instead instead of ReleaseLabel.
+    #   2.x AMIs, use `AmiVersion` instead.
     #
     # @option params [required, Types::JobFlowInstancesConfig] :instances
     #   A specification of the number and type of Amazon EC2 instances.
@@ -1642,7 +1629,7 @@ module Aws::EMR
     #
     # @option params [Array<String>] :supported_products
     #   <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
-    #   greater, use Applications.
+    #   later, use Applications.
     #
     #    </note>
     #
@@ -1660,7 +1647,7 @@ module Aws::EMR
     #
     # @option params [Array<Types::SupportedProductConfig>] :new_supported_products
     #   <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
-    #   greater, use Applications.
+    #   later, use Applications.
     #
     #    </note>
     #
@@ -1696,21 +1683,13 @@ module Aws::EMR
     #   [1]: http://docs.aws.amazon.com/http:/docs.aws.amazon.com/emr/latest/DeveloperGuide/emr-dg.pdf
     #
     # @option params [Array<Types::Application>] :applications
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
-    #   A list of applications for the cluster. Valid values are: "Hadoop",
-    #   "Hive", "Mahout", "Pig", and "Spark." They are case
-    #   insensitive.
+    #   For Amazon EMR releases 4.0 and later. A list of applications for the
+    #   cluster. Valid values are: "Hadoop", "Hive", "Mahout", "Pig",
+    #   and "Spark." They are case insensitive.
     #
     # @option params [Array<Types::Configuration>] :configurations
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
-    #   The list of configurations supplied for the EMR cluster you are
-    #   creating.
+    #   For Amazon EMR releases 4.0 and later. The list of configurations
+    #   supplied for the EMR cluster you are creating.
     #
     # @option params [Boolean] :visible_to_all_users
     #   Whether the cluster is visible to all IAM users of the AWS account
@@ -1758,6 +1737,39 @@ module Aws::EMR
     #   EMR version 4.1.0 and later, and is the default for versions of Amazon
     #   EMR earlier than 5.1.0.
     #
+    # @option params [String] :custom_ami_id
+    #   Available only in Amazon EMR version 5.7.0 and later. The ID of a
+    #   custom Amazon EBS-backed Linux AMI. If specified, Amazon EMR uses this
+    #   AMI when it launches cluster EC2 instances. For more information about
+    #   custom AMIs in Amazon EMR, see [Using a Custom AMI][1] in the *Amazon
+    #   EMR Management Guide*. If omitted, the cluster uses the base Linux AMI
+    #   for the `ReleaseLabel` specified. For Amazon EMR versions 2.x and 3.x,
+    #   use `AmiVersion` instead.
+    #
+    #   For information about creating a custom AMI, see [Creating an Amazon
+    #   EBS-Backed Linux AMI][2] in the *Amazon Elastic Compute Cloud User
+    #   Guide for Linux Instances*. For information about finding an AMI ID,
+    #   see [Finding a Linux AMI][3].
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-custom-ami.html
+    #   [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html
+    #   [3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html
+    #
+    # @option params [Integer] :ebs_root_volume_size
+    #   The size, in GiB, of the EBS root device volume of the Linux AMI that
+    #   is used for each EC2 instance. Available in Amazon EMR version 4.x and
+    #   later.
+    #
+    # @option params [String] :repo_upgrade_on_boot
+    #   Applies only when `CustomAmiID` is used. Specifies which updates from
+    #   the Amazon Linux AMI package repositories to apply automatically when
+    #   the instance boots using the AMI. If omitted, the default is
+    #   `SECURITY`, which indicates that only security updates are applied. If
+    #   `NONE` is specified, no updates are applied, and all updates must be
+    #   applied manually.
+    #
     # @return [Types::RunJobFlowOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::RunJobFlowOutput#job_flow_id #job_flow_id} => String
@@ -1975,6 +1987,9 @@ module Aws::EMR
     #     security_configuration: "XmlString",
     #     auto_scaling_role: "XmlString",
     #     scale_down_behavior: "TERMINATE_AT_INSTANCE_HOUR", # accepts TERMINATE_AT_INSTANCE_HOUR, TERMINATE_AT_TASK_COMPLETION
+    #     custom_ami_id: "XmlStringMaxLen256",
+    #     ebs_root_volume_size: 1,
+    #     repo_upgrade_on_boot: "SECURITY", # accepts SECURITY, NONE
     #   })
     #
     # @example Response structure
@@ -2125,7 +2140,7 @@ module Aws::EMR
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-emr'
-      context[:gem_version] = '1.0.0.rc8'
+      context[:gem_version] = '1.0.0.rc9'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-emr/client_api.rb

@@ -173,6 +173,7 @@ module Aws::EMR
     RemoveAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyOutput')
     RemoveTagsInput = Shapes::StructureShape.new(name: 'RemoveTagsInput')
     RemoveTagsOutput = Shapes::StructureShape.new(name: 'RemoveTagsOutput')
+    RepoUpgradeOnBoot = Shapes::StringShape.new(name: 'RepoUpgradeOnBoot')
     ResourceId = Shapes::StringShape.new(name: 'ResourceId')
     RunJobFlowInput = Shapes::StructureShape.new(name: 'RunJobFlowInput')
     RunJobFlowOutput = Shapes::StructureShape.new(name: 'RunJobFlowOutput')
@@ -337,6 +338,9 @@ module Aws::EMR
     Cluster.add_member(:security_configuration, Shapes::ShapeRef.new(shape: XmlString, location_name: "SecurityConfiguration"))
     Cluster.add_member(:auto_scaling_role, Shapes::ShapeRef.new(shape: XmlString, location_name: "AutoScalingRole"))
     Cluster.add_member(:scale_down_behavior, Shapes::ShapeRef.new(shape: ScaleDownBehavior, location_name: "ScaleDownBehavior"))
+    Cluster.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
+    Cluster.add_member(:ebs_root_volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "EbsRootVolumeSize"))
+    Cluster.add_member(:repo_upgrade_on_boot, Shapes::ShapeRef.new(shape: RepoUpgradeOnBoot, location_name: "RepoUpgradeOnBoot"))
     Cluster.struct_class = Types::Cluster
 
     ClusterStateChangeReason.add_member(:code, Shapes::ShapeRef.new(shape: ClusterStateChangeReasonCode, location_name: "Code"))
@@ -848,6 +852,9 @@ module Aws::EMR
     RunJobFlowInput.add_member(:security_configuration, Shapes::ShapeRef.new(shape: XmlString, location_name: "SecurityConfiguration"))
     RunJobFlowInput.add_member(:auto_scaling_role, Shapes::ShapeRef.new(shape: XmlString, location_name: "AutoScalingRole"))
     RunJobFlowInput.add_member(:scale_down_behavior, Shapes::ShapeRef.new(shape: ScaleDownBehavior, location_name: "ScaleDownBehavior"))
+    RunJobFlowInput.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
+    RunJobFlowInput.add_member(:ebs_root_volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "EbsRootVolumeSize"))
+    RunJobFlowInput.add_member(:repo_upgrade_on_boot, Shapes::ShapeRef.new(shape: RepoUpgradeOnBoot, location_name: "RepoUpgradeOnBoot"))
     RunJobFlowInput.struct_class = Types::RunJobFlowInput
 
     RunJobFlowOutput.add_member(:job_flow_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "JobFlowId"))

data/lib/aws-sdk-emr/types.rb

@@ -320,7 +320,7 @@ module Aws::EMR
     #   "--edition,m5" - launch the cluster using MapR M3 or M5 Edition,
     #   respectively.
     #
-    # <note markdown="1"> In Amazon EMR releases 4.0 and greater, the only accepted parameter is
+    # <note markdown="1"> In Amazon EMR releases 4.x and later, the only accepted parameter is
     # the application name. To pass arguments to applications, you supply a
     # configuration for each application.
     #
@@ -749,8 +749,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] release_label
-    #   The release label for the Amazon EMR release. For Amazon EMR 3.x and
-    #   2.x AMIs, use amiVersion instead instead of ReleaseLabel.
+    #   The release label for the Amazon EMR release.
     #   @return [String]
     #
     # @!attribute [rw] auto_terminate
@@ -802,11 +801,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] configurations
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
-    #   The list of Configurations supplied to the EMR cluster.
+    #   Applies only to Amazon EMR releases 4.x and later. The list of
+    #   Configurations supplied to the EMR cluster.
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] security_configuration
@@ -837,6 +833,23 @@ module Aws::EMR
     #   versions of Amazon EMR earlier than 5.1.0.
     #   @return [String]
     #
+    # @!attribute [rw] custom_ami_id
+    #   Available only in Amazon EMR version 5.7.0 and later. The ID of a
+    #   custom Amazon EBS-backed Linux AMI if the cluster uses a custom AMI.
+    #   @return [String]
+    #
+    # @!attribute [rw] ebs_root_volume_size
+    #   The size, in GiB, of the EBS root device volume of the Linux AMI
+    #   that is used for each EC2 instance. Available in Amazon EMR version
+    #   4.x and later.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] repo_upgrade_on_boot
+    #   Applies only when `CustomAmiID` is used. Specifies the type of
+    #   updates that are applied from the Amazon Linux AMI package
+    #   repositories when an instance boots using the AMI.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/Cluster AWS API Documentation
     #
     class Cluster < Struct.new(
@@ -860,7 +873,10 @@ module Aws::EMR
       :configurations,
       :security_configuration,
       :auto_scaling_role,
-      :scale_down_behavior)
+      :scale_down_behavior,
+      :custom_ami_id,
+      :ebs_root_volume_size,
+      :repo_upgrade_on_boot)
       include Aws::Structure
     end
 
@@ -1402,12 +1418,16 @@ module Aws::EMR
     # @!attribute [rw] requested_ec2_subnet_ids
     #   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
+    #   which to launch EC2 cluster instances. Subnets must exist within the
+    #   same VPC. Amazon EMR chooses the EC2 subnet with the best fit from
+    #   among the list of `RequestedEc2SubnetIds`, and then launches all
+    #   cluster instances within that Subnet. If this value is not
+    #   specified, and the account and region support EC2-Classic networks,
+    #   the cluster launches instances in the EC2-Classic network and uses
+    #   `RequestedEc2AvailabilityZones` instead of this setting. If
+    #   EC2-Classic is not supported, and no Subnet is specified, Amazon EMR
+    #   chooses the subnet for you. `RequestedEc2SubnetIDs` and
+    #   `RequestedEc2AvailabilityZones` cannot be specified together.
     #   @return [Array<String>]
     #
     # @!attribute [rw] ec2_availability_zone
@@ -1415,12 +1435,15 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] requested_ec2_availability_zones
-    #   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.
+    #   Applies to clusters configured with the instance fleets option.
+    #   Specifies one or more Availability Zones in which to launch EC2
+    #   cluster instances when the EC2-Classic network configuration is
+    #   supported. Amazon EMR chooses the Availability Zone with the best
+    #   fit from among the list of `RequestedEc2AvailabilityZones`, and then
+    #   launches all cluster instances within that Availability Zone. If you
+    #   do not specify this value, Amazon EMR chooses the Availability Zone
+    #   for you. `RequestedEc2SubnetIDs` and `RequestedEc2AvailabilityZones`
+    #   cannot be specified together.
     #   @return [Array<String>]
     #
     # @!attribute [rw] iam_instance_profile
@@ -2633,7 +2656,8 @@ module Aws::EMR
     #   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.
+    #   and must be 1 or greater for core and task instance fleets. Defaults
+    #   to 1 if not specified.
     #   @return [Integer]
     #
     # @!attribute [rw] bid_price
@@ -2645,9 +2669,9 @@ module Aws::EMR
     #
     # @!attribute [rw] bid_price_as_percentage_of_on_demand_price
     #   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,
+    #   instance as defined by `InstanceType`. Expressed as a number (for
+    #   example, 20 specifies 20%). If neither `BidPrice` nor
+    #   `BidPriceAsPercentageOfOnDemandPrice` is provided,
     #   `BidPriceAsPercentageOfOnDemandPrice` defaults to 100%.
     #   @return [Float]
     #
@@ -2749,10 +2773,10 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] ami_version
-    #   The version of the AMI used to initialize Amazon EC2 instances in
-    #   the job flow. For a list of AMI versions currently supported by
-    #   Amazon EMR, see [AMI Versions Supported in EMR][1] in the *Amazon
-    #   EMR Developer Guide.*
+    #   Used only for version 2.x and 3.x of Amazon EMR. The version of the
+    #   AMI used to initialize Amazon EC2 instances in the job flow. For a
+    #   list of AMI versions supported by Amazon EMR, see [AMI Versions
+    #   Supported in EMR][1] in the *Amazon EMR Developer Guide.*
     #
     #
     #
@@ -4152,6 +4176,9 @@ module Aws::EMR
     #         security_configuration: "XmlString",
     #         auto_scaling_role: "XmlString",
     #         scale_down_behavior: "TERMINATE_AT_INSTANCE_HOUR", # accepts TERMINATE_AT_INSTANCE_HOUR, TERMINATE_AT_TASK_COMPLETION
+    #         custom_ami_id: "XmlStringMaxLen256",
+    #         ebs_root_volume_size: 1,
+    #         repo_upgrade_on_boot: "SECURITY", # accepts SECURITY, NONE
     #       }
     #
     # @!attribute [rw] name
@@ -4168,28 +4195,20 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] ami_version
-    #   <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
-    #   greater, use ReleaseLabel.
-    #
-    #    </note>
-    #
-    #   The version of the Amazon Machine Image (AMI) to use when launching
-    #   Amazon EC2 instances in the job flow. The following values are
-    #   valid:
-    #
-    #   * The version number of the AMI to use, for example, "2.0."
-    #
-    #   ^
+    #   For Amazon EMR AMI versions 3.x and 2.x. For Amazon EMR releases 4.0
+    #   and later, the Linux AMI is determined by the `ReleaseLabel`
+    #   specified or by `CustomAmiID`. The version of the Amazon Machine
+    #   Image (AMI) to use when launching Amazon EC2 instances in the job
+    #   flow. For details about the AMI versions currently supported in EMR
+    #   version 3.x and 2.x, see [AMI Versions Supported in
+    #   EMR](ElasticMapReduce/latest/DeveloperGuide/emr-dg.pdf#nameddest=ami-versions-supported)
+    #   in the *Amazon EMR Developer Guide*.
     #
     #   If the AMI supports multiple versions of Hadoop (for example, AMI
-    #   1.0 supports both Hadoop 0.18 and 0.20) you can use the
+    #   1.0 supports both Hadoop 0.18 and 0.20), you can use the
     #   JobFlowInstancesConfig `HadoopVersion` parameter to modify the
     #   version of Hadoop from the defaults shown above.
     #
-    #   For details about the AMI versions currently supported by Amazon
-    #   Elastic MapReduce, see [AMI Versions Supported in Elastic
-    #   MapReduce][1] in the *Amazon Elastic MapReduce Developer Guide.*
-    #
     #   <note markdown="1"> Previously, the EMR AMI version API parameter options allowed you to
     #   use latest for the latest AMI version rather than specify a
     #   numerical value. Some regions no longer support this deprecated
@@ -4198,19 +4217,11 @@ module Aws::EMR
     #   later).
     #
     #    </note>
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/EnvironmentConfig_AMIVersion.html#ami-versions-supported
     #   @return [String]
     #
     # @!attribute [rw] release_label
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
     #   The release label for the Amazon EMR release. For Amazon EMR 3.x and
-    #   2.x AMIs, use amiVersion instead instead of ReleaseLabel.
+    #   2.x AMIs, use `AmiVersion` instead.
     #   @return [String]
     #
     # @!attribute [rw] instances
@@ -4228,7 +4239,7 @@ module Aws::EMR
     #
     # @!attribute [rw] supported_products
     #   <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
-    #   greater, use Applications.
+    #   later, use Applications.
     #
     #    </note>
     #
@@ -4247,7 +4258,7 @@ module Aws::EMR
     #
     # @!attribute [rw] new_supported_products
     #   <note markdown="1"> For Amazon EMR releases 3.x and 2.x. For Amazon EMR releases 4.x and
-    #   greater, use Applications.
+    #   later, use Applications.
     #
     #    </note>
     #
@@ -4284,22 +4295,14 @@ module Aws::EMR
     #   @return [Array<Types::SupportedProductConfig>]
     #
     # @!attribute [rw] applications
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
-    #   A list of applications for the cluster. Valid values are:
-    #   "Hadoop", "Hive", "Mahout", "Pig", and "Spark." They are
-    #   case insensitive.
+    #   For Amazon EMR releases 4.0 and later. A list of applications for
+    #   the cluster. Valid values are: "Hadoop", "Hive", "Mahout",
+    #   "Pig", and "Spark." They are case insensitive.
     #   @return [Array<Types::Application>]
     #
     # @!attribute [rw] configurations
-    #   <note markdown="1"> Amazon EMR releases 4.x or later.
-    #
-    #    </note>
-    #
-    #   The list of configurations supplied for the EMR cluster you are
-    #   creating.
+    #   For Amazon EMR releases 4.0 and later. The list of configurations
+    #   supplied for the EMR cluster you are creating.
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] visible_to_all_users
@@ -4356,6 +4359,42 @@ module Aws::EMR
     #   earlier than 5.1.0.
     #   @return [String]
     #
+    # @!attribute [rw] custom_ami_id
+    #   Available only in Amazon EMR version 5.7.0 and later. The ID of a
+    #   custom Amazon EBS-backed Linux AMI. If specified, Amazon EMR uses
+    #   this AMI when it launches cluster EC2 instances. For more
+    #   information about custom AMIs in Amazon EMR, see [Using a Custom
+    #   AMI][1] in the *Amazon EMR Management Guide*. If omitted, the
+    #   cluster uses the base Linux AMI for the `ReleaseLabel` specified.
+    #   For Amazon EMR versions 2.x and 3.x, use `AmiVersion` instead.
+    #
+    #   For information about creating a custom AMI, see [Creating an Amazon
+    #   EBS-Backed Linux AMI][2] in the *Amazon Elastic Compute Cloud User
+    #   Guide for Linux Instances*. For information about finding an AMI ID,
+    #   see [Finding a Linux AMI][3].
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-custom-ami.html
+    #   [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html
+    #   [3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html
+    #   @return [String]
+    #
+    # @!attribute [rw] ebs_root_volume_size
+    #   The size, in GiB, of the EBS root device volume of the Linux AMI
+    #   that is used for each EC2 instance. Available in Amazon EMR version
+    #   4.x and later.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] repo_upgrade_on_boot
+    #   Applies only when `CustomAmiID` is used. Specifies which updates
+    #   from the Amazon Linux AMI package repositories to apply
+    #   automatically when the instance boots using the AMI. If omitted, the
+    #   default is `SECURITY`, which indicates that only security updates
+    #   are applied. If `NONE` is specified, no updates are applied, and all
+    #   updates must be applied manually.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RunJobFlowInput AWS API Documentation
     #
     class RunJobFlowInput < Struct.new(
@@ -4377,7 +4416,10 @@ module Aws::EMR
       :tags,
       :security_configuration,
       :auto_scaling_role,
-      :scale_down_behavior)
+      :scale_down_behavior,
+      :custom_ami_id,
+      :ebs_root_volume_size,
+      :repo_upgrade_on_boot)
       include Aws::Structure
     end
 
@@ -4791,8 +4833,10 @@ module Aws::EMR
     #   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.
+    #   are `TERMINATE_CLUSTER` and `SWITCH_TO_ON_DEMAND`.
+    #   SWITCH\_TO\_ON\_DEMAND specifies that if no Spot instances are
+    #   available, On-Demand Instances should be provisioned to fulfill any
+    #   remaining Spot capacity.
     #   @return [String]
     #
     # @!attribute [rw] block_duration_minutes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-emr
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc8
+  version: 1.0.0.rc9
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core