aws-sdk-emr 1.28.0 → 1.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf69a9ea5f608150c58f2d6f11be3b45b796f3232f2f6538efb9ec70cdd9e095
-  data.tar.gz: df5b466ce2c02ed2ae4b75b5b714cd54bbb4ff2dd81c9fce11772a5cc118f5c3
+  metadata.gz: 5dcd80c43660f4057ff57af014e1093f7f1ea4e7f2a0c12264c9d1ffe0cdcb12
+  data.tar.gz: 3338e7350300b6e8ac4b862e665769175687a2489f3d2e5117e4036924aa283d
 SHA512:
-  metadata.gz: 063dd5f024b0f850a710e67328229c05387780684b693840cc2cde8239ccc46939e8045a7c4ca35877a92b06cf0dbb551fb9de31e500f8f90a797786feb335a3
-  data.tar.gz: 0a3e880560068c0735558e1da2a746ebe1d81b38cbffcae5431d61608f7772016639a2ba56662430413d40d3a798f20e8458d978555c73857adedc9daf4ed7d4
+  metadata.gz: b3131d5673cb1edd1d03bfdac147cae9d4f8f83fe8d32c263d1f5379490f81fd295e776f16893ce294cc72ba58248c7a56065b365c283b93804d1b203debe419
+  data.tar.gz: 819d84b9108bead7fa6231652262a3b655db990fa247a33058c59ea891e4299a1bf6611770cf4dd1041dac7ac0df3fba5fec3ccbf18fd3fc238ac84aac8379e3

data/lib/aws-sdk-emr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -46,6 +48,6 @@ require_relative 'aws-sdk-emr/customizations'
 # @service
 module Aws::EMR
 
-  GEM_VERSION = '1.28.0'
+  GEM_VERSION = '1.33.0'
 
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -24,6 +26,7 @@ require 'aws-sdk-core/plugins/jsonvalue_converter.rb'
 require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
 require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
 require 'aws-sdk-core/plugins/transfer_encoding.rb'
+require 'aws-sdk-core/plugins/http_checksum.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/json_rpc.rb'
 
@@ -69,6 +72,7 @@ module Aws::EMR
     add_plugin(Aws::Plugins::ClientMetricsPlugin)
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
+    add_plugin(Aws::Plugins::HttpChecksum)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::JsonRpc)
 
@@ -161,7 +165,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 a valid HTTP(S) URI.
+    #     to test or custom 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
@@ -379,10 +383,14 @@ module Aws::EMR
     #         },
     #       ],
     #       launch_specifications: {
-    #         spot_specification: { # required
+    #         spot_specification: {
     #           timeout_duration_minutes: 1, # required
     #           timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #           block_duration_minutes: 1,
+    #           allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #         },
+    #         on_demand_specification: {
+    #           allocation_strategy: "lowest-price", # required, accepts lowest-price
     #         },
     #       },
     #     },
@@ -783,6 +791,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
@@ -890,6 +899,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
@@ -1104,6 +1114,7 @@ module Aws::EMR
     #   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
+    #   resp.managed_scaling_policy.compute_limits.maximum_core_capacity_units #=> Integer
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetManagedScalingPolicy AWS API Documentation
     #
@@ -1281,6 +1292,8 @@ module Aws::EMR
     #   resp.instance_fleets[0].launch_specifications.spot_specification.timeout_duration_minutes #=> Integer
     #   resp.instance_fleets[0].launch_specifications.spot_specification.timeout_action #=> String, one of "SWITCH_TO_ON_DEMAND", "TERMINATE_CLUSTER"
     #   resp.instance_fleets[0].launch_specifications.spot_specification.block_duration_minutes #=> Integer
+    #   resp.instance_fleets[0].launch_specifications.spot_specification.allocation_strategy #=> String, one of "capacity-optimized"
+    #   resp.instance_fleets[0].launch_specifications.on_demand_specification.allocation_strategy #=> String, one of "lowest-price"
     #   resp.marker #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ListInstanceFleets AWS API Documentation
@@ -1889,6 +1902,7 @@ module Aws::EMR
     #         minimum_capacity_units: 1, # required
     #         maximum_capacity_units: 1, # required
     #         maximum_on_demand_capacity_units: 1,
+    #         maximum_core_capacity_units: 1,
     #       },
     #     },
     #   })
@@ -2035,6 +2049,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.
     #
@@ -2241,6 +2261,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",
@@ -2359,10 +2380,14 @@ module Aws::EMR
     #             },
     #           ],
     #           launch_specifications: {
-    #             spot_specification: { # required
+    #             spot_specification: {
     #               timeout_duration_minutes: 1, # required
     #               timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #               block_duration_minutes: 1,
