aws-sdk-emr 1.23.0 → 1.28.0

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,14 +169,18 @@ 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')
     MetricDimensionList = Shapes::ListShape.new(name: 'MetricDimensionList')
+    ModifyClusterInput = Shapes::StructureShape.new(name: 'ModifyClusterInput')
+    ModifyClusterOutput = Shapes::StructureShape.new(name: 'ModifyClusterOutput')
     ModifyInstanceFleetInput = Shapes::StructureShape.new(name: 'ModifyInstanceFleetInput')
     ModifyInstanceGroupsInput = Shapes::StructureShape.new(name: 'ModifyInstanceGroupsInput')
     NewSupportedProductsList = Shapes::ListShape.new(name: 'NewSupportedProductsList')
     NonNegativeDouble = Shapes::FloatShape.new(name: 'NonNegativeDouble')
+    OptionalArnType = Shapes::StringShape.new(name: 'OptionalArnType')
     PlacementType = Shapes::StructureShape.new(name: 'PlacementType')
     Port = Shapes::IntegerShape.new(name: 'Port')
     PortRange = Shapes::StructureShape.new(name: 'PortRange')
@@ -181,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')
@@ -207,6 +219,7 @@ module Aws::EMR
     SpotProvisioningTimeoutAction = Shapes::StringShape.new(name: 'SpotProvisioningTimeoutAction')
     Statistic = Shapes::StringShape.new(name: 'Statistic')
     Step = Shapes::StructureShape.new(name: 'Step')
+    StepCancellationOption = Shapes::StringShape.new(name: 'StepCancellationOption')
     StepConfig = Shapes::StructureShape.new(name: 'StepConfig')
     StepConfigList = Shapes::ListShape.new(name: 'StepConfigList')
     StepDetail = Shapes::StructureShape.new(name: 'StepDetail')
@@ -321,8 +334,9 @@ module Aws::EMR
 
     CancelStepsInfoList.member = Shapes::ShapeRef.new(shape: CancelStepsInfo)
 
-    CancelStepsInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "ClusterId"))
-    CancelStepsInput.add_member(:step_ids, Shapes::ShapeRef.new(shape: StepIdsList, location_name: "StepIds"))
+    CancelStepsInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "ClusterId"))
+    CancelStepsInput.add_member(:step_ids, Shapes::ShapeRef.new(shape: StepIdsList, required: true, location_name: "StepIds"))
+    CancelStepsInput.add_member(:step_cancellation_option, Shapes::ShapeRef.new(shape: StepCancellationOption, location_name: "StepCancellationOption"))
     CancelStepsInput.struct_class = Types::CancelStepsInput
 
     CancelStepsOutput.add_member(:cancel_steps_info_list, Shapes::ShapeRef.new(shape: CancelStepsInfoList, location_name: "CancelStepsInfoList"))
@@ -365,6 +379,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(: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"))
@@ -383,6 +399,7 @@ module Aws::EMR
     ClusterSummary.add_member(:status, Shapes::ShapeRef.new(shape: ClusterStatus, location_name: "Status"))
     ClusterSummary.add_member(:normalized_instance_hours, Shapes::ShapeRef.new(shape: Integer, location_name: "NormalizedInstanceHours"))
     ClusterSummary.add_member(:cluster_arn, Shapes::ShapeRef.new(shape: ArnType, location_name: "ClusterArn"))
+    ClusterSummary.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: OptionalArnType, location_name: "OutpostArn"))
     ClusterSummary.struct_class = Types::ClusterSummary
 
     ClusterSummaryList.member = Shapes::ShapeRef.new(shape: ClusterSummary)
@@ -399,6 +416,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"))
@@ -499,6 +522,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"))
@@ -694,6 +723,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
 
@@ -840,12 +871,22 @@ 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
 
     MetricDimensionList.member = Shapes::ShapeRef.new(shape: MetricDimension)
 
+    ModifyClusterInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClusterId"))
+    ModifyClusterInput.add_member(:step_concurrency_level, Shapes::ShapeRef.new(shape: Integer, location_name: "StepConcurrencyLevel"))
+    ModifyClusterInput.struct_class = Types::ModifyClusterInput
+
+    ModifyClusterOutput.add_member(:step_concurrency_level, Shapes::ShapeRef.new(shape: Integer, location_name: "StepConcurrencyLevel"))
+    ModifyClusterOutput.struct_class = Types::ModifyClusterOutput
+
     ModifyInstanceFleetInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
     ModifyInstanceFleetInput.add_member(:instance_fleet, Shapes::ShapeRef.new(shape: InstanceFleetModifyConfig, required: true, location_name: "InstanceFleet"))
     ModifyInstanceFleetInput.struct_class = Types::ModifyInstanceFleetInput
