aws-sdk-emr 1.24.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f56f854611ded02ec8be6a54e646515a86badba8
-  data.tar.gz: dc1ad869e3a30b1267c9d551b04d21690decc0f7
+SHA256:
+  metadata.gz: 1bc429540019308bec8868576b4df89f48a27f73e5cc911257dd0996b469abe5
+  data.tar.gz: f3245930a91c047b1b4c29f4e48c75a3fd00b76487146a6574448bf40712eddd
 SHA512:
-  metadata.gz: a0da4021037aeef2bcd6966de5f0f3e6b45534b8b26481a149df150ea5483342c63e2fc86cc273e2aa1454808575816d523b0d1e9a742815e4397d5d34338f28
-  data.tar.gz: c3468c1750df2fe793431898263266e6205fe2e4e0a5c1a16f4475dea1d40a176b7d31ac0d9c6a2ecc44346177022771da8ae996f14798c51361c42e9c100bba
+  metadata.gz: e9e1fe989a4eb077facc5fcd1dc72dcee5c78d584cf6fca821a4b0155037f6d236568ce0e256b3abe66a2dfa7029b39b5127ab9adc526cd98a71e3bc5b08f0bc
+  data.tar.gz: 4d199973ed0919218a134666e89a0060d8f65707c3b113976ded2f4f67c7e436bd8887d569c263e579b5ded433b1d1fb591844b56fa8cd722a136d340c4806df

data/lib/aws-sdk-emr.rb

@@ -25,17 +25,20 @@ require_relative 'aws-sdk-emr/customizations'
 # methods each accept a hash of request parameters and return a response
 # structure.
 #
+#     emr = Aws::EMR::Client.new
+#     resp = emr.add_instance_fleet(params)
+#
 # See {Client} for more information.
 #
 # # Errors
 #
-# Errors returned from Amazon Elastic MapReduce all
-# extend {Errors::ServiceError}.
+# Errors returned from Amazon Elastic MapReduce are defined in the
+# {Errors} module and all extend {Errors::ServiceError}.
 #
 #     begin
 #       # do stuff
 #     rescue Aws::EMR::Errors::ServiceError
-#       # rescues all service API errors
+#       # rescues all Amazon Elastic MapReduce API errors
 #     end
 #
 # See {Errors} for more information.
@@ -43,6 +46,6 @@ require_relative 'aws-sdk-emr/customizations'
 # @service
 module Aws::EMR
 
-  GEM_VERSION = '1.24.0'
+  GEM_VERSION = '1.29.0'
 
 end

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

@@ -30,6 +30,18 @@ require 'aws-sdk-core/plugins/protocols/json_rpc.rb'
 Aws::Plugins::GlobalConfiguration.add_identifier(:emr)
 
 module Aws::EMR
+  # An API client for EMR.  To construct a client, you need to configure a `:region` and `:credentials`.
+  #
+  #     client = Aws::EMR::Client.new(
+  #       region: region_name,
+  #       credentials: credentials,
+  #       # ...
+  #     )
+  #
+  # For details on configuring region and credentials see
+  # the [developer guide](/sdk-for-ruby/v3/developer-guide/setup-config.html).
+  #
+  # See {#initialize} for a full list of supported configuration options.
   class Client < Seahorse::Client::Base
 
     include Aws::ClientStubs
@@ -93,7 +105,7 @@ module Aws::EMR
     #   @option options [required, String] :region
     #     The AWS region to connect to.  The configured `:region` is
     #     used to determine the service `:endpoint`. When not passed,
-    #     a default `:region` is search for in the following locations:
+    #     a default `:region` is searched for in the following locations:
     #
     #     * `Aws.config[:region]`
     #     * `ENV['AWS_REGION']`
@@ -108,6 +120,12 @@ module Aws::EMR
     #     When set to `true`, a thread polling for endpoints will be running in
     #     the background every 60 secs (default). Defaults to `false`.
     #
+    #   @option options [Boolean] :adaptive_retry_wait_to_fill (true)
+    #     Used only in `adaptive` retry mode.  When true, the request will sleep
+    #     until there is sufficent client side capacity to retry the request.
+    #     When false, the request will raise a `RetryCapacityNotAvailableError` and will
+    #     not retry instead of sleeping.
+    #
     #   @option options [Boolean] :client_side_monitoring (false)
     #     When `true`, client-side metrics will be collected for all API requests from
     #     this client.
@@ -132,6 +150,10 @@ module Aws::EMR
     #     When `true`, an attempt is made to coerce request parameters into
     #     the required types.
     #
+    #   @option options [Boolean] :correct_clock_skew (true)
+    #     Used only in `standard` and adaptive retry modes. Specifies whether to apply
+    #     a clock skew correction and retry requests with skewed client clocks.
+    #
     #   @option options [Boolean] :disable_host_prefix_injection (false)
     #     Set to true to disable SDK automatically adding host prefix
     #     to default service endpoint when available.
@@ -139,7 +161,7 @@ module Aws::EMR
     #   @option options [String] :endpoint
     #     The client endpoint is normally constructed from the `:region`
     #     option. You should only configure an `:endpoint` when connecting
-    #     to test endpoints. This should be avalid HTTP(S) URI.
+    #     to test endpoints. This should be a valid HTTP(S) URI.
     #
     #   @option options [Integer] :endpoint_cache_max_entries (1000)
     #     Used for the maximum size limit of the LRU cache storing endpoints data
@@ -154,7 +176,7 @@ module Aws::EMR
     #     requests fetching endpoints information. Defaults to 60 sec.
     #
     #   @option options [Boolean] :endpoint_discovery (false)
-    #     When set to `true`, endpoint discovery will be enabled for operations when available. Defaults to `false`.
+    #     When set to `true`, endpoint discovery will be enabled for operations when available.
     #
     #   @option options [Aws::Log::Formatter] :log_formatter (Aws::Log::Formatter.default)
     #     The log formatter.
@@ -166,15 +188,29 @@ module Aws::EMR
     #     The Logger instance to send log messages to.  If this option
     #     is not set, logging will be disabled.
     #
+    #   @option options [Integer] :max_attempts (3)
+    #     An integer representing the maximum number attempts that will be made for
+    #     a single request, including the initial attempt.  For example,
+    #     setting this value to 5 will result in a request being retried up to
+    #     4 times. Used in `standard` and `adaptive` retry modes.
+    #
     #   @option options [String] :profile ("default")
     #     Used when loading credentials from the shared credentials file
     #     at HOME/.aws/credentials.  When not specified, 'default' is used.
     #
+    #   @option options [Proc] :retry_backoff
+    #     A proc or lambda used for backoff. Defaults to 2**retries * retry_base_delay.
+    #     This option is only used in the `legacy` retry mode.
+    #
     #   @option options [Float] :retry_base_delay (0.3)