+    #               allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #             },
+    #             on_demand_specification: {
+    #               allocation_strategy: "lowest-price", # required, accepts lowest-price
     #             },
     #           },
     #         },
@@ -2466,6 +2491,7 @@ module Aws::EMR
     #         minimum_capacity_units: 1, # required
     #         maximum_capacity_units: 1, # required
     #         maximum_on_demand_capacity_units: 1,
+    #         maximum_core_capacity_units: 1,
     #       },
     #     },
     #   })
@@ -2620,7 +2646,7 @@ module Aws::EMR
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-emr'
-      context[:gem_version] = '1.28.0'
+      context[:gem_version] = '1.33.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -180,6 +182,8 @@ module Aws::EMR
     ModifyInstanceGroupsInput = Shapes::StructureShape.new(name: 'ModifyInstanceGroupsInput')
     NewSupportedProductsList = Shapes::ListShape.new(name: 'NewSupportedProductsList')
     NonNegativeDouble = Shapes::FloatShape.new(name: 'NonNegativeDouble')
+    OnDemandProvisioningAllocationStrategy = Shapes::StringShape.new(name: 'OnDemandProvisioningAllocationStrategy')
+    OnDemandProvisioningSpecification = Shapes::StructureShape.new(name: 'OnDemandProvisioningSpecification')
     OptionalArnType = Shapes::StringShape.new(name: 'OptionalArnType')
     PlacementType = Shapes::StructureShape.new(name: 'PlacementType')
     Port = Shapes::IntegerShape.new(name: 'Port')
@@ -215,6 +219,7 @@ module Aws::EMR
     SetVisibleToAllUsersInput = Shapes::StructureShape.new(name: 'SetVisibleToAllUsersInput')
     ShrinkPolicy = Shapes::StructureShape.new(name: 'ShrinkPolicy')
     SimpleScalingPolicyConfiguration = Shapes::StructureShape.new(name: 'SimpleScalingPolicyConfiguration')
+    SpotProvisioningAllocationStrategy = Shapes::StringShape.new(name: 'SpotProvisioningAllocationStrategy')
     SpotProvisioningSpecification = Shapes::StructureShape.new(name: 'SpotProvisioningSpecification')
     SpotProvisioningTimeoutAction = Shapes::StringShape.new(name: 'SpotProvisioningTimeoutAction')
     Statistic = Shapes::StringShape.new(name: 'Statistic')
@@ -359,6 +364,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"))
@@ -420,6 +426,7 @@ module Aws::EMR
     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.add_member(:maximum_core_capacity_units, Shapes::ShapeRef.new(shape: Integer, location_name: "MaximumCoreCapacityUnits"))
     ComputeLimits.struct_class = Types::ComputeLimits
 
     Configuration.add_member(:classification, Shapes::ShapeRef.new(shape: String, location_name: "Classification"))
@@ -583,7 +590,8 @@ module Aws::EMR
     InstanceFleetModifyConfig.add_member(:target_spot_capacity, Shapes::ShapeRef.new(shape: WholeNumber, location_name: "TargetSpotCapacity"))
     InstanceFleetModifyConfig.struct_class = Types::InstanceFleetModifyConfig
 
-    InstanceFleetProvisioningSpecifications.add_member(:spot_specification, Shapes::ShapeRef.new(shape: SpotProvisioningSpecification, required: true, location_name: "SpotSpecification"))
+    InstanceFleetProvisioningSpecifications.add_member(:spot_specification, Shapes::ShapeRef.new(shape: SpotProvisioningSpecification, location_name: "SpotSpecification"))
+    InstanceFleetProvisioningSpecifications.add_member(:on_demand_specification, Shapes::ShapeRef.new(shape: OnDemandProvisioningSpecification, location_name: "OnDemandSpecification"))
     InstanceFleetProvisioningSpecifications.struct_class = Types::InstanceFleetProvisioningSpecifications
 
     InstanceFleetStateChangeReason.add_member(:code, Shapes::ShapeRef.new(shape: InstanceFleetStateChangeReasonCode, location_name: "Code"))
@@ -735,6 +743,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"))
@@ -897,6 +906,9 @@ module Aws::EMR
 
     NewSupportedProductsList.member = Shapes::ShapeRef.new(shape: SupportedProductConfig)
 
+    OnDemandProvisioningSpecification.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: OnDemandProvisioningAllocationStrategy, required: true, location_name: "AllocationStrategy"))
+    OnDemandProvisioningSpecification.struct_class = Types::OnDemandProvisioningSpecification
+
     PlacementType.add_member(:availability_zone, Shapes::ShapeRef.new(shape: XmlString, location_name: "AvailabilityZone"))
     PlacementType.add_member(:availability_zones, Shapes::ShapeRef.new(shape: XmlStringMaxLen256List, location_name: "AvailabilityZones"))
     PlacementType.struct_class = Types::PlacementType