@@ -882,12 +923,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
@@ -917,6 +969,8 @@ module Aws::EMR
     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.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"))
@@ -1197,6 +1251,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"
@@ -1302,6 +1364,16 @@ module Aws::EMR
         )
       end)
 
+      api.add_operation(:modify_cluster, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyCluster"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyClusterInput)
+        o.output = Shapes::ShapeRef.new(shape: ModifyClusterOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerError)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+      end)
+
       api.add_operation(:modify_instance_fleet, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyInstanceFleet"
         o.http_method = "POST"
@@ -1339,6 +1411,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"
@@ -1347,6 +1427,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

@@ -654,8 +654,9 @@ module Aws::EMR
     #   data as a hash:
     #
     #       {
-    #         cluster_id: "XmlStringMaxLen256",
-    #         step_ids: ["XmlStringMaxLen256"],
+    #         cluster_id: "XmlStringMaxLen256", # required
+    #         step_ids: ["XmlStringMaxLen256"], # required
+    #         step_cancellation_option: "SEND_INTERRUPT", # accepts SEND_INTERRUPT, TERMINATE_PROCESS
     #       }
     #
     # @!attribute [rw] cluster_id
@@ -668,11 +669,17 @@ module Aws::EMR
     #   their states for the specified cluster.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] step_cancellation_option
+    #   The option to choose for cancelling `RUNNING` steps. By default, the
+    #   value is `SEND_INTERRUPT`.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/CancelStepsInput AWS API Documentation
     #
     class CancelStepsInput < Struct.new(
       :cluster_id,
-      :step_ids)
+      :step_ids,
+      :step_cancellation_option)
       include Aws::Structure
     end
 
@@ -952,6 +959,15 @@ module Aws::EMR
     #   The Amazon Resource Name of the cluster.
     #   @return [String]
     #
+    # @!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(
@@ -980,7 +996,9 @@ module Aws::EMR
       :ebs_root_volume_size,
       :repo_upgrade_on_boot,
       :kerberos_attributes,
-      :cluster_arn)
+      :cluster_arn,
+      :outpost_arn,
+      :step_concurrency_level)
       include Aws::Structure
     end
 
@@ -1054,6 +1072,11 @@ module Aws::EMR
     #   The Amazon Resource Name of the cluster.
     #   @return [String]
     #
+    # @!attribute [rw] outpost_arn
+    #   The Amazon Resource Name (ARN) of the Outpost where the cluster is
+    #   launched.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ClusterSummary AWS API Documentation
     #
     class ClusterSummary < Struct.new(
@@ -1061,7 +1084,8 @@ module Aws::EMR
       :name,
       :status,
       :normalized_instance_hours,
-      :cluster_arn)
+      :cluster_arn,
+      :outpost_arn)
       include Aws::Structure
     end
 
@@ -1111,6 +1135,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>
@@ -1651,6 +1729,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
@@ -1670,6 +1756,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.
@@ -2970,6 +3087,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.
     #
@@ -3967,6 +4091,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
@@ -3997,6 +4152,42 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ModifyClusterInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "String", # required
+    #         step_concurrency_level: 1,
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   The unique identifier of the cluster.
+    #   @return [String]
+    #
+    # @!attribute [rw] step_concurrency_level
+    #   The number of steps that can be executed concurrently. You can
+    #   specify a maximum of 256 steps.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ModifyClusterInput AWS API Documentation
+    #
+    class ModifyClusterInput < Struct.new(
+      :cluster_id,
+      :step_concurrency_level)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] step_concurrency_level
+    #   The number of steps that can be executed concurrently.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ModifyClusterOutput AWS API Documentation
+    #
+    class ModifyClusterOutput < Struct.new(
+      :step_concurrency_level)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ModifyInstanceFleetInput
     #   data as a hash:
     #
@@ -4266,6 +4457,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
@@ -4279,6 +4478,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:
     #
@@ -4309,6 +4544,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
@@ -4568,6 +4826,15 @@ module Aws::EMR
     #           ad_domain_join_user: "XmlStringMaxLen256",
     #           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
@@ -4790,6 +5057,15 @@ module Aws::EMR
     #   [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-kerberos.html
     #   @return [Types::KerberosAttributes]
     #
+    # @!attribute [rw] step_concurrency_level
+    #   Specifies the number of steps that can be executed concurrently. The
+    #   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(
@@ -4815,7 +5091,9 @@ module Aws::EMR
       :custom_ami_id,
       :ebs_root_volume_size,
       :repo_upgrade_on_boot,
-      :kerberos_attributes)
+      :kerberos_attributes,
+      :step_concurrency_level,
+      :managed_scaling_policy)
       include Aws::Structure
     end