-    #     The base delay in seconds used by the default backoff function.
+    #     The base delay in seconds used by the default backoff function. This option
+    #     is only used in the `legacy` retry mode.
     #
     #   @option options [Symbol] :retry_jitter (:none)
-    #     A delay randomiser function used by the default backoff function. Some predefined functions can be referenced by name - :none, :equal, :full, otherwise a Proc that takes and returns a number.
+    #     A delay randomiser function used by the default backoff function.
+    #     Some predefined functions can be referenced by name - :none, :equal, :full,
+    #     otherwise a Proc that takes and returns a number. This option is only used
+    #     in the `legacy` retry mode.
     #
     #     @see https://www.awsarchitectureblog.com/2015/03/backoff.html
     #
@@ -182,11 +218,30 @@ module Aws::EMR
     #     The maximum number of times to retry failed requests.  Only
     #     ~ 500 level server errors and certain ~ 400 level client errors
     #     are retried.  Generally, these are throttling errors, data
-    #     checksum errors, networking errors, timeout errors and auth
-    #     errors from expired credentials.
+    #     checksum errors, networking errors, timeout errors, auth errors,
+    #     endpoint discovery, and errors from expired credentials.
+    #     This option is only used in the `legacy` retry mode.
     #
     #   @option options [Integer] :retry_max_delay (0)
-    #     The maximum number of seconds to delay between retries (0 for no limit) used by the default backoff function.
+    #     The maximum number of seconds to delay between retries (0 for no limit)
+    #     used by the default backoff function. This option is only used in the
+    #     `legacy` retry mode.
+    #
+    #   @option options [String] :retry_mode ("legacy")
+    #     Specifies which retry algorithm to use. Values are:
+    #
+    #     * `legacy` - The pre-existing retry behavior.  This is default value if
+    #       no retry mode is provided.
+    #
+    #     * `standard` - A standardized set of retry rules across the AWS SDKs.
+    #       This includes support for retry quotas, which limit the number of
+    #       unsuccessful retries a client can make.
+    #
+    #     * `adaptive` - An experimental retry mode that includes all the
+    #       functionality of `standard` mode along with automatic client side
+    #       throttling.  This is a provisional mode that may change behavior
+    #       in the future.
+    #
     #
     #   @option options [String] :secret_access_key
     #
@@ -219,16 +274,15 @@ module Aws::EMR
     #     requests through.  Formatted like 'http://proxy.com:123'.
     #
     #   @option options [Float] :http_open_timeout (15) The number of
-    #     seconds to wait when opening a HTTP session before rasing a
+    #     seconds to wait when opening a HTTP session before raising a
     #     `Timeout::Error`.
     #
     #   @option options [Integer] :http_read_timeout (60) The default
     #     number of seconds to wait for response data.  This value can
-    #     safely be set
-    #     per-request on the session yeidled by {#session_for}.
+    #     safely be set per-request on the session.
     #
     #   @option options [Float] :http_idle_timeout (5) The number of
-    #     seconds a connection is allowed to sit idble before it is
+    #     seconds a connection is allowed to sit idle before it is
     #     considered stale.  Stale connections are closed and removed
     #     from the pool before making a request.
     #
@@ -237,7 +291,7 @@ module Aws::EMR
     #     request body.  This option has no effect unless the request has
     #     "Expect" header set to "100-continue".  Defaults to `nil` which
     #     disables this behaviour.  This value can safely be set per
-    #     request on the session yeidled by {#session_for}.
+    #     request on the session.
     #
     #   @option options [Boolean] :http_wire_trace (false) When `true`,
     #     HTTP debug output will be sent to the `:logger`.
@@ -729,6 +783,7 @@ module Aws::EMR
     #   resp.cluster.ec2_instance_attributes.additional_slave_security_groups[0] #=> String
     #   resp.cluster.instance_collection_type #=> String, one of "INSTANCE_FLEET", "INSTANCE_GROUP"
     #   resp.cluster.log_uri #=> String
+    #   resp.cluster.log_encryption_kms_key_id #=> String
     #   resp.cluster.requested_ami_version #=> String
     #   resp.cluster.running_ami_version #=> String
     #   resp.cluster.release_label #=> String
@@ -765,8 +820,14 @@ module Aws::EMR
     #   resp.cluster.kerberos_attributes.ad_domain_join_user #=> String
     #   resp.cluster.kerberos_attributes.ad_domain_join_password #=> String
     #   resp.cluster.cluster_arn #=> String
-    #   resp.cluster.step_concurrency_level #=> Integer
     #   resp.cluster.outpost_arn #=> String
+    #   resp.cluster.step_concurrency_level #=> Integer
+    #
+    #
+    # The following waiters are defined for this operation (see {Client#wait_until} for detailed usage):
+    #
+    #   * cluster_running
+    #   * cluster_terminated
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeCluster AWS API Documentation
     #
@@ -830,6 +891,7 @@ module Aws::EMR
     #   resp.job_flows[0].job_flow_id #=> String
     #   resp.job_flows[0].name #=> String
     #   resp.job_flows[0].log_uri #=> String
+    #   resp.job_flows[0].log_encryption_kms_key_id #=> String
     #   resp.job_flows[0].ami_version #=> String
     #   resp.job_flows[0].execution_status_detail.state #=> String, one of "STARTING", "BOOTSTRAPPING", "RUNNING", "WAITING", "SHUTTING_DOWN", "TERMINATED", "COMPLETED", "FAILED"
     #   resp.job_flows[0].execution_status_detail.creation_date_time #=> Time
@@ -976,6 +1038,11 @@ module Aws::EMR
     #   resp.step.status.timeline.start_date_time #=> Time
     #   resp.step.status.timeline.end_date_time #=> Time
     #
+    #
+    # The following waiters are defined for this operation (see {Client#wait_until} for detailed usage):
+    #
+    #   * step_complete
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeStep AWS API Documentation
     #
     # @overload describe_step(params = {})
@@ -1017,6 +1084,38 @@ module Aws::EMR
       req.send_request(options)
     end
 