@@ -948,6 +960,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"))
@@ -1028,6 +1041,7 @@ module Aws::EMR
     SpotProvisioningSpecification.add_member(:timeout_duration_minutes, Shapes::ShapeRef.new(shape: WholeNumber, required: true, location_name: "TimeoutDurationMinutes"))
     SpotProvisioningSpecification.add_member(:timeout_action, Shapes::ShapeRef.new(shape: SpotProvisioningTimeoutAction, required: true, location_name: "TimeoutAction"))
     SpotProvisioningSpecification.add_member(:block_duration_minutes, Shapes::ShapeRef.new(shape: WholeNumber, location_name: "BlockDurationMinutes"))
+    SpotProvisioningSpecification.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: SpotProvisioningAllocationStrategy, location_name: "AllocationStrategy"))
     SpotProvisioningSpecification.struct_class = Types::SpotProvisioningSpecification
 
     Step.add_member(:id, Shapes::ShapeRef.new(shape: StepId, location_name: "Id"))

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing for info on making contributions:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -51,10 +53,14 @@ module Aws::EMR
     #             },
     #           ],
     #           launch_specifications: {
-    #             spot_specification: { # required
+    #             spot_specification: {
     #               timeout_duration_minutes: 1, # required
     #               timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #               block_duration_minutes: 1,
+    #               allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #             },
+    #             on_demand_specification: {
+    #               allocation_strategy: "lowest-price", # required, accepts lowest-price
     #             },
     #           },
     #         },
@@ -73,6 +79,7 @@ module Aws::EMR
     class AddInstanceFleetInput < Struct.new(
       :cluster_id,
       :instance_fleet)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -94,6 +101,7 @@ module Aws::EMR
       :cluster_id,
       :instance_fleet_id,
       :cluster_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -191,6 +199,7 @@ module Aws::EMR
     class AddInstanceGroupsInput < Struct.new(
       :instance_groups,
       :job_flow_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -214,6 +223,7 @@ module Aws::EMR
       :job_flow_id,
       :instance_group_ids,
       :cluster_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -257,6 +267,7 @@ module Aws::EMR
     class AddJobFlowStepsInput < Struct.new(
       :job_flow_id,
       :steps)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -270,6 +281,7 @@ module Aws::EMR
     #
     class AddJobFlowStepsOutput < Struct.new(
       :step_ids)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -305,6 +317,7 @@ module Aws::EMR
     class AddTagsInput < Struct.new(
       :resource_id,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -367,6 +380,7 @@ module Aws::EMR
       :version,
       :args,
       :additional_info)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -434,6 +448,7 @@ module Aws::EMR
     class AutoScalingPolicy < Struct.new(
       :constraints,
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -464,6 +479,7 @@ module Aws::EMR
       :status,
       :constraints,
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -487,6 +503,7 @@ module Aws::EMR
     class AutoScalingPolicyStateChangeReason < Struct.new(
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -505,6 +522,7 @@ module Aws::EMR
     class AutoScalingPolicyStatus < Struct.new(
       :state,
       :state_change_reason)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -554,6 +572,7 @@ module Aws::EMR
     class BlockPublicAccessConfiguration < Struct.new(
       :block_public_security_group_rules,
       :permitted_public_security_group_rule_ranges)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -577,6 +596,7 @@ module Aws::EMR
     class BlockPublicAccessConfigurationMetadata < Struct.new(
       :creation_date_time,
       :created_by_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -606,6 +626,7 @@ module Aws::EMR
     class BootstrapActionConfig < Struct.new(
       :name,
       :script_bootstrap_action)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -620,6 +641,7 @@ module Aws::EMR
     #
     class BootstrapActionDetail < Struct.new(
       :bootstrap_action_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -645,6 +667,7 @@ module Aws::EMR
       :step_id,
       :status,
       :reason)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -680,6 +703,7 @@ module Aws::EMR
       :cluster_id,
       :step_ids,
       :step_cancellation_option)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -694,6 +718,7 @@ module Aws::EMR
     #
     class CancelStepsOutput < Struct.new(
       :cancel_steps_info_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -779,6 +804,7 @@ module Aws::EMR
       :threshold,
       :unit,
       :dimensions)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -819,6 +845,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]
@@ -977,6 +1009,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,
@@ -999,6 +1032,7 @@ module Aws::EMR
       :cluster_arn,
       :outpost_arn,
       :step_concurrency_level)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1017,6 +1051,7 @@ module Aws::EMR
     class ClusterStateChangeReason < Struct.new(
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1041,6 +1076,7 @@ module Aws::EMR
       :state,
       :state_change_reason,
       :timeline)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1086,6 +1122,7 @@ module Aws::EMR
       :normalized_instance_hours,
       :cluster_arn,
       :outpost_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1109,6 +1146,7 @@ module Aws::EMR
       :creation_date_time,
       :ready_date_time,
       :end_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1132,6 +1170,7 @@ module Aws::EMR
       :name,
       :script_path,
       :args)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1148,6 +1187,7 @@ module Aws::EMR
     #         minimum_capacity_units: 1, # required
     #         maximum_capacity_units: 1, # required
     #         maximum_on_demand_capacity_units: 1,