+    # Fetches the attached managed scaling policy for an Amazon EMR cluster.
+    #
+    # @option params [required, String] :cluster_id
+    #   Specifies the ID of the cluster for which the managed scaling policy
+    #   will be fetched.
+    #
+    # @return [Types::GetManagedScalingPolicyOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetManagedScalingPolicyOutput#managed_scaling_policy #managed_scaling_policy} => Types::ManagedScalingPolicy
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_managed_scaling_policy({
+    #     cluster_id: "ClusterId", # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.managed_scaling_policy.compute_limits.unit_type #=> String, one of "InstanceFleetUnits", "Instances", "VCPU"
+    #   resp.managed_scaling_policy.compute_limits.minimum_capacity_units #=> Integer
+    #   resp.managed_scaling_policy.compute_limits.maximum_capacity_units #=> Integer
+    #   resp.managed_scaling_policy.compute_limits.maximum_on_demand_capacity_units #=> Integer
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetManagedScalingPolicy AWS API Documentation
+    #
+    # @overload get_managed_scaling_policy(params = {})
+    # @param [Hash] params ({})
+    def get_managed_scaling_policy(params = {}, options = {})
+      req = build_request(:get_managed_scaling_policy, params)
+      req.send_request(options)
+    end
+
     # Provides information about the bootstrap actions associated with a
     # cluster.
     #
@@ -1032,6 +1131,8 @@ module Aws::EMR
     #   * {Types::ListBootstrapActionsOutput#bootstrap_actions #bootstrap_actions} => Array&lt;Types::Command&gt;
     #   * {Types::ListBootstrapActionsOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_bootstrap_actions({
@@ -1083,6 +1184,8 @@ module Aws::EMR
     #   * {Types::ListClustersOutput#clusters #clusters} => Array&lt;Types::ClusterSummary&gt;
     #   * {Types::ListClustersOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_clusters({
@@ -1136,6 +1239,8 @@ module Aws::EMR
     #   * {Types::ListInstanceFleetsOutput#instance_fleets #instance_fleets} => Array&lt;Types::InstanceFleet&gt;
     #   * {Types::ListInstanceFleetsOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_instance_fleets({
@@ -1203,6 +1308,8 @@ module Aws::EMR
     #   * {Types::ListInstanceGroupsOutput#instance_groups #instance_groups} => Array&lt;Types::InstanceGroup&gt;
     #   * {Types::ListInstanceGroupsOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_instance_groups({
@@ -1319,6 +1426,8 @@ module Aws::EMR
     #   * {Types::ListInstancesOutput#instances #instances} => Array&lt;Types::Instance&gt;
     #   * {Types::ListInstancesOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_instances({
@@ -1378,6 +1487,8 @@ module Aws::EMR
     #   * {Types::ListSecurityConfigurationsOutput#security_configurations #security_configurations} => Array&lt;Types::SecurityConfigurationSummary&gt;
     #   * {Types::ListSecurityConfigurationsOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_security_configurations({
@@ -1424,6 +1535,8 @@ module Aws::EMR
     #   * {Types::ListStepsOutput#steps #steps} => Array&lt;Types::StepSummary&gt;
     #   * {Types::ListStepsOutput#marker #marker} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_steps({
@@ -1720,6 +1833,14 @@ module Aws::EMR
     #   this by updating `BlockPublicSecurityGroupRules` to remove the
     #   exception.
     #
+    #   <note markdown="1"> For accounts that created clusters in a Region before November 25,
+    #   2019, block public access is disabled by default in that Region. To
+    #   use this feature, you must manually enable and configure it. For
+    #   accounts that did not create an EMR cluster in a Region before this
+    #   date, block public access is enabled by default in that Region.
+    #
+    #    </note>
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     # @example Request syntax with placeholder values
@@ -1745,6 +1866,44 @@ module Aws::EMR
       req.send_request(options)
     end
 
+    # Creates or updates a managed scaling policy for an Amazon EMR cluster.
+    # The managed scaling policy defines the limits for resources, such as
+    # EC2 instances that can be added or terminated from a cluster. The
+    # policy only applies to the core and task nodes. The master node cannot
+    # be scaled after initial configuration.
+    #
+    # @option params [required, String] :cluster_id
+    #   Specifies the ID of an EMR cluster where the managed scaling policy is
+    #   attached.
+    #
+    # @option params [required, Types::ManagedScalingPolicy] :managed_scaling_policy
+    #   Specifies the constraints for the managed scaling policy.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.put_managed_scaling_policy({
+    #     cluster_id: "ClusterId", # required
+    #     managed_scaling_policy: { # required
+    #       compute_limits: {
+    #         unit_type: "InstanceFleetUnits", # required, accepts InstanceFleetUnits, Instances, VCPU
+    #         minimum_capacity_units: 1, # required
+    #         maximum_capacity_units: 1, # required
+    #         maximum_on_demand_capacity_units: 1,
+    #       },
+    #     },
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutManagedScalingPolicy AWS API Documentation
+    #
+    # @overload put_managed_scaling_policy(params = {})
+    # @param [Hash] params ({})
+    def put_managed_scaling_policy(params = {}, options = {})
+      req = build_request(:put_managed_scaling_policy, params)
+      req.send_request(options)
+    end
+
     # Removes an automatic scaling policy from a specified instance group
     # within an EMR cluster.
     #
@@ -1774,6 +1933,29 @@ module Aws::EMR
       req.send_request(options)
     end
 
+    # Removes a managed scaling policy from a specified EMR cluster.
+    #
+    # @option params [required, String] :cluster_id
+    #   Specifies the ID of the cluster from which the managed scaling policy
+    #   will be removed.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.remove_managed_scaling_policy({
+    #     cluster_id: "ClusterId", # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveManagedScalingPolicy AWS API Documentation
+    #
+    # @overload remove_managed_scaling_policy(params = {})
+    # @param [Hash] params ({})
+    def remove_managed_scaling_policy(params = {}, options = {})
+      req = build_request(:remove_managed_scaling_policy, params)
+      req.send_request(options)
+    end
+
     # Removes tags from an Amazon EMR resource. Tags make it easier to
     # associate clusters in various ways, such as grouping clusters to track
     # your Amazon EMR resource allocation costs. For more information, see
@@ -1855,6 +2037,12 @@ module Aws::EMR
     #   The location in Amazon S3 to write the log files of the job flow. If a
     #   value is not provided, logs are not created.
     #
+    # @option params [String] :log_encryption_kms_key_id
+    #   The AWS KMS customer master key (CMK) used for encrypting log files.
+    #   If a value is not provided, the logs will remain encrypted by AES-256.
+    #   This attribute is only available with EMR version 5.30.0 and later,
+    #   excluding EMR 6.0.0.
+    #
     # @option params [String] :additional_info
     #   A JSON string for selecting additional features.
     #
@@ -2048,6 +2236,9 @@ module Aws::EMR
     #   Specifies the number of steps that can be executed concurrently. The
     #   default value is `1`. The maximum value is `256`.
     #
+    # @option params [Types::ManagedScalingPolicy] :managed_scaling_policy
+    #   The specified managed scaling policy for an Amazon EMR cluster.
+    #
     # @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
@@ -2058,6 +2249,7 @@ module Aws::EMR
     #   resp = client.run_job_flow({
     #     name: "XmlStringMaxLen256", # required
     #     log_uri: "XmlString",
+    #     log_encryption_kms_key_id: "XmlString",
     #     additional_info: "XmlString",
     #     ami_version: "XmlStringMaxLen256",
     #     release_label: "XmlStringMaxLen256",
@@ -2277,6 +2469,14 @@ module Aws::EMR
     #       ad_domain_join_password: "XmlStringMaxLen256",
     #     },
     #     step_concurrency_level: 1,
+    #     managed_scaling_policy: {
+    #       compute_limits: {
+    #         unit_type: "InstanceFleetUnits", # required, accepts InstanceFleetUnits, Instances, VCPU
+    #         minimum_capacity_units: 1, # required
+    #         maximum_capacity_units: 1, # required
+    #         maximum_on_demand_capacity_units: 1,
+    #       },
+    #     },
     #   })
     #
     # @example Response structure
@@ -2429,7 +2629,7 @@ module Aws::EMR
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-emr'
-      context[:gem_version] = '1.24.0'
+      context[:gem_version] = '1.29.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 
@@ -2495,11 +2695,11 @@ module Aws::EMR
     # The following table lists the valid waiter names, the operations they call,
     # and the default `:delay` and `:max_attempts` values.
     #
-    # | waiter_name        | params              | :delay   | :max_attempts |
-    # | ------------------ | ------------------- | -------- | ------------- |
-    # | cluster_running    | {#describe_cluster} | 30       | 60            |
-    # | cluster_terminated | {#describe_cluster} | 30       | 60            |
-    # | step_complete      | {#describe_step}    | 30       | 60            |
+    # | waiter_name        | params                    | :delay   | :max_attempts |
+    # | ------------------ | ------------------------- | -------- | ------------- |
+    # | cluster_running    | {Client#describe_cluster} | 30       | 60            |
+    # | cluster_terminated | {Client#describe_cluster} | 30       | 60            |
+    # | step_complete      | {Client#describe_step}    | 30       | 60            |
     #
     # @raise [Errors::FailureStateError] Raised when the waiter terminates
     #   because the waiter has entered a state that it will not transition

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

@@ -57,6 +57,8 @@ module Aws::EMR
     Command = Shapes::StructureShape.new(name: 'Command')
     CommandList = Shapes::ListShape.new(name: 'CommandList')
     ComparisonOperator = Shapes::StringShape.new(name: 'ComparisonOperator')
+    ComputeLimits = Shapes::StructureShape.new(name: 'ComputeLimits')
+    ComputeLimitsUnitType = Shapes::StringShape.new(name: 'ComputeLimitsUnitType')
     Configuration = Shapes::StructureShape.new(name: 'Configuration')
     ConfigurationList = Shapes::ListShape.new(name: 'ConfigurationList')
     CreateSecurityConfigurationInput = Shapes::StructureShape.new(name: 'CreateSecurityConfigurationInput')
@@ -87,6 +89,8 @@ module Aws::EMR
     FailureDetails = Shapes::StructureShape.new(name: 'FailureDetails')
     GetBlockPublicAccessConfigurationInput = Shapes::StructureShape.new(name: 'GetBlockPublicAccessConfigurationInput')
     GetBlockPublicAccessConfigurationOutput = Shapes::StructureShape.new(name: 'GetBlockPublicAccessConfigurationOutput')
+    GetManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'GetManagedScalingPolicyInput')
+    GetManagedScalingPolicyOutput = Shapes::StructureShape.new(name: 'GetManagedScalingPolicyOutput')
     HadoopJarStepConfig = Shapes::StructureShape.new(name: 'HadoopJarStepConfig')
     HadoopStepConfig = Shapes::StructureShape.new(name: 'HadoopStepConfig')
     Instance = Shapes::StructureShape.new(name: 'Instance')
@@ -165,6 +169,7 @@ module Aws::EMR
     ListStepsInput = Shapes::StructureShape.new(name: 'ListStepsInput')
     ListStepsOutput = Shapes::StructureShape.new(name: 'ListStepsOutput')
     Long = Shapes::IntegerShape.new(name: 'Long')
+    ManagedScalingPolicy = Shapes::StructureShape.new(name: 'ManagedScalingPolicy')
     Marker = Shapes::StringShape.new(name: 'Marker')
     MarketType = Shapes::StringShape.new(name: 'MarketType')
     MetricDimension = Shapes::StructureShape.new(name: 'MetricDimension')
@@ -184,8 +189,12 @@ module Aws::EMR
     PutAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'PutAutoScalingPolicyOutput')
     PutBlockPublicAccessConfigurationInput = Shapes::StructureShape.new(name: 'PutBlockPublicAccessConfigurationInput')
     PutBlockPublicAccessConfigurationOutput = Shapes::StructureShape.new(name: 'PutBlockPublicAccessConfigurationOutput')
+    PutManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'PutManagedScalingPolicyInput')
+    PutManagedScalingPolicyOutput = Shapes::StructureShape.new(name: 'PutManagedScalingPolicyOutput')
     RemoveAutoScalingPolicyInput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyInput')
     RemoveAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyOutput')
+    RemoveManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'RemoveManagedScalingPolicyInput')
+    RemoveManagedScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveManagedScalingPolicyOutput')
     RemoveTagsInput = Shapes::StructureShape.new(name: 'RemoveTagsInput')
     RemoveTagsOutput = Shapes::StructureShape.new(name: 'RemoveTagsOutput')
     RepoUpgradeOnBoot = Shapes::StringShape.new(name: 'RepoUpgradeOnBoot')
@@ -350,6 +359,7 @@ module Aws::EMR
     Cluster.add_member(:ec2_instance_attributes, Shapes::ShapeRef.new(shape: Ec2InstanceAttributes, location_name: "Ec2InstanceAttributes"))
     Cluster.add_member(:instance_collection_type, Shapes::ShapeRef.new(shape: InstanceCollectionType, location_name: "InstanceCollectionType"))
     Cluster.add_member(:log_uri, Shapes::ShapeRef.new(shape: String, location_name: "LogUri"))
+    Cluster.add_member(:log_encryption_kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "LogEncryptionKmsKeyId"))
     Cluster.add_member(:requested_ami_version, Shapes::ShapeRef.new(shape: String, location_name: "RequestedAmiVersion"))
     Cluster.add_member(:running_ami_version, Shapes::ShapeRef.new(shape: String, location_name: "RunningAmiVersion"))
     Cluster.add_member(:release_label, Shapes::ShapeRef.new(shape: String, location_name: "ReleaseLabel"))
@@ -370,8 +380,8 @@ module Aws::EMR
     Cluster.add_member(:repo_upgrade_on_boot, Shapes::ShapeRef.new(shape: RepoUpgradeOnBoot, location_name: "RepoUpgradeOnBoot"))
     Cluster.add_member(:kerberos_attributes, Shapes::ShapeRef.new(shape: KerberosAttributes, location_name: "KerberosAttributes"))
     Cluster.add_member(:cluster_arn, Shapes::ShapeRef.new(shape: ArnType, location_name: "ClusterArn"))