+    #         maximum_core_capacity_units: 1,
     #       }
     #
     # @!attribute [rw] unit_type
@@ -1171,12 +1211,19 @@ module Aws::EMR
     #   @return [Integer]
     #
     # @!attribute [rw] maximum_on_demand_capacity_units
-    #   The upper boundary of on-demand EC2 units. It is measured through
+    #   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.
+    #   units for instance fleets. The On-Demand units are not allowed to
+    #   scale beyond this boundary. The parameter is used to split capacity
+    #   allocation between On-Demand and Spot instances.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] maximum_core_capacity_units
+    #   The upper boundary of EC2 units for core node type in a cluster. It
+    #   is measured through VCPU cores or instances for instance groups and
+    #   measured through units for instance fleets. The core units are not
+    #   allowed to scale beyond this boundary. The parameter is used to
+    #   split capacity allocation between core and task nodes.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ComputeLimits AWS API Documentation
@@ -1185,7 +1232,9 @@ module Aws::EMR
       :unit_type,
       :minimum_capacity_units,
       :maximum_capacity_units,
-      :maximum_on_demand_capacity_units)
+      :maximum_on_demand_capacity_units,
+      :maximum_core_capacity_units)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1245,6 +1294,7 @@ module Aws::EMR
       :classification,
       :configurations,
       :properties)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1275,6 +1325,7 @@ module Aws::EMR
     class CreateSecurityConfigurationInput < Struct.new(
       :name,
       :security_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1291,6 +1342,7 @@ module Aws::EMR
     class CreateSecurityConfigurationOutput < Struct.new(
       :name,
       :creation_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1309,6 +1361,7 @@ module Aws::EMR
     #
     class DeleteSecurityConfigurationInput < Struct.new(
       :name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1333,6 +1386,7 @@ module Aws::EMR
     #
     class DescribeClusterInput < Struct.new(
       :cluster_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1346,6 +1400,7 @@ module Aws::EMR
     #
     class DescribeClusterOutput < Struct.new(
       :cluster)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1384,6 +1439,7 @@ module Aws::EMR
       :created_before,
       :job_flow_ids,
       :job_flow_states)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1397,6 +1453,7 @@ module Aws::EMR
     #
     class DescribeJobFlowsOutput < Struct.new(
       :job_flows)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1415,6 +1472,7 @@ module Aws::EMR
     #
     class DescribeSecurityConfigurationInput < Struct.new(
       :name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1436,6 +1494,7 @@ module Aws::EMR
       :name,
       :security_configuration,
       :creation_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1462,6 +1521,7 @@ module Aws::EMR
     class DescribeStepInput < Struct.new(
       :cluster_id,
       :step_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1475,6 +1535,7 @@ module Aws::EMR
     #
     class DescribeStepOutput < Struct.new(
       :step)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1496,6 +1557,7 @@ module Aws::EMR
     class EbsBlockDevice < Struct.new(
       :volume_specification,
       :device)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1531,6 +1593,7 @@ module Aws::EMR
     class EbsBlockDeviceConfig < Struct.new(
       :volume_specification,
       :volumes_per_instance)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1567,6 +1630,7 @@ module Aws::EMR
     class EbsConfiguration < Struct.new(
       :ebs_block_device_configs,
       :ebs_optimized)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1585,6 +1649,7 @@ module Aws::EMR
     class EbsVolume < Struct.new(
       :device,
       :volume_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1678,6 +1743,7 @@ module Aws::EMR
       :service_access_security_group,
       :additional_master_security_groups,
       :additional_slave_security_groups)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1707,6 +1773,7 @@ module Aws::EMR
       :reason,
       :message,
       :log_file)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1753,6 +1820,7 @@ module Aws::EMR
     class GetBlockPublicAccessConfigurationOutput < Struct.new(
       :block_public_access_configuration,
       :block_public_access_configuration_metadata)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1772,6 +1840,7 @@ module Aws::EMR
     #
     class GetManagedScalingPolicyInput < Struct.new(
       :cluster_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1784,6 +1853,7 @@ module Aws::EMR
     #
     class GetManagedScalingPolicyOutput < Struct.new(
       :managed_scaling_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1833,6 +1903,7 @@ module Aws::EMR
       :jar,
       :main_class,
       :args)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1867,6 +1938,7 @@ module Aws::EMR
       :properties,
       :main_class,
       :args)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1937,6 +2009,7 @@ module Aws::EMR
       :market,
       :instance_type,
       :ebs_volumes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2056,6 +2129,7 @@ module Aws::EMR
       :provisioned_spot_capacity,
       :instance_type_specifications,
       :launch_specifications)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2107,10 +2181,14 @@ module Aws::EMR
     #           },
     #         ],
     #         launch_specifications: {
-    #           spot_specification: { # required
+    #           spot_specification: {
     #             timeout_duration_minutes: 1, # required
     #             timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #             block_duration_minutes: 1,
+    #             allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #           },
+    #           on_demand_specification: {
+    #             allocation_strategy: "lowest-price", # required, accepts lowest-price
     #           },
     #         },
     #       }
@@ -2190,6 +2268,7 @@ module Aws::EMR
       :target_spot_capacity,
       :instance_type_configs,
       :launch_specifications)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2229,14 +2308,18 @@ module Aws::EMR
       :instance_fleet_id,
       :target_on_demand_capacity,
       :target_spot_capacity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
     # The launch specification for Spot instances in the fleet, which
-    # determines the defined duration and provisioning timeout behavior.
+    # determines the defined duration, provisioning timeout behavior, and
+    # allocation strategy.
     #
     # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    # versions 4.8.0 and later, excluding 5.0.x versions.
+    # versions 4.8.0 and later, excluding 5.0.x versions. On-Demand and Spot
+    # instance allocation strategies are available in Amazon EMR version
+    # 5.12.1 and later.
     #
     #  </note>
     #
@@ -2244,22 +2327,41 @@ module Aws::EMR
     #   data as a hash:
     #
     #       {
-    #         spot_specification: { # required
+    #         spot_specification: {
     #           timeout_duration_minutes: 1, # required
     #           timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #           block_duration_minutes: 1,
+    #           allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #         },
+    #         on_demand_specification: {
+    #           allocation_strategy: "lowest-price", # required, accepts lowest-price
     #         },
     #       }
     #
     # @!attribute [rw] spot_specification
     #   The launch specification for Spot instances in the fleet, which
-    #   determines the defined duration and provisioning timeout behavior.
+    #   determines the defined duration, provisioning timeout behavior, and
+    #   allocation strategy.
     #   @return [Types::SpotProvisioningSpecification]
     #
+    # @!attribute [rw] on_demand_specification
+    #   The launch specification for On-Demand instances in the instance
+    #   fleet, which determines the allocation strategy.
+    #
+    #   <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
+    #   versions 4.8.0 and later, excluding 5.0.x versions. On-Demand
+    #   instances allocation strategy is available in Amazon EMR version
+    #   5.12.1 and later.
+    #
+    #    </note>
+    #   @return [Types::OnDemandProvisioningSpecification]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InstanceFleetProvisioningSpecifications AWS API Documentation
     #
     class InstanceFleetProvisioningSpecifications < Struct.new(
-      :spot_specification)
+      :spot_specification,
+      :on_demand_specification)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2283,6 +2385,7 @@ module Aws::EMR
     class InstanceFleetStateChangeReason < Struct.new(
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2334,6 +2437,7 @@ module Aws::EMR
       :state,
       :state_change_reason,
       :timeline)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2364,6 +2468,7 @@ module Aws::EMR
       :creation_date_time,
       :ready_date_time,
       :end_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2479,6 +2584,7 @@ module Aws::EMR
       :ebs_optimized,
       :shrink_policy,
       :auto_scaling_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2620,6 +2726,7 @@ module Aws::EMR
       :configurations,
       :ebs_configuration,
       :auto_scaling_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2702,6 +2809,7 @@ module Aws::EMR
       :start_date_time,
       :ready_date_time,
       :end_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2765,6 +2873,7 @@ module Aws::EMR
       :ec2_instance_ids_to_terminate,
       :shrink_policy,
       :configurations)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2783,6 +2892,7 @@ module Aws::EMR
     class InstanceGroupStateChangeReason < Struct.new(
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2806,6 +2916,7 @@ module Aws::EMR
       :state,
       :state_change_reason,
       :timeline)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2830,6 +2941,7 @@ module Aws::EMR
       :creation_date_time,
       :ready_date_time,
       :end_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2866,6 +2978,7 @@ module Aws::EMR
       :instances_to_terminate,
       :instances_to_protect,
       :instance_termination_timeout)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2884,6 +2997,7 @@ module Aws::EMR
     class InstanceStateChangeReason < Struct.new(
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2907,6 +3021,7 @@ module Aws::EMR
       :state,
       :state_change_reason,
       :timeline)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2930,6 +3045,7 @@ module Aws::EMR
       :creation_date_time,
       :ready_date_time,
       :end_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3024,6 +3140,7 @@ module Aws::EMR
       :bid_price_as_percentage_of_on_demand_price,
       :ebs_configuration,
       :configurations)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3084,6 +3201,7 @@ module Aws::EMR
       :configurations,
       :ebs_block_devices,
       :ebs_optimized)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3105,6 +3223,7 @@ module Aws::EMR
     #
     class InternalServerException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3123,6 +3242,7 @@ module Aws::EMR
     class InvalidRequestException < Struct.new(
       :error_code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3140,6 +3260,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
@@ -3220,6 +3346,7 @@ module Aws::EMR
       :job_flow_id,
       :name,
       :log_uri,
+      :log_encryption_kms_key_id,
       :ami_version,
       :execution_status_detail,
       :instances,
@@ -3231,6 +3358,7 @@ module Aws::EMR
       :service_role,
       :auto_scaling_role,
       :scale_down_behavior)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3270,6 +3398,7 @@ module Aws::EMR
       :ready_date_time,
       :end_date_time,
       :last_state_change_reason)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3398,10 +3527,14 @@ module Aws::EMR
     #               },
     #             ],
     #             launch_specifications: {