-    Cluster.add_member(:step_concurrency_level, Shapes::ShapeRef.new(shape: Integer, location_name: "StepConcurrencyLevel"))
     Cluster.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: OptionalArnType, location_name: "OutpostArn"))
+    Cluster.add_member(:step_concurrency_level, Shapes::ShapeRef.new(shape: Integer, location_name: "StepConcurrencyLevel"))
     Cluster.struct_class = Types::Cluster
 
     ClusterStateChangeReason.add_member(:code, Shapes::ShapeRef.new(shape: ClusterStateChangeReasonCode, location_name: "Code"))
@@ -407,6 +417,12 @@ module Aws::EMR
 
     CommandList.member = Shapes::ShapeRef.new(shape: Command)
 
+    ComputeLimits.add_member(:unit_type, Shapes::ShapeRef.new(shape: ComputeLimitsUnitType, required: true, location_name: "UnitType"))
+    ComputeLimits.add_member(:minimum_capacity_units, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "MinimumCapacityUnits"))
+    ComputeLimits.add_member(:maximum_capacity_units, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "MaximumCapacityUnits"))
+    ComputeLimits.add_member(:maximum_on_demand_capacity_units, Shapes::ShapeRef.new(shape: Integer, location_name: "MaximumOnDemandCapacityUnits"))
+    ComputeLimits.struct_class = Types::ComputeLimits
+
     Configuration.add_member(:classification, Shapes::ShapeRef.new(shape: String, location_name: "Classification"))
     Configuration.add_member(:configurations, Shapes::ShapeRef.new(shape: ConfigurationList, location_name: "Configurations"))
     Configuration.add_member(:properties, Shapes::ShapeRef.new(shape: StringMap, location_name: "Properties"))
@@ -507,6 +523,12 @@ module Aws::EMR
     GetBlockPublicAccessConfigurationOutput.add_member(:block_public_access_configuration_metadata, Shapes::ShapeRef.new(shape: BlockPublicAccessConfigurationMetadata, required: true, location_name: "BlockPublicAccessConfigurationMetadata"))
     GetBlockPublicAccessConfigurationOutput.struct_class = Types::GetBlockPublicAccessConfigurationOutput
 
+    GetManagedScalingPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
+    GetManagedScalingPolicyInput.struct_class = Types::GetManagedScalingPolicyInput
+
+    GetManagedScalingPolicyOutput.add_member(:managed_scaling_policy, Shapes::ShapeRef.new(shape: ManagedScalingPolicy, location_name: "ManagedScalingPolicy"))
+    GetManagedScalingPolicyOutput.struct_class = Types::GetManagedScalingPolicyOutput
+
     HadoopJarStepConfig.add_member(:properties, Shapes::ShapeRef.new(shape: KeyValueList, location_name: "Properties"))
     HadoopJarStepConfig.add_member(:jar, Shapes::ShapeRef.new(shape: XmlString, required: true, location_name: "Jar"))
     HadoopJarStepConfig.add_member(:main_class, Shapes::ShapeRef.new(shape: XmlString, location_name: "MainClass"))
@@ -702,6 +724,8 @@ module Aws::EMR
 
     InstanceTypeSpecificationList.member = Shapes::ShapeRef.new(shape: InstanceTypeSpecification)
 
+    InternalServerError.struct_class = Types::InternalServerError
+
     InternalServerException.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
     InternalServerException.struct_class = Types::InternalServerException
 
@@ -712,6 +736,7 @@ module Aws::EMR
     JobFlowDetail.add_member(:job_flow_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "JobFlowId"))
     JobFlowDetail.add_member(:name, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "Name"))
     JobFlowDetail.add_member(:log_uri, Shapes::ShapeRef.new(shape: XmlString, location_name: "LogUri"))
+    JobFlowDetail.add_member(:log_encryption_kms_key_id, Shapes::ShapeRef.new(shape: XmlString, location_name: "LogEncryptionKmsKeyId"))
     JobFlowDetail.add_member(:ami_version, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "AmiVersion"))
     JobFlowDetail.add_member(:execution_status_detail, Shapes::ShapeRef.new(shape: JobFlowExecutionStatusDetail, required: true, location_name: "ExecutionStatusDetail"))
     JobFlowDetail.add_member(:instances, Shapes::ShapeRef.new(shape: JobFlowInstancesDetail, required: true, location_name: "Instances"))
@@ -848,6 +873,9 @@ module Aws::EMR
     ListStepsOutput.add_member(:marker, Shapes::ShapeRef.new(shape: Marker, location_name: "Marker"))
     ListStepsOutput.struct_class = Types::ListStepsOutput
 
+    ManagedScalingPolicy.add_member(:compute_limits, Shapes::ShapeRef.new(shape: ComputeLimits, location_name: "ComputeLimits"))
+    ManagedScalingPolicy.struct_class = Types::ManagedScalingPolicy
+
     MetricDimension.add_member(:key, Shapes::ShapeRef.new(shape: String, location_name: "Key"))
     MetricDimension.add_member(:value, Shapes::ShapeRef.new(shape: String, location_name: "Value"))
     MetricDimension.struct_class = Types::MetricDimension
@@ -897,12 +925,23 @@ module Aws::EMR
 
     PutBlockPublicAccessConfigurationOutput.struct_class = Types::PutBlockPublicAccessConfigurationOutput
 
+    PutManagedScalingPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
+    PutManagedScalingPolicyInput.add_member(:managed_scaling_policy, Shapes::ShapeRef.new(shape: ManagedScalingPolicy, required: true, location_name: "ManagedScalingPolicy"))
+    PutManagedScalingPolicyInput.struct_class = Types::PutManagedScalingPolicyInput
+
+    PutManagedScalingPolicyOutput.struct_class = Types::PutManagedScalingPolicyOutput
+
     RemoveAutoScalingPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
     RemoveAutoScalingPolicyInput.add_member(:instance_group_id, Shapes::ShapeRef.new(shape: InstanceGroupId, required: true, location_name: "InstanceGroupId"))
     RemoveAutoScalingPolicyInput.struct_class = Types::RemoveAutoScalingPolicyInput
 
     RemoveAutoScalingPolicyOutput.struct_class = Types::RemoveAutoScalingPolicyOutput
 
+    RemoveManagedScalingPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
+    RemoveManagedScalingPolicyInput.struct_class = Types::RemoveManagedScalingPolicyInput
+
+    RemoveManagedScalingPolicyOutput.struct_class = Types::RemoveManagedScalingPolicyOutput
+
     RemoveTagsInput.add_member(:resource_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "ResourceId"))
     RemoveTagsInput.add_member(:tag_keys, Shapes::ShapeRef.new(shape: StringList, required: true, location_name: "TagKeys"))
     RemoveTagsInput.struct_class = Types::RemoveTagsInput
@@ -911,6 +950,7 @@ module Aws::EMR
 
     RunJobFlowInput.add_member(:name, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "Name"))
     RunJobFlowInput.add_member(:log_uri, Shapes::ShapeRef.new(shape: XmlString, location_name: "LogUri"))
+    RunJobFlowInput.add_member(:log_encryption_kms_key_id, Shapes::ShapeRef.new(shape: XmlString, location_name: "LogEncryptionKmsKeyId"))
     RunJobFlowInput.add_member(:additional_info, Shapes::ShapeRef.new(shape: XmlString, location_name: "AdditionalInfo"))
     RunJobFlowInput.add_member(:ami_version, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "AmiVersion"))
     RunJobFlowInput.add_member(:release_label, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "ReleaseLabel"))
@@ -933,6 +973,7 @@ module Aws::EMR
     RunJobFlowInput.add_member(:repo_upgrade_on_boot, Shapes::ShapeRef.new(shape: RepoUpgradeOnBoot, location_name: "RepoUpgradeOnBoot"))
     RunJobFlowInput.add_member(:kerberos_attributes, Shapes::ShapeRef.new(shape: KerberosAttributes, location_name: "KerberosAttributes"))
     RunJobFlowInput.add_member(:step_concurrency_level, Shapes::ShapeRef.new(shape: Integer, location_name: "StepConcurrencyLevel"))
+    RunJobFlowInput.add_member(:managed_scaling_policy, Shapes::ShapeRef.new(shape: ManagedScalingPolicy, location_name: "ManagedScalingPolicy"))
     RunJobFlowInput.struct_class = Types::RunJobFlowInput
 
     RunJobFlowOutput.add_member(:job_flow_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "JobFlowId"))
@@ -1213,6 +1254,14 @@ module Aws::EMR
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
 
+      api.add_operation(:get_managed_scaling_policy, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetManagedScalingPolicy"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetManagedScalingPolicyInput)
+        o.output = Shapes::ShapeRef.new(shape: GetManagedScalingPolicyOutput)
+      end)
+
       api.add_operation(:list_bootstrap_actions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListBootstrapActions"
         o.http_method = "POST"
@@ -1365,6 +1414,14 @@ module Aws::EMR
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
 
+      api.add_operation(:put_managed_scaling_policy, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "PutManagedScalingPolicy"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: PutManagedScalingPolicyInput)
+        o.output = Shapes::ShapeRef.new(shape: PutManagedScalingPolicyOutput)
+      end)
+
       api.add_operation(:remove_auto_scaling_policy, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RemoveAutoScalingPolicy"
         o.http_method = "POST"
@@ -1373,6 +1430,14 @@ module Aws::EMR
         o.output = Shapes::ShapeRef.new(shape: RemoveAutoScalingPolicyOutput)
       end)
 
+      api.add_operation(:remove_managed_scaling_policy, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "RemoveManagedScalingPolicy"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: RemoveManagedScalingPolicyInput)
+        o.output = Shapes::ShapeRef.new(shape: RemoveManagedScalingPolicyOutput)
+      end)
+
       api.add_operation(:remove_tags, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RemoveTags"
         o.http_method = "POST"

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

@@ -6,10 +6,45 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::EMR
+
+  # When EMR returns an error response, the Ruby SDK constructs and raises an error.
+  # These errors all extend Aws::EMR::Errors::ServiceError < {Aws::Errors::ServiceError}
+  #
+  # You can rescue all EMR errors using ServiceError:
+  #
+  #     begin
+  #       # do stuff
+  #     rescue Aws::EMR::Errors::ServiceError
+  #       # rescues all EMR API errors
+  #     end
+  #
+  #
+  # ## Request Context
+  # ServiceError objects have a {Aws::Errors::ServiceError#context #context} method that returns
+  # information about the request that generated the error.
+  # See {Seahorse::Client::RequestContext} for more information.
+  #
+  # ## Error Classes
+  # * {InternalServerError}
+  # * {InternalServerException}
+  # * {InvalidRequestException}
+  #
+  # Additionally, error classes are dynamically generated for service errors based on the error code
+  # if they are not defined above.
   module Errors
 
     extend Aws::Errors::DynamicErrors
 
+    class InternalServerError < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::EMR::Types::InternalServerError] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class InternalServerException < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -23,7 +58,6 @@ module Aws::EMR
       def message
         @message || @data[:message]
       end
-
     end
 
     class InvalidRequestException < ServiceError
@@ -44,7 +78,6 @@ module Aws::EMR
       def message
         @message || @data[:message]
       end
-
     end
 
   end

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

@@ -6,6 +6,7 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::EMR
+
   class Resource
 
     # @param options ({})

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

@@ -819,6 +819,12 @@ module Aws::EMR
     #   stored.
     #   @return [String]
     #
+    # @!attribute [rw] log_encryption_kms_key_id
+    #   The AWS KMS customer master key (CMK) used for encrypting log files.
+    #   This attribute is only available with EMR version 5.30.0 and later,
+    #   excluding EMR 6.0.0.
+    #   @return [String]
+    #
     # @!attribute [rw] requested_ami_version
     #   The AMI version requested for this cluster.
     #   @return [String]
@@ -959,15 +965,15 @@ module Aws::EMR
     #   The Amazon Resource Name of the cluster.
     #   @return [String]
     #
-    # @!attribute [rw] step_concurrency_level
-    #   Specifies the number of steps that can be executed concurrently.
-    #   @return [Integer]
-    #
     # @!attribute [rw] outpost_arn
     #   The Amazon Resource Name (ARN) of the Outpost where the cluster is
     #   launched.
     #   @return [String]
     #
+    # @!attribute [rw] step_concurrency_level
+    #   Specifies the number of steps that can be executed concurrently.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/Cluster AWS API Documentation
     #
     class Cluster < Struct.new(
@@ -977,6 +983,7 @@ module Aws::EMR
       :ec2_instance_attributes,
       :instance_collection_type,
       :log_uri,
+      :log_encryption_kms_key_id,
       :requested_ami_version,
       :running_ami_version,
       :release_label,
@@ -997,8 +1004,8 @@ module Aws::EMR
       :repo_upgrade_on_boot,
       :kerberos_attributes,
       :cluster_arn,
-      :step_concurrency_level,
-      :outpost_arn)
+      :outpost_arn,
+      :step_concurrency_level)
       include Aws::Structure
     end
 