-    #               spot_specification: { # required
+    #               spot_specification: {
     #                 timeout_duration_minutes: 1, # required
     #                 timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #                 block_duration_minutes: 1,
+    #                 allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #               },
+    #               on_demand_specification: {
+    #                 allocation_strategy: "lowest-price", # required, accepts lowest-price
     #               },
     #             },
     #           },
@@ -3543,6 +3676,7 @@ module Aws::EMR
       :service_access_security_group,
       :additional_master_security_groups,
       :additional_slave_security_groups)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3633,6 +3767,7 @@ module Aws::EMR
       :keep_job_flow_alive_when_no_steps,
       :termination_protected,
       :hadoop_version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3690,6 +3825,7 @@ module Aws::EMR
       :cross_realm_trust_principal_password,
       :ad_domain_join_user,
       :ad_domain_join_password)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3716,6 +3852,7 @@ module Aws::EMR
     class KeyValue < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3743,6 +3880,7 @@ module Aws::EMR
     class ListBootstrapActionsInput < Struct.new(
       :cluster_id,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3762,6 +3900,7 @@ module Aws::EMR
     class ListBootstrapActionsOutput < Struct.new(
       :bootstrap_actions,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3803,6 +3942,7 @@ module Aws::EMR
       :created_before,
       :cluster_states,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3823,6 +3963,7 @@ module Aws::EMR
     class ListClustersOutput < Struct.new(
       :clusters,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3848,6 +3989,7 @@ module Aws::EMR
     class ListInstanceFleetsInput < Struct.new(
       :cluster_id,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3865,6 +4007,7 @@ module Aws::EMR
     class ListInstanceFleetsOutput < Struct.new(
       :instance_fleets,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3892,6 +4035,7 @@ module Aws::EMR
     class ListInstanceGroupsInput < Struct.new(
       :cluster_id,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3911,6 +4055,7 @@ module Aws::EMR
     class ListInstanceGroupsOutput < Struct.new(
       :instance_groups,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3971,6 +4116,7 @@ module Aws::EMR
       :instance_fleet_type,
       :instance_states,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3990,6 +4136,7 @@ module Aws::EMR
     class ListInstancesOutput < Struct.new(
       :instances,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4008,6 +4155,7 @@ module Aws::EMR
     #
     class ListSecurityConfigurationsInput < Struct.new(
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4027,6 +4175,7 @@ module Aws::EMR
     class ListSecurityConfigurationsOutput < Struct.new(
       :security_configurations,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4068,6 +4217,7 @@ module Aws::EMR
       :step_states,
       :step_ids,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4088,6 +4238,7 @@ module Aws::EMR
     class ListStepsOutput < Struct.new(
       :steps,
       :marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4105,6 +4256,7 @@ module Aws::EMR
     #           minimum_capacity_units: 1, # required
     #           maximum_capacity_units: 1, # required
     #           maximum_on_demand_capacity_units: 1,
+    #           maximum_core_capacity_units: 1,
     #         },
     #       }
     #
@@ -4119,6 +4271,7 @@ module Aws::EMR
     #
     class ManagedScalingPolicy < Struct.new(
       :compute_limits)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4149,6 +4302,7 @@ module Aws::EMR
     class MetricDimension < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4174,6 +4328,7 @@ module Aws::EMR
     class ModifyClusterInput < Struct.new(
       :cluster_id,
       :step_concurrency_level)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4185,6 +4340,7 @@ module Aws::EMR
     #
     class ModifyClusterOutput < Struct.new(
       :step_concurrency_level)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4213,6 +4369,7 @@ module Aws::EMR
     class ModifyInstanceFleetInput < Struct.new(
       :cluster_id,
       :instance_fleet)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4264,6 +4421,38 @@ module Aws::EMR
     class ModifyInstanceGroupsInput < Struct.new(
       :cluster_id,
       :instance_groups)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The launch specification for On-Demand instances in the instance
+    # fleet, which determines the allocation strategy.
+    #
+    # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
+    # versions 4.8.0 and later, excluding 5.0.x versions. On-Demand
+    # instances allocation strategy is available in Amazon EMR version
+    # 5.12.1 and later.
+    #
+    #  </note>
+    #
+    # @note When making an API call, you may pass OnDemandProvisioningSpecification
+    #   data as a hash:
+    #
+    #       {
+    #         allocation_strategy: "lowest-price", # required, accepts lowest-price
+    #       }
+    #
+    # @!attribute [rw] allocation_strategy
+    #   Specifies the strategy to use in launching On-Demand instance
+    #   fleets. Currently, the only option is lowest-price (the default),
+    #   which launches the lowest price first.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/OnDemandProvisioningSpecification AWS API Documentation
+    #
+    class OnDemandProvisioningSpecification < Struct.new(
+      :allocation_strategy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4301,6 +4490,7 @@ module Aws::EMR
     class PlacementType < Struct.new(
       :availability_zone,
       :availability_zones)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4329,6 +4519,7 @@ module Aws::EMR
     class PortRange < Struct.new(
       :min_range,
       :max_range)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4398,6 +4589,7 @@ module Aws::EMR
       :cluster_id,
       :instance_group_id,
       :auto_scaling_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4426,6 +4618,7 @@ module Aws::EMR
       :instance_group_id,
       :auto_scaling_policy,
       :cluster_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4471,6 +4664,7 @@ module Aws::EMR
     #
     class PutBlockPublicAccessConfigurationInput < Struct.new(
       :block_public_access_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4489,6 +4683,7 @@ module Aws::EMR
     #             minimum_capacity_units: 1, # required
     #             maximum_capacity_units: 1, # required
     #             maximum_on_demand_capacity_units: 1,
+    #             maximum_core_capacity_units: 1,
     #           },
     #         },
     #       }
@@ -4507,6 +4702,7 @@ module Aws::EMR
     class PutManagedScalingPolicyInput < Struct.new(
       :cluster_id,
       :managed_scaling_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4537,6 +4733,7 @@ module Aws::EMR
     class RemoveAutoScalingPolicyInput < Struct.new(
       :cluster_id,
       :instance_group_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4560,6 +4757,7 @@ module Aws::EMR
     #
     class RemoveManagedScalingPolicyInput < Struct.new(
       :cluster_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4591,6 +4789,7 @@ module Aws::EMR
     class RemoveTagsInput < Struct.new(
       :resource_id,
       :tag_keys)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4608,6 +4807,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",
@@ -4726,10 +4926,14 @@ module Aws::EMR
     #                 },
     #               ],
     #               launch_specifications: {
-    #                 spot_specification: { # required
+    #                 spot_specification: {
     #                   timeout_duration_minutes: 1, # required
     #                   timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #                   block_duration_minutes: 1,
+    #                   allocation_strategy: "capacity-optimized", # accepts capacity-optimized
+    #                 },
+    #                 on_demand_specification: {
+    #                   allocation_strategy: "lowest-price", # required, accepts lowest-price
     #                 },
     #               },
     #             },
@@ -4833,6 +5037,7 @@ module Aws::EMR
     #             minimum_capacity_units: 1, # required
     #             maximum_capacity_units: 1, # required
     #             maximum_on_demand_capacity_units: 1,
+    #             maximum_core_capacity_units: 1,
     #           },
     #         },
     #       }
@@ -4846,6 +5051,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]
@@ -5071,6 +5283,7 @@ module Aws::EMR
     class RunJobFlowInput < Struct.new(
       :name,
       :log_uri,
+      :log_encryption_kms_key_id,
       :additional_info,
       :ami_version,
       :release_label,
@@ -5094,6 +5307,7 @@ module Aws::EMR
       :kerberos_attributes,
       :step_concurrency_level,
       :managed_scaling_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5112,6 +5326,7 @@ module Aws::EMR
     class RunJobFlowOutput < Struct.new(
       :job_flow_id,
       :cluster_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5145,6 +5360,7 @@ module Aws::EMR
     class ScalingAction < Struct.new(
       :market,
       :simple_scaling_policy_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5178,6 +5394,7 @@ module Aws::EMR
     class ScalingConstraints < Struct.new(
       :min_capacity,
       :max_capacity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5246,6 +5463,7 @@ module Aws::EMR
       :description,
       :action,
       :trigger)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5283,6 +5501,7 @@ module Aws::EMR
     #
     class ScalingTrigger < Struct.new(
       :cloud_watch_alarm_definition)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5311,6 +5530,7 @@ module Aws::EMR
     class ScriptBootstrapActionConfig < Struct.new(
       :path,
       :args)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5329,6 +5549,7 @@ module Aws::EMR
     class SecurityConfigurationSummary < Struct.new(
       :name,
       :creation_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5359,6 +5580,7 @@ module Aws::EMR
     class SetTerminationProtectionInput < Struct.new(
       :job_flow_ids,
       :termination_protected)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5388,6 +5610,7 @@ module Aws::EMR
     class SetVisibleToAllUsersInput < Struct.new(
       :job_flow_ids,
       :visible_to_all_users)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5421,6 +5644,7 @@ module Aws::EMR
     class ShrinkPolicy < Struct.new(
       :decommission_timeout,
       :instance_resize_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5477,15 +5701,18 @@ module Aws::EMR
       :adjustment_type,
       :scaling_adjustment,
       :cool_down)
+      SENSITIVE = []
       include Aws::Structure
     end
 
     # The launch specification for Spot instances in the instance fleet,
-    # which determines the defined duration and provisioning timeout
-    # behavior.
+    # which determines the defined duration, provisioning timeout behavior,
+    # and allocation strategy.
     #
     # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    # versions 4.8.0 and later, excluding 5.0.x versions.
+    # versions 4.8.0 and later, excluding 5.0.x versions. Spot instance
+    # allocation strategy is available in Amazon EMR version 5.12.1 and
+    # later.
     #
     #  </note>
     #
@@ -5496,6 +5723,7 @@ module Aws::EMR
     #         timeout_duration_minutes: 1, # required
     #         timeout_action: "SWITCH_TO_ON_DEMAND", # required, accepts SWITCH_TO_ON_DEMAND, TERMINATE_CLUSTER
     #         block_duration_minutes: 1,
+    #         allocation_strategy: "capacity-optimized", # accepts capacity-optimized
     #       }
     #
     # @!attribute [rw] timeout_duration_minutes
@@ -5528,12 +5756,21 @@ module Aws::EMR
     #   before it terminates.
     #   @return [Integer]
     #
+    # @!attribute [rw] allocation_strategy
+    #   Specifies the strategy to use in launching Spot instance fleets.
+    #   Currently, the only option is capacity-optimized (the default),
+    #   which launches instances from Spot instance pools with optimal
+    #   capacity for the number of instances that are launching.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/SpotProvisioningSpecification AWS API Documentation
     #
     class SpotProvisioningSpecification < Struct.new(
       :timeout_duration_minutes,
       :timeout_action,
-      :block_duration_minutes)
+      :block_duration_minutes,
+      :allocation_strategy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5570,6 +5807,7 @@ module Aws::EMR
       :config,
       :action_on_failure,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5615,6 +5853,7 @@ module Aws::EMR
       :name,
       :action_on_failure,
       :hadoop_jar_step)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5633,6 +5872,7 @@ module Aws::EMR
     class StepDetail < Struct.new(
       :step_config,
       :execution_status_detail)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5666,6 +5906,7 @@ module Aws::EMR
       :start_date_time,
       :end_date_time,
       :last_state_change_reason)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5685,6 +5926,7 @@ module Aws::EMR
     class StepStateChangeReason < Struct.new(
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5714,6 +5956,7 @@ module Aws::EMR
       :state_change_reason,
       :failure_details,
       :timeline)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5750,6 +5993,7 @@ module Aws::EMR
       :config,
       :action_on_failure,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5774,6 +6018,7 @@ module Aws::EMR
       :creation_date_time,
       :start_date_time,
       :end_date_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5802,6 +6047,7 @@ module Aws::EMR
     class SupportedProductConfig < Struct.new(
       :name,
       :args)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5846,6 +6092,7 @@ module Aws::EMR
     class Tag < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5866,6 +6113,7 @@ module Aws::EMR
     #
     class TerminateJobFlowsInput < Struct.new(
       :job_flow_ids)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5902,6 +6150,7 @@ module Aws::EMR
       :volume_type,
       :iops,
       :size_in_gb)
+      SENSITIVE = []
       include Aws::Structure
     end