@@ -1135,6 +1142,60 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # The EC2 unit limits for a managed scaling policy. The managed scaling
+    # activity of a cluster can not be above or below these limits. The
+    # limit only applies to the core and task nodes. The master node cannot
+    # be scaled after initial configuration.
+    #
+    # @note When making an API call, you may pass ComputeLimits
+    #   data as a hash:
+    #
+    #       {
+    #         unit_type: "InstanceFleetUnits", # required, accepts InstanceFleetUnits, Instances, VCPU
+    #         minimum_capacity_units: 1, # required
+    #         maximum_capacity_units: 1, # required
+    #         maximum_on_demand_capacity_units: 1,
+    #       }
+    #
+    # @!attribute [rw] unit_type
+    #   The unit type used for specifying a managed scaling policy.
+    #   @return [String]
+    #
+    # @!attribute [rw] minimum_capacity_units
+    #   The lower boundary of EC2 units. It is measured through VCPU cores
+    #   or instances for instance groups and measured through units for
+    #   instance fleets. Managed scaling activities are not allowed beyond
+    #   this boundary. The limit only applies to the core and task nodes.
+    #   The master node cannot be scaled after initial configuration.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] maximum_capacity_units
+    #   The upper boundary of EC2 units. It is measured through VCPU cores
+    #   or instances for instance groups and measured through units for
+    #   instance fleets. Managed scaling activities are not allowed beyond
+    #   this boundary. The limit only applies to the core and task nodes.
+    #   The master node cannot be scaled after initial configuration.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] maximum_on_demand_capacity_units
+    #   The upper boundary of on-demand EC2 units. It is measured through
+    #   VCPU cores or instances for instance groups and measured through
+    #   units for instance fleets. The on-demand units are not allowed to
+    #   scale beyond this boundary. The limit only applies to the core and
+    #   task nodes. The master node cannot be scaled after initial
+    #   configuration.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ComputeLimits AWS API Documentation
+    #
+    class ComputeLimits < Struct.new(
+      :unit_type,
+      :minimum_capacity_units,
+      :maximum_capacity_units,
+      :maximum_on_demand_capacity_units)
+      include Aws::Structure
+    end
+
     # <note markdown="1"> Amazon EMR releases 4.x or later.
     #
     #  </note>
@@ -1675,6 +1736,14 @@ module Aws::EMR
     #   exception, and public access is allowed on this port. You can change
     #   this by updating the block public access configuration to remove the
     #   exception.
+    #
+    #   <note markdown="1"> For accounts that created clusters in a Region before November 25,
+    #   2019, block public access is disabled by default in that Region. To
+    #   use this feature, you must manually enable and configure it. For
+    #   accounts that did not create an EMR cluster in a Region before this
+    #   date, block public access is enabled by default in that Region.
+    #
+    #    </note>
     #   @return [Types::BlockPublicAccessConfiguration]
     #
     # @!attribute [rw] block_public_access_configuration_metadata
@@ -1694,6 +1763,37 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetManagedScalingPolicyInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "ClusterId", # required
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   Specifies the ID of the cluster for which the managed scaling policy
+    #   will be fetched.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetManagedScalingPolicyInput AWS API Documentation
+    #
+    class GetManagedScalingPolicyInput < Struct.new(
+      :cluster_id)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] managed_scaling_policy
+    #   Specifies the managed scaling policy that is attached to an Amazon
+    #   EMR cluster.
+    #   @return [Types::ManagedScalingPolicy]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetManagedScalingPolicyOutput AWS API Documentation
+    #
+    class GetManagedScalingPolicyOutput < Struct.new(
+      :managed_scaling_policy)
+      include Aws::Structure
+    end
+
     # A job flow step consisting of a JAR file whose main function will be
     # executed. The main function submits a job for Hadoop to execute and
     # waits for the job to finish or fail.
@@ -2994,6 +3094,13 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # Indicates that an error occurred while processing the request and that
+    # the request was not completed.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InternalServerError AWS API Documentation
+    #
+    class InternalServerError < Aws::EmptyStructure; end
+
     # This exception occurs when there is an internal failure in the EMR
     # service.
     #
@@ -3040,6 +3147,12 @@ module Aws::EMR
     #   The location in Amazon S3 where log files for the job are stored.
     #   @return [String]
     #
+    # @!attribute [rw] log_encryption_kms_key_id
+    #   The AWS KMS customer master key (CMK) used for encrypting log files.
+    #   This attribute is only available with EMR version 5.30.0 and later,
+    #   excluding EMR 6.0.0.
+    #   @return [String]
+    #
     # @!attribute [rw] ami_version
     #   Applies only to Amazon EMR AMI versions 3.x and 2.x. For Amazon EMR
     #   releases 4.0 and later, `ReleaseLabel` is used. To specify a custom
@@ -3120,6 +3233,7 @@ module Aws::EMR
       :job_flow_id,
       :name,
       :log_uri,
+      :log_encryption_kms_key_id,
       :ami_version,
       :execution_status_detail,
       :instances,
@@ -3991,6 +4105,37 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # Managed scaling policy for an Amazon EMR cluster. The policy specifies
+    # the limits for resources that can be added or terminated from a
+    # cluster. The policy only applies to the core and task nodes. The
+    # master node cannot be scaled after initial configuration.
+    #
+    # @note When making an API call, you may pass ManagedScalingPolicy
+    #   data as a hash:
+    #
+    #       {
+    #         compute_limits: {
+    #           unit_type: "InstanceFleetUnits", # required, accepts InstanceFleetUnits, Instances, VCPU
+    #           minimum_capacity_units: 1, # required
+    #           maximum_capacity_units: 1, # required
+    #           maximum_on_demand_capacity_units: 1,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] compute_limits
+    #   The EC2 unit limits for a managed scaling policy. The managed
+    #   scaling activity of a cluster is not allowed to go above or below
+    #   these limits. The limit only applies to the core and task nodes. The
+    #   master node cannot be scaled after initial configuration.
+    #   @return [Types::ComputeLimits]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ManagedScalingPolicy AWS API Documentation
+    #
+    class ManagedScalingPolicy < Struct.new(
+      :compute_limits)
+      include Aws::Structure
+    end
+
     # 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
@@ -4326,6 +4471,14 @@ module Aws::EMR
     #   exception, and public access is allowed on this port. You can change
     #   this by updating `BlockPublicSecurityGroupRules` to remove the
     #   exception.
+    #
+    #   <note markdown="1"> For accounts that created clusters in a Region before November 25,
+    #   2019, block public access is disabled by default in that Region. To
+    #   use this feature, you must manually enable and configure it. For
+    #   accounts that did not create an EMR cluster in a Region before this
+    #   date, block public access is enabled by default in that Region.
+    #
+    #    </note>
     #   @return [Types::BlockPublicAccessConfiguration]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutBlockPublicAccessConfigurationInput AWS API Documentation
@@ -4339,6 +4492,42 @@ module Aws::EMR
     #
     class PutBlockPublicAccessConfigurationOutput < Aws::EmptyStructure; end
 
+    # @note When making an API call, you may pass PutManagedScalingPolicyInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "ClusterId", # required
+    #         managed_scaling_policy: { # required
+    #           compute_limits: {
+    #             unit_type: "InstanceFleetUnits", # required, accepts InstanceFleetUnits, Instances, VCPU
+    #             minimum_capacity_units: 1, # required
+    #             maximum_capacity_units: 1, # required
+    #             maximum_on_demand_capacity_units: 1,
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   Specifies the ID of an EMR cluster where the managed scaling policy
+    #   is attached.
+    #   @return [String]
+    #
+    # @!attribute [rw] managed_scaling_policy
+    #   Specifies the constraints for the managed scaling policy.
+    #   @return [Types::ManagedScalingPolicy]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutManagedScalingPolicyInput AWS API Documentation
+    #
+    class PutManagedScalingPolicyInput < Struct.new(
+      :cluster_id,
+      :managed_scaling_policy)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutManagedScalingPolicyOutput AWS API Documentation
+    #
+    class PutManagedScalingPolicyOutput < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass RemoveAutoScalingPolicyInput
     #   data as a hash:
     #
@@ -4369,6 +4558,29 @@ module Aws::EMR
     #
     class RemoveAutoScalingPolicyOutput < Aws::EmptyStructure; end
 
+    # @note When making an API call, you may pass RemoveManagedScalingPolicyInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "ClusterId", # required
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   Specifies the ID of the cluster from which the managed scaling
+    #   policy will be removed.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveManagedScalingPolicyInput AWS API Documentation
+    #
+    class RemoveManagedScalingPolicyInput < Struct.new(
+      :cluster_id)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveManagedScalingPolicyOutput AWS API Documentation
+    #
+    class RemoveManagedScalingPolicyOutput < Aws::EmptyStructure; end
+
     # This input identifies a cluster and a list of tags to remove.
     #
     # @note When making an API call, you may pass RemoveTagsInput
@@ -4410,6 +4622,7 @@ module Aws::EMR
     #       {
     #         name: "XmlStringMaxLen256", # required
     #         log_uri: "XmlString",
+    #         log_encryption_kms_key_id: "XmlString",
     #         additional_info: "XmlString",
     #         ami_version: "XmlStringMaxLen256",
     #         release_label: "XmlStringMaxLen256",
@@ -4629,6 +4842,14 @@ module Aws::EMR
     #           ad_domain_join_password: "XmlStringMaxLen256",
     #         },
     #         step_concurrency_level: 1,
+    #         managed_scaling_policy: {
+    #           compute_limits: {
+    #             unit_type: "InstanceFleetUnits", # required, accepts InstanceFleetUnits, Instances, VCPU
+    #             minimum_capacity_units: 1, # required
+    #             maximum_capacity_units: 1, # required
+    #             maximum_on_demand_capacity_units: 1,
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] name
@@ -4640,6 +4861,13 @@ module Aws::EMR
     #   a value is not provided, logs are not created.
     #   @return [String]
     #
+    # @!attribute [rw] log_encryption_kms_key_id
+    #   The AWS KMS customer master key (CMK) used for encrypting log files.
+    #   If a value is not provided, the logs will remain encrypted by
+    #   AES-256. This attribute is only available with EMR version 5.30.0
+    #   and later, excluding EMR 6.0.0.
+    #   @return [String]
+    #
     # @!attribute [rw] additional_info
     #   A JSON string for selecting additional features.
     #   @return [String]
@@ -4856,11 +5084,16 @@ module Aws::EMR
     #   default value is `1`. The maximum value is `256`.
     #   @return [Integer]
     #
+    # @!attribute [rw] managed_scaling_policy
+    #   The specified managed scaling policy for an Amazon EMR cluster.
+    #   @return [Types::ManagedScalingPolicy]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RunJobFlowInput AWS API Documentation
     #
     class RunJobFlowInput < Struct.new(
       :name,
       :log_uri,
+      :log_encryption_kms_key_id,
       :additional_info,
       :ami_version,
       :release_label,
@@ -4882,7 +5115,8 @@ module Aws::EMR
       :ebs_root_volume_size,
       :repo_upgrade_on_boot,
       :kerberos_attributes,
-      :step_concurrency_level)
+      :step_concurrency_level,
+      :managed_scaling_policy)
       include Aws::Structure
     end
 

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

@@ -8,6 +8,69 @@
 require 'aws-sdk-core/waiters'
 
 module Aws::EMR
+  # Waiters are utility methods that poll for a particular state to occur
+  # on a client. Waiters can fail after a number of attempts at a polling
+  # interval defined for the service client.
+  #
+  # For a list of operations that can be waited for and the
+  # client methods called for each operation, see the table below or the
+  # {Client#wait_until} field documentation for the {Client}.
+  #
+  # # Invoking a Waiter
+  # To invoke a waiter, call #wait_until on a {Client}. The first parameter
+  # is the waiter name, which is specific to the service client and indicates
+  # which operation is being waited for. The second parameter is a hash of
+  # parameters that are passed to the client method called by the waiter,
+  # which varies according to the waiter name.
+  #
+  # # Wait Failures
+  # To catch errors in a waiter, use WaiterFailed,
+  # as shown in the following example.
+  #
+  #     rescue rescue Aws::Waiters::Errors::WaiterFailed => error
+  #       puts "failed waiting for instance running: #{error.message}
+  #     end
+  #
+  # # Configuring a Waiter
+  # Each waiter has a default polling interval and a maximum number of
+  # attempts it will make before returning control to your program.
+  # To set these values, use the `max_attempts` and `delay` parameters
+  # in your `#wait_until` call.
+  # The following example waits for up to 25 seconds, polling every five seconds.
+  #
+  #     client.wait_until(...) do |w|
+  #       w.max_attempts = 5
+  #       w.delay = 5
+  #     end
+  #
+  # To disable wait failures, set the value of either of these parameters
+  # to `nil`.
+  #
+  # # Extending a Waiter
+  # To modify the behavior of waiters, you can register callbacks that are
+  # triggered before each polling attempt and before waiting.
+  #
+  # The following example implements an exponential backoff in a waiter
+  # by doubling the amount of time to wait on every attempt.
+  #
+  #     client.wait_until(...) do |w|
+  #       w.interval = 0 # disable normal sleep
+  #       w.before_wait do |n, resp|
+  #         sleep(n ** 2)
+  #       end
+  #     end
+  #
+  # # Available Waiters
+  #
+  # The following table lists the valid waiter names, the operations they call,
+  # and the default `:delay` and `:max_attempts` values.
+  #
+  # | waiter_name        | params                    | :delay   | :max_attempts |
+  # | ------------------ | ------------------------- | -------- | ------------- |
+  # | cluster_running    | {Client#describe_cluster} | 30       | 60            |
+  # | cluster_terminated | {Client#describe_cluster} | 30       | 60            |
+  # | step_complete      | {Client#describe_step}    | 30       | 60            |
+  #
   module Waiters
 
     class ClusterRunning

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-emr
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: AWS SDK for Ruby - Amazon EMR