aws-sdk-emr 1.43.0 → 1.47.0

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -80,6 +80,8 @@ module Aws::EMR
     DescribeJobFlowsOutput = Shapes::StructureShape.new(name: 'DescribeJobFlowsOutput')
     DescribeNotebookExecutionInput = Shapes::StructureShape.new(name: 'DescribeNotebookExecutionInput')
     DescribeNotebookExecutionOutput = Shapes::StructureShape.new(name: 'DescribeNotebookExecutionOutput')
+    DescribeReleaseLabelInput = Shapes::StructureShape.new(name: 'DescribeReleaseLabelInput')
+    DescribeReleaseLabelOutput = Shapes::StructureShape.new(name: 'DescribeReleaseLabelOutput')
     DescribeSecurityConfigurationInput = Shapes::StructureShape.new(name: 'DescribeSecurityConfigurationInput')
     DescribeSecurityConfigurationOutput = Shapes::StructureShape.new(name: 'DescribeSecurityConfigurationOutput')
     DescribeStepInput = Shapes::StructureShape.new(name: 'DescribeStepInput')
@@ -183,6 +185,8 @@ module Aws::EMR
     ListInstancesOutput = Shapes::StructureShape.new(name: 'ListInstancesOutput')
     ListNotebookExecutionsInput = Shapes::StructureShape.new(name: 'ListNotebookExecutionsInput')
     ListNotebookExecutionsOutput = Shapes::StructureShape.new(name: 'ListNotebookExecutionsOutput')
+    ListReleaseLabelsInput = Shapes::StructureShape.new(name: 'ListReleaseLabelsInput')
+    ListReleaseLabelsOutput = Shapes::StructureShape.new(name: 'ListReleaseLabelsOutput')
     ListSecurityConfigurationsInput = Shapes::StructureShape.new(name: 'ListSecurityConfigurationsInput')
     ListSecurityConfigurationsOutput = Shapes::StructureShape.new(name: 'ListSecurityConfigurationsOutput')
     ListStepsInput = Shapes::StructureShape.new(name: 'ListStepsInput')
@@ -195,6 +199,7 @@ module Aws::EMR
     ManagedScalingPolicy = Shapes::StructureShape.new(name: 'ManagedScalingPolicy')
     Marker = Shapes::StringShape.new(name: 'Marker')
     MarketType = Shapes::StringShape.new(name: 'MarketType')
+    MaxResultsNumber = Shapes::IntegerShape.new(name: 'MaxResultsNumber')
     MetricDimension = Shapes::StructureShape.new(name: 'MetricDimension')
     MetricDimensionList = Shapes::ListShape.new(name: 'MetricDimensionList')
     ModifyClusterInput = Shapes::StructureShape.new(name: 'ModifyClusterInput')
@@ -226,6 +231,7 @@ module Aws::EMR
     PutBlockPublicAccessConfigurationOutput = Shapes::StructureShape.new(name: 'PutBlockPublicAccessConfigurationOutput')
     PutManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'PutManagedScalingPolicyInput')
     PutManagedScalingPolicyOutput = Shapes::StructureShape.new(name: 'PutManagedScalingPolicyOutput')
+    ReleaseLabelFilter = Shapes::StructureShape.new(name: 'ReleaseLabelFilter')
     RemoveAutoScalingPolicyInput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyInput')
     RemoveAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyOutput')
     RemoveManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'RemoveManagedScalingPolicyInput')
@@ -253,6 +259,8 @@ module Aws::EMR
     SetVisibleToAllUsersInput = Shapes::StructureShape.new(name: 'SetVisibleToAllUsersInput')
     ShrinkPolicy = Shapes::StructureShape.new(name: 'ShrinkPolicy')
     SimpleScalingPolicyConfiguration = Shapes::StructureShape.new(name: 'SimpleScalingPolicyConfiguration')
+    SimplifiedApplication = Shapes::StructureShape.new(name: 'SimplifiedApplication')
+    SimplifiedApplicationList = Shapes::ListShape.new(name: 'SimplifiedApplicationList')
     SpotProvisioningAllocationStrategy = Shapes::StringShape.new(name: 'SpotProvisioningAllocationStrategy')
     SpotProvisioningSpecification = Shapes::StructureShape.new(name: 'SpotProvisioningSpecification')
     SpotProvisioningTimeoutAction = Shapes::StringShape.new(name: 'SpotProvisioningTimeoutAction')
@@ -547,6 +555,16 @@ module Aws::EMR
     DescribeNotebookExecutionOutput.add_member(:notebook_execution, Shapes::ShapeRef.new(shape: NotebookExecution, location_name: "NotebookExecution"))
     DescribeNotebookExecutionOutput.struct_class = Types::DescribeNotebookExecutionOutput
 
+    DescribeReleaseLabelInput.add_member(:release_label, Shapes::ShapeRef.new(shape: String, location_name: "ReleaseLabel"))
+    DescribeReleaseLabelInput.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeReleaseLabelInput.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResultsNumber, location_name: "MaxResults"))
+    DescribeReleaseLabelInput.struct_class = Types::DescribeReleaseLabelInput
+
+    DescribeReleaseLabelOutput.add_member(:release_label, Shapes::ShapeRef.new(shape: String, location_name: "ReleaseLabel"))
+    DescribeReleaseLabelOutput.add_member(:applications, Shapes::ShapeRef.new(shape: SimplifiedApplicationList, location_name: "Applications"))
+    DescribeReleaseLabelOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeReleaseLabelOutput.struct_class = Types::DescribeReleaseLabelOutput
+
     DescribeSecurityConfigurationInput.add_member(:name, Shapes::ShapeRef.new(shape: XmlString, required: true, location_name: "Name"))
     DescribeSecurityConfigurationInput.struct_class = Types::DescribeSecurityConfigurationInput
 
@@ -977,6 +995,15 @@ module Aws::EMR
     ListNotebookExecutionsOutput.add_member(:marker, Shapes::ShapeRef.new(shape: Marker, location_name: "Marker"))
     ListNotebookExecutionsOutput.struct_class = Types::ListNotebookExecutionsOutput
 
+    ListReleaseLabelsInput.add_member(:filters, Shapes::ShapeRef.new(shape: ReleaseLabelFilter, location_name: "Filters"))
+    ListReleaseLabelsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    ListReleaseLabelsInput.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResultsNumber, location_name: "MaxResults"))
+    ListReleaseLabelsInput.struct_class = Types::ListReleaseLabelsInput
+
+    ListReleaseLabelsOutput.add_member(:release_labels, Shapes::ShapeRef.new(shape: StringList, location_name: "ReleaseLabels"))
+    ListReleaseLabelsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    ListReleaseLabelsOutput.struct_class = Types::ListReleaseLabelsOutput
+
     ListSecurityConfigurationsInput.add_member(:marker, Shapes::ShapeRef.new(shape: Marker, location_name: "Marker"))
     ListSecurityConfigurationsInput.struct_class = Types::ListSecurityConfigurationsInput
 
@@ -1063,6 +1090,7 @@ module Aws::EMR
 
     OnDemandCapacityReservationOptions.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: OnDemandCapacityReservationUsageStrategy, location_name: "UsageStrategy"))
     OnDemandCapacityReservationOptions.add_member(:capacity_reservation_preference, Shapes::ShapeRef.new(shape: OnDemandCapacityReservationPreference, location_name: "CapacityReservationPreference"))
+    OnDemandCapacityReservationOptions.add_member(:capacity_reservation_resource_group_arn, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CapacityReservationResourceGroupArn"))
     OnDemandCapacityReservationOptions.struct_class = Types::OnDemandCapacityReservationOptions
 
     OnDemandProvisioningSpecification.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: OnDemandProvisioningAllocationStrategy, required: true, location_name: "AllocationStrategy"))
@@ -1107,6 +1135,10 @@ module Aws::EMR
 
     PutManagedScalingPolicyOutput.struct_class = Types::PutManagedScalingPolicyOutput
 
+    ReleaseLabelFilter.add_member(:prefix, Shapes::ShapeRef.new(shape: String, location_name: "Prefix"))
+    ReleaseLabelFilter.add_member(:application, Shapes::ShapeRef.new(shape: String, location_name: "Application"))
+    ReleaseLabelFilter.struct_class = Types::ReleaseLabelFilter
+
     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
@@ -1224,6 +1256,12 @@ module Aws::EMR
     SimpleScalingPolicyConfiguration.add_member(:cool_down, Shapes::ShapeRef.new(shape: Integer, location_name: "CoolDown"))
     SimpleScalingPolicyConfiguration.struct_class = Types::SimpleScalingPolicyConfiguration
 
+    SimplifiedApplication.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "Name"))
+    SimplifiedApplication.add_member(:version, Shapes::ShapeRef.new(shape: String, location_name: "Version"))
+    SimplifiedApplication.struct_class = Types::SimplifiedApplication
+
+    SimplifiedApplicationList.member = Shapes::ShapeRef.new(shape: SimplifiedApplication)
+
     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"))
@@ -1530,6 +1568,16 @@ module Aws::EMR
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
 
+      api.add_operation(:describe_release_label, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeReleaseLabel"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeReleaseLabelInput)
+        o.output = Shapes::ShapeRef.new(shape: DescribeReleaseLabelOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+      end)
+
       api.add_operation(:describe_security_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeSecurityConfiguration"
         o.http_method = "POST"
@@ -1678,6 +1726,22 @@ module Aws::EMR
         )
       end)
 
+      api.add_operation(:list_release_labels, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListReleaseLabels"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListReleaseLabelsInput)
+        o.output = Shapes::ShapeRef.new(shape: ListReleaseLabelsOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:list_security_configurations, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListSecurityConfigurations"
         o.http_method = "POST"

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

@@ -2,7 +2,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing for info on making contributions:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -64,6 +64,7 @@ module Aws::EMR
     #               capacity_reservation_options: {
     #                 usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #                 capacity_reservation_preference: "open", # accepts open, none
+    #                 capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #               },
     #             },
     #           },
@@ -580,8 +581,8 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # Properties that describe the AWS principal that created the
-    # `BlockPublicAccessConfiguration` using the
+    # Properties that describe the Amazon Web Services principal that
+    # created the `BlockPublicAccessConfiguration` using the
     # `PutBlockPublicAccessConfiguration` action as well as the date and
     # time that the configuration was created. Each time a configuration for
     # block public access is updated, Amazon EMR updates this metadata.
@@ -850,9 +851,8 @@ module Aws::EMR
     #   @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.
+    #   The KMS key 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
@@ -891,15 +891,27 @@ module Aws::EMR
     #   @return [Boolean]
     #
     # @!attribute [rw] visible_to_all_users
-    #   Indicates whether the cluster is visible to all IAM users of the AWS
-    #   account associated with the cluster. The default value, `true`,
-    #   indicates that all IAM users in the AWS account can perform cluster
-    #   actions if they have the proper IAM policy permissions. If this
-    #   value is `false`, only the IAM user that created the cluster can
-    #   perform actions. This value can be changed on a running cluster by
-    #   using the SetVisibleToAllUsers action. You can override the default
-    #   value of `true` when you create a cluster by using the
-    #   `VisibleToAllUsers` parameter of the `RunJobFlow` action.
+    #   Indicates whether the cluster is visible to IAM principals in the
+    #   account associated with the cluster. When `true`, IAM principals in
+    #   the account can perform EMR cluster actions on the cluster that
+    #   their IAM policies allow. When `false`, only the IAM principal that
+    #   created the cluster and the account root user can perform EMR
+    #   actions, regardless of IAM permissions policies attached to other
+    #   IAM principals.
+    #
+    #   The default value is `false` if a value is not provided when
+    #   creating a cluster using the EMR API RunJobFlow command or the CLI
+    #   [create-cluster][1] command. The default value is `true` when a
+    #   cluster is created using the Management Console. IAM principals that
+    #   are allowed to perform actions on the cluster can use the
+    #   SetVisibleToAllUsers action to change the value on a running
+    #   cluster. For more information, see [Understanding the EMR Cluster
+    #   VisibleToAllUsers Setting][2] in the *Amazon EMR Management Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cli/latest/reference/emr/create-cluster.html
+    #   [2]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/security_iam_emr-with-iam.html#security_set_visible_to_all_users
     #   @return [Boolean]
     #
     # @!attribute [rw] applications
@@ -912,7 +924,7 @@ module Aws::EMR
     #
     # @!attribute [rw] service_role
     #   The IAM role that will be assumed by the Amazon EMR service to
-    #   access AWS resources on your behalf.
+    #   access Amazon Web Services resources on your behalf.
     #   @return [String]
     #
     # @!attribute [rw] normalized_instance_hours
@@ -1407,7 +1419,7 @@ module Aws::EMR
     # @!attribute [rw] service_role
     #   The IAM role that will be assumed by the Amazon EMR Studio. The
     #   service role provides a way for Amazon EMR Studio to interoperate
-    #   with other AWS services.
+    #   with other Amazon Web Services services.
     #   @return [String]
     #
     # @!attribute [rw] user_role
@@ -1430,9 +1442,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] default_s3_location
-    #   The default Amazon S3 location to back up Amazon EMR Studio
-    #   Workspaces and notebook files. A Studio user can select an
-    #   alternative Amazon S3 location when creating a Workspace.
+    #   The Amazon S3 location to back up Amazon EMR Studio Workspaces and
+    #   notebook files.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -1495,9 +1506,10 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_id
     #   The globally unique identifier (GUID) of the user or group from the
-    #   AWS SSO Identity Store. For more information, see [UserId][1] and
-    #   [GroupId][2] in the *AWS SSO Identity Store API Reference*. Either
-    #   `IdentityName` or `IdentityId` must be specified.
+    #   Amazon Web Services SSO Identity Store. For more information, see
+    #   [UserId][1] and [GroupId][2] in the *Amazon Web Services SSO
+    #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
+    #   must be specified.
     #
     #
     #
@@ -1507,9 +1519,9 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_name
     #   The name of the user or group. For more information, see
-    #   [UserName][1] and [DisplayName][2] in the *AWS SSO Identity Store
-    #   API Reference*. Either `IdentityName` or `IdentityId` must be
-    #   specified.
+    #   [UserName][1] and [DisplayName][2] in the *Amazon Web Services SSO
+    #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
+    #   must be specified.
     #
     #
     #
@@ -1524,8 +1536,14 @@ module Aws::EMR
     #
     # @!attribute [rw] session_policy_arn
     #   The Amazon Resource Name (ARN) for the session policy that will be
-    #   applied to the user or group. Session policies refine Studio user
-    #   permissions without the need to use multiple IAM user roles.
+    #   applied to the user or group. You should specify the ARN for the
+    #   session policy that you want to apply, not the ARN of your user
+    #   role. For more information, see [Create an EMR Studio User Role with
+    #   Session Policies][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-studio-user-role.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/CreateStudioSessionMappingInput AWS API Documentation
@@ -1599,8 +1617,8 @@ module Aws::EMR
     # @!attribute [rw] identity_id
     #   The globally unique identifier (GUID) of the user or group to remove
     #   from the Amazon EMR Studio. For more information, see [UserId][1]
-    #   and [GroupId][2] in the *AWS SSO Identity Store API Reference*.
-    #   Either `IdentityName` or `IdentityId` must be specified.
+    #   and [GroupId][2] in the *Amazon Web Services SSO Identity Store API
+    #   Reference*. Either `IdentityName` or `IdentityId` must be specified.
     #
     #
     #
@@ -1611,8 +1629,8 @@ module Aws::EMR
     # @!attribute [rw] identity_name
     #   The name of the user name or group to remove from the Amazon EMR
     #   Studio. For more information, see [UserName][1] and [DisplayName][2]
-    #   in the *AWS SSO Identity Store API Reference*. Either `IdentityName`
-    #   or `IdentityId` must be specified.
+    #   in the *Amazon Web Services SSO Store API Reference*. Either
+    #   `IdentityName` or `IdentityId` must be specified.
     #
     #
     #
@@ -1755,6 +1773,63 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeReleaseLabelInput
+    #   data as a hash:
+    #
+    #       {
+    #         release_label: "String",
+    #         next_token: "String",
+    #         max_results: 1,
+    #       }
+    #
+    # @!attribute [rw] release_label
+    #   The target release label to be described.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   The pagination token. Reserved for future use. Currently set to
+    #   null.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   Reserved for future use. Currently set to null.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeReleaseLabelInput AWS API Documentation
+    #
+    class DescribeReleaseLabelInput < Struct.new(
+      :release_label,
+      :next_token,
+      :max_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] release_label
+    #   The target release label described in the response.
+    #   @return [String]
+    #
+    # @!attribute [rw] applications
+    #   The list of applications available for the target release label.
+    #   `Name` is the name of the application. `Version` is the concise
+    #   version of the application.
+    #   @return [Array<Types::SimplifiedApplication>]
+    #
+    # @!attribute [rw] next_token
+    #   The pagination token. Reserved for future use. Currently set to
+    #   null.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/DescribeReleaseLabelOutput AWS API Documentation
+    #
+    class DescribeReleaseLabelOutput < Struct.new(
+      :release_label,
+      :applications,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeSecurityConfigurationInput
     #   data as a hash:
     #
@@ -2179,8 +2254,8 @@ module Aws::EMR
     #   @return [Types::BlockPublicAccessConfiguration]
     #
     # @!attribute [rw] block_public_access_configuration_metadata
-    #   Properties that describe the AWS principal that created the
-    #   `BlockPublicAccessConfiguration` using the
+    #   Properties that describe the Amazon Web Services principal that
+    #   created the `BlockPublicAccessConfiguration` using the
     #   `PutBlockPublicAccessConfiguration` action as well as the date and
     #   time that the configuration was created. Each time a configuration
     #   for block public access is updated, Amazon EMR updates this
@@ -2245,9 +2320,9 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_id
     #   The globally unique identifier (GUID) of the user or group. For more
-    #   information, see [UserId][1] and [GroupId][2] in the *AWS SSO
-    #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
-    #   must be specified.
+    #   information, see [UserId][1] and [GroupId][2] in the *Amazon Web
+    #   Services SSO Identity Store API Reference*. Either `IdentityName` or
+    #   `IdentityId` must be specified.
     #
     #
     #
@@ -2257,9 +2332,9 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_name
     #   The name of the user or group to fetch. For more information, see
-    #   [UserName][1] and [DisplayName][2] in the *AWS SSO Identity Store
-    #   API Reference*. Either `IdentityName` or `IdentityId` must be
-    #   specified.
+    #   [UserName][1] and [DisplayName][2] in the *Amazon Web Services SSO
+    #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
+    #   must be specified.
     #
     #
     #
@@ -2429,7 +2504,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] ebs_volumes
-    #   The list of EBS volumes that are attached to this instance.
+    #   The list of Amazon EBS volumes that are attached to this instance.
     #   @return [Array<Types::EbsVolume>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/Instance AWS API Documentation
@@ -2545,9 +2620,8 @@ module Aws::EMR
     #   @return [Integer]
     #
     # @!attribute [rw] instance_type_specifications
-    #   The specification for the instance types that comprise an instance
-    #   fleet. Up to five unique instance specifications may be defined for
-    #   each instance fleet.
+    #   An array of specifications for the instance types that comprise an
+    #   instance fleet.
     #   @return [Array<Types::InstanceTypeSpecification>]
     #
     # @!attribute [rw] launch_specifications
@@ -2630,6 +2704,7 @@ module Aws::EMR
     #             capacity_reservation_options: {
     #               usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #               capacity_reservation_preference: "open", # accepts open, none
+    #               capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #             },
     #           },
     #         },
@@ -2780,6 +2855,7 @@ module Aws::EMR
     #           capacity_reservation_options: {
     #             usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #             capacity_reservation_preference: "open", # accepts open, none
+    #             capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #           },
     #         },
     #       }
@@ -2968,9 +3044,9 @@ module Aws::EMR
     #
     #    </note>
     #
-    #   The list of configurations supplied for an EMR cluster instance
-    #   group. You can specify a separate configuration for each instance
-    #   group (master, core, and task).
+    #   The list of configurations supplied for an Amazon EMR cluster
+    #   instance group. You can specify a separate configuration for each
+    #   instance group (master, core, and task).
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] configurations_version
@@ -3497,14 +3573,22 @@ module Aws::EMR
 
     # An instance type configuration for each instance type in an instance
     # fleet, which determines the EC2 instances Amazon EMR attempts to
-    # provision to fulfill On-Demand and Spot target capacities. There can
-    # be a maximum of five instance type configurations in a fleet.
+    # provision to fulfill On-Demand and Spot target capacities. When you
+    # use an allocation strategy, you can include a maximum of 30 instance
+    # type configurations for a fleet. For more information about how to use
+    # an allocation strategy, see [Configure Instance Fleets][1]. Without an
+    # allocation strategy, you may specify a maximum of five instance type
+    # configurations for a fleet.
     #
     # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
     # versions 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-instance-fleet.html
+    #
     # @note When making an API call, you may pass InstanceTypeConfig
     #   data as a hash:
     #
@@ -3567,7 +3651,7 @@ module Aws::EMR
     #   @return [Float]
     #
     # @!attribute [rw] ebs_configuration
-    #   The configuration of Amazon Elastic Block Storage (Amazon EBS)
+    #   The configuration of Amazon Elastic Block Store (Amazon EBS)
     #   attached to each instance as defined by `InstanceType`.
     #   @return [Types::EbsConfiguration]
     #
@@ -3628,7 +3712,7 @@ module Aws::EMR
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] ebs_block_devices
-    #   The configuration of Amazon Elastic Block Storage (Amazon EBS)
+    #   The configuration of Amazon Elastic Block Store (Amazon EBS)
     #   attached to each instance as defined by `InstanceType`.
     #   @return [Array<Types::EbsBlockDevice>]
     #
@@ -3707,9 +3791,8 @@ module Aws::EMR
     #   @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.
+    #   The KMS key 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
@@ -3741,15 +3824,26 @@ module Aws::EMR
     #   @return [Array<String>]
     #
     # @!attribute [rw] visible_to_all_users
-    #   Indicates whether the cluster is visible to all IAM users of the AWS
-    #   account associated with the cluster. The default value, `true`,
-    #   indicates that all IAM users in the AWS account can perform cluster
-    #   actions if they have the proper IAM policy permissions. If this
-    #   value is `false`, only the IAM user that created the cluster can
-    #   perform actions. This value can be changed on a running cluster by
-    #   using the SetVisibleToAllUsers action. You can override the default
-    #   value of `true` when you create a cluster by using the
-    #   `VisibleToAllUsers` parameter of the `RunJobFlow` action.
+    #   Indicates whether the cluster is visible to IAM principals in the
+    #   account associated with the cluster. When `true`, IAM principals in
+    #   the account can perform EMR cluster actions that their IAM policies
+    #   allow. When `false`, only the IAM principal that created the cluster
+    #   and the account root user can perform EMR actions, regardless of IAM
+    #   permissions policies attached to other IAM principals.
+    #
+    #   The default value is `false` if a value is not provided when
+    #   creating a cluster using the EMR API RunJobFlow command or the CLI
+    #   [create-cluster][1] command. The default value is `true` when a
+    #   cluster is created using the Management Console. IAM principals that
+    #   are authorized to perform actions on the cluster can use the
+    #   SetVisibleToAllUsers action to change the value on a running
+    #   cluster. For more information, see [Understanding the EMR Cluster
+    #   VisibleToAllUsers Setting][2] in the *Amazon EMR Management Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cli/latest/reference/emr/create-cluster.html
+    #   [2]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/security_iam_emr-with-iam.html#security_set_visible_to_all_users
     #   @return [Boolean]
     #
     # @!attribute [rw] job_flow_role
@@ -3758,8 +3852,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] service_role
-    #   The IAM role that is assumed by the Amazon EMR service to access AWS
-    #   resources on your behalf.
+    #   The IAM role that is assumed by the Amazon EMR service to access
+    #   Amazon Web Services resources on your behalf.
     #   @return [String]
     #
     # @!attribute [rw] auto_scaling_role
@@ -3984,6 +4078,7 @@ module Aws::EMR
     #                 capacity_reservation_options: {
     #                   usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #                   capacity_reservation_preference: "open", # accepts open, none
+    #                   capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #                 },
     #               },
     #             },
@@ -4043,7 +4138,13 @@ module Aws::EMR
     #
     # @!attribute [rw] keep_job_flow_alive_when_no_steps
     #   Specifies whether the cluster should remain available after
-    #   completing all steps.
+    #   completing all steps. Defaults to `true`. For more information about
+    #   configuring cluster termination, see [Control Cluster
+    #   Termination][1] in the *EMR Management Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-plan-termination.html
     #   @return [Boolean]
     #
     # @!attribute [rw] termination_protected
@@ -4084,11 +4185,14 @@ module Aws::EMR
     #
     # @!attribute [rw] emr_managed_master_security_group
     #   The identifier of the Amazon EC2 security group for the master node.
+    #   If you specify `EmrManagedMasterSecurityGroup`, you must also
+    #   specify `EmrManagedSlaveSecurityGroup`.
     #   @return [String]
     #
     # @!attribute [rw] emr_managed_slave_security_group
     #   The identifier of the Amazon EC2 security group for the core and
-    #   task nodes.
+    #   task nodes. If you specify `EmrManagedSlaveSecurityGroup`, you must
+    #   also specify `EmrManagedMasterSecurityGroup`.
     #   @return [String]
     #
     # @!attribute [rw] service_access_security_group
@@ -4377,7 +4481,9 @@ module Aws::EMR
     #   @return [Time]
     #
     # @!attribute [rw] cluster_states
-    #   The cluster state filters to apply when listing clusters.
+    #   The cluster state filters to apply when listing clusters. Clusters
+    #   that change state while this action runs may be not be returned as
+    #   expected in the list of clusters.
     #   @return [Array<String>]
     #
     # @!attribute [rw] marker
@@ -4685,6 +4791,67 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListReleaseLabelsInput
+    #   data as a hash:
+    #
+    #       {
+    #         filters: {
+    #           prefix: "String",
+    #           application: "String",
+    #         },
+    #         next_token: "String",
+    #         max_results: 1,
+    #       }
+    #
+    # @!attribute [rw] filters
+    #   Filters the results of the request. `Prefix` specifies the prefix of
+    #   release labels to return. `Application` specifies the application
+    #   (with/without version) of release labels to return.
+    #   @return [Types::ReleaseLabelFilter]
+    #
+    # @!attribute [rw] next_token
+    #   Specifies the next page of results. If `NextToken` is not specified,
+    #   which is usually the case for the first request of
+    #   ListReleaseLabels, the first page of results are determined by other
+    #   filtering parameters or by the latest version. The
+    #   `ListReleaseLabels` request fails if the identity (AWS AccountID)
+    #   and all filtering parameters are different from the original
+    #   request, or if the `NextToken` is expired or tampered with.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   Defines the maximum number of release labels to return in a single
+    #   response. The default is `100`.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ListReleaseLabelsInput AWS API Documentation
+    #
+    class ListReleaseLabelsInput < Struct.new(
+      :filters,
+      :next_token,
+      :max_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] release_labels
+    #   The returned release labels.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   Used to paginate the next page of results if specified in the next
+    #   `ListReleaseLabels` request.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ListReleaseLabelsOutput AWS API Documentation
+    #
+    class ListReleaseLabelsOutput < Struct.new(
+      :release_labels,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListSecurityConfigurationsInput
     #   data as a hash:
     #
@@ -4751,8 +4918,10 @@ module Aws::EMR
     #   @return [Array<String>]
     #
     # @!attribute [rw] marker
-    #   The pagination token that indicates the next set of results to
-    #   retrieve.
+    #   The maximum number of steps that a single `ListSteps` action returns
+    #   is 50. To return a longer list of steps, use multiple `ListSteps`
+    #   actions along with the `Marker` parameter, which is a pagination
+    #   token that indicates the next set of results to retrieve.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ListStepsInput AWS API Documentation
@@ -4774,8 +4943,10 @@ module Aws::EMR
     #   @return [Array<Types::StepSummary>]
     #
     # @!attribute [rw] marker
-    #   The pagination token that indicates the next set of results to
-    #   retrieve.
+    #   The maximum number of steps that a single `ListSteps` action returns
+    #   is 50. To return a longer list of steps, use multiple `ListSteps`
+    #   actions along with the `Marker` parameter, which is a pagination
+    #   token that indicates the next set of results to retrieve.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ListStepsOutput AWS API Documentation
@@ -4955,7 +5126,10 @@ module Aws::EMR
     #
     # @!attribute [rw] step_concurrency_level
     #   The number of steps that can be executed concurrently. You can
-    #   specify a minimum of 1 step and a maximum of 256 steps.
+    #   specify a minimum of 1 step and a maximum of 256 steps. We recommend
+    #   that you do not change this parameter while steps are running or the
+    #   `ActionOnFailure` setting may not behave as expected. For more
+    #   information see Step$ActionOnFailure.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ModifyClusterInput AWS API Documentation
@@ -4996,7 +5170,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] instance_fleet
-    #   The unique identifier of the instance fleet.
+    #   The configuration parameters of the instance fleet.
     #   @return [Types::InstanceFleetModifyConfig]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ModifyInstanceFleetInput AWS API Documentation
@@ -5177,6 +5351,9 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # Details for a notebook execution. The details include information such
+    # as the unique ID and status of the notebook execution.
+    #
     # @!attribute [rw] notebook_execution_id
     #   The unique identifier of the notebook execution.
     #   @return [String]
@@ -5254,6 +5431,7 @@ module Aws::EMR
     #       {
     #         usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #         capacity_reservation_preference: "open", # accepts open, none
+    #         capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #       }
     #
     # @!attribute [rw] usage_strategy
@@ -5269,7 +5447,7 @@ module Aws::EMR
     #   remaining On-Demand target capacity is launched according to the
     #   On-Demand allocation strategy (`lowest-price`).
     #
-    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   If you do not specify a value, the fleet fulfills the On-Demand
     #   capacity according to the chosen On-Demand allocation strategy.
     #   @return [String]
     #
@@ -5286,11 +5464,17 @@ module Aws::EMR
     #     Instance.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_reservation_resource_group_arn
+    #   The ARN of the Capacity Reservation resource group in which to run
+    #   the instance.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/OnDemandCapacityReservationOptions AWS API Documentation
     #
     class OnDemandCapacityReservationOptions < Struct.new(
       :usage_strategy,
-      :capacity_reservation_preference)
+      :capacity_reservation_preference,
+      :capacity_reservation_resource_group_arn)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5313,6 +5497,7 @@ module Aws::EMR
     #         capacity_reservation_options: {
     #           usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #           capacity_reservation_preference: "open", # accepts open, none
+    #           capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #         },
     #       }
     #
@@ -5628,6 +5813,34 @@ module Aws::EMR
     #
     class PutManagedScalingPolicyOutput < Aws::EmptyStructure; end
 
+    # The release label filters by application or version prefix.
+    #
+    # @note When making an API call, you may pass ReleaseLabelFilter
+    #   data as a hash:
+    #
+    #       {
+    #         prefix: "String",
+    #         application: "String",
+    #       }
+    #
+    # @!attribute [rw] prefix
+    #   Optional release label version prefix filter. For example, `emr-5`.
+    #   @return [String]
+    #
+    # @!attribute [rw] application
+    #   Optional release label application filter. For example,
+    #   `spark@2.1.0`.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ReleaseLabelFilter AWS API Documentation
+    #
+    class ReleaseLabelFilter < Struct.new(
+      :prefix,
+      :application)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass RemoveAutoScalingPolicyInput
     #   data as a hash:
     #
@@ -5855,6 +6068,7 @@ module Aws::EMR
     #                   capacity_reservation_options: {
     #                     usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
     #                     capacity_reservation_preference: "open", # accepts open, none
+    #                     capacity_reservation_resource_group_arn: "XmlStringMaxLen256",
     #                   },
     #                 },
     #               },
@@ -5980,10 +6194,10 @@ module Aws::EMR
     #   @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 remain encrypted by AES-256.
-    #   This attribute is only available with Amazon EMR version 5.30.0 and
-    #   later, excluding Amazon EMR 6.0.0.
+    #   The KMS key used for encrypting log files. If a value is not
+    #   provided, the logs remain encrypted by AES-256. This attribute is
+    #   only available with Amazon EMR version 5.30.0 and later, excluding
+    #   Amazon EMR 6.0.0.
     #   @return [String]
     #
     # @!attribute [rw] additional_info
@@ -6099,10 +6313,22 @@ module Aws::EMR
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] visible_to_all_users
-    #   A value of `true` indicates that all IAM users in the AWS account
-    #   can perform cluster actions if they have the proper IAM policy
-    #   permissions. This is the default. A value of `false` indicates that
-    #   only the IAM user who created the cluster can perform actions.
+    #   Set this value to `true` so that IAM principals in the account
+    #   associated with the cluster can perform EMR actions on the cluster
+    #   that their IAM policies allow. This value defaults to `false` for
+    #   clusters created using the EMR API or the CLI [create-cluster][1]
+    #   command.
+    #
+    #   When set to `false`, only the IAM principal that created the cluster
+    #   and the account root user can perform EMR actions for the cluster,
+    #   regardless of the IAM permissions policies attached to other IAM
+    #   principals. For more information, see [Understanding the EMR Cluster
+    #   VisibleToAllUsers Setting][2] in the *Amazon EMR Management Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cli/latest/reference/emr/create-cluster.html
+    #   [2]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/security_iam_emr-with-iam.html#security_set_visible_to_all_users
     #   @return [Boolean]
     #
     # @!attribute [rw] job_flow_role
@@ -6114,7 +6340,7 @@ module Aws::EMR
     #
     # @!attribute [rw] service_role
     #   The IAM role that will be assumed by the Amazon EMR service to
-    #   access AWS resources on your behalf.
+    #   access Amazon Web Services resources on your behalf.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -6451,8 +6677,8 @@ module Aws::EMR
     #       }
     #
     # @!attribute [rw] path
-    #   Location of the script to run during a bootstrap action. Can be
-    #   either a location in Amazon S3 or on a local file system.
+    #   Location in Amazon S3 of the script to run during a bootstrap
+    #   action.
     #   @return [String]
     #
     # @!attribute [rw] args
@@ -6501,8 +6727,8 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_name
     #   The name of the user or group. For more information, see
-    #   [UserName][1] and [DisplayName][2] in the *AWS SSO Identity Store
-    #   API Reference*.
+    #   [UserName][1] and [DisplayName][2] in the *Amazon Web Services SSO
+    #   Identity Store API Reference*.
     #
     #
     #
@@ -6551,13 +6777,13 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_id
     #   The globally unique identifier (GUID) of the user or group from the
-    #   AWS SSO Identity Store.
+    #   Amazon Web Services SSO Identity Store.
     #   @return [String]
     #
     # @!attribute [rw] identity_name
     #   The name of the user or group. For more information, see
-    #   [UserName][1] and [DisplayName][2] in the *AWS SSO Identity Store
-    #   API Reference*.
+    #   [UserName][1] and [DisplayName][2] in the *Amazon Web Services SSO
+    #   Identity Store API Reference*.
     #
     #
     #
@@ -6638,10 +6864,11 @@ module Aws::EMR
     #   @return [Array<String>]
     #
     # @!attribute [rw] visible_to_all_users
-    #   A value of `true` indicates that all IAM users in the AWS account
-    #   can perform cluster actions if they have the proper IAM policy
-    #   permissions. This is the default. A value of `false` indicates that
-    #   only the IAM user who created the cluster can perform actions.
+    #   A value of `true` indicates that an IAM principal in the account can
+    #   perform EMR actions on the cluster that the IAM policies attached to
+    #   the principal allow. A value of `false` indicates that only the IAM
+    #   principal that created the cluster and the Amazon Web Services root
+    #   user can perform EMR actions on the cluster.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/SetVisibleToAllUsersInput AWS API Documentation
@@ -6744,6 +6971,26 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # The returned release label application names or versions.
+    #
+    # @!attribute [rw] name
+    #   The returned release label application name. For example, `hadoop`.
+    #   @return [String]
+    #
+    # @!attribute [rw] version
+    #   The returned release label application version. For example,
+    #   `3.2.1`.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/SimplifiedApplication AWS API Documentation
+    #
+    class SimplifiedApplication < Struct.new(
+      :name,
+      :version)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The launch specification for Spot Instances in the instance fleet,
     # which determines the defined duration, provisioning timeout behavior,
     # and allocation strategy.
@@ -6927,9 +7174,22 @@ module Aws::EMR
     #
     # @!attribute [rw] action_on_failure
     #   The action to take when the cluster step fails. Possible values are
-    #   TERMINATE\_CLUSTER, CANCEL\_AND\_WAIT, and CONTINUE.
-    #   TERMINATE\_JOB\_FLOW is provided for backward compatibility. We
-    #   recommend using TERMINATE\_CLUSTER instead.
+    #   `TERMINATE_CLUSTER`, `CANCEL_AND_WAIT`, and `CONTINUE`.
+    #   `TERMINATE_JOB_FLOW` is provided for backward compatibility. We
+    #   recommend using `TERMINATE_CLUSTER` instead.
+    #
+    #   If a cluster's `StepConcurrencyLevel` is greater than `1`, do not
+    #   use `AddJobFlowSteps` to submit a step with this parameter set to
+    #   `CANCEL_AND_WAIT` or `TERMINATE_CLUSTER`. The step is not submitted
+    #   and the action fails with a message that the `ActionOnFailure`
+    #   setting is not valid.
+    #
+    #   If you change a cluster's `StepConcurrencyLevel` to be greater than
+    #   1 while a step is running, the `ActionOnFailure` parameter may not
+    #   behave as you expect. In this case, for a step that fails with this
+    #   parameter set to `CANCEL_AND_WAIT`, pending steps and the running
+    #   step are not canceled; for a step that fails with this parameter set
+    #   to `TERMINATE_CLUSTER`, the cluster does not terminate.
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -6948,7 +7208,7 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # Specification of a cluster (job flow) step.
+    # Specification for a cluster (job flow) step.
     #
     # @note When making an API call, you may pass StepConfig
     #   data as a hash:
@@ -6974,10 +7234,32 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] action_on_failure
-    #   The action to take when the cluster step fails. Possible values are
-    #   TERMINATE\_CLUSTER, CANCEL\_AND\_WAIT, and CONTINUE.
-    #   TERMINATE\_JOB\_FLOW is provided for backward compatibility. We
-    #   recommend using TERMINATE\_CLUSTER instead.
+    #   The action to take when the step fails. Use one of the following
+    #   values:
+    #
+    #   * `TERMINATE_CLUSTER` - Shuts down the cluster.
+    #
+    #   * `CANCEL_AND_WAIT` - Cancels any pending steps and returns the
+    #     cluster to the `WAITING` state.
+    #
+    #   * `CONTINUE` - Continues to the next step in the queue.
+    #
+    #   * `TERMINATE_JOB_FLOW` - Shuts down the cluster.
+    #     `TERMINATE_JOB_FLOW` is provided for backward compatibility. We
+    #     recommend using `TERMINATE_CLUSTER` instead.
+    #
+    #   If a cluster's `StepConcurrencyLevel` is greater than `1`, do not
+    #   use `AddJobFlowSteps` to submit a step with this parameter set to
+    #   `CANCEL_AND_WAIT` or `TERMINATE_CLUSTER`. The step is not submitted
+    #   and the action fails with a message that the `ActionOnFailure`
+    #   setting is not valid.
+    #
+    #   If you change a cluster's `StepConcurrencyLevel` to be greater than
+    #   1 while a step is running, the `ActionOnFailure` parameter may not
+    #   behave as you expect. In this case, for a step that fails with this
+    #   parameter set to `CANCEL_AND_WAIT`, pending steps and the running
+    #   step are not canceled; for a step that fails with this parameter set
+    #   to `TERMINATE_CLUSTER`, the cluster does not terminate.
     #   @return [String]
     #
     # @!attribute [rw] hadoop_jar_step
@@ -7114,8 +7396,7 @@ module Aws::EMR
     # @!attribute [rw] action_on_failure
     #   The action to take when the cluster step fails. Possible values are
     #   TERMINATE\_CLUSTER, CANCEL\_AND\_WAIT, and CONTINUE.
-    #   TERMINATE\_JOB\_FLOW is available for backward compatibility. We
-    #   recommend using TERMINATE\_CLUSTER instead.
+    #   TERMINATE\_JOB\_FLOW is available for backward compatibility.
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -7242,8 +7523,8 @@ module Aws::EMR
     #   @return [Time]
     #
     # @!attribute [rw] default_s3_location
-    #   The default Amazon S3 location to back up Amazon EMR Studio
-    #   Workspaces and notebook files.
+    #   The Amazon S3 location to back up Amazon EMR Studio Workspaces and
+    #   notebook files.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -7441,9 +7722,8 @@ module Aws::EMR
     #   @return [Array<String>]
     #
     # @!attribute [rw] default_s3_location
-    #   A default Amazon S3 location to back up Workspaces and notebook
-    #   files for the Amazon EMR Studio. A Studio user can select an
-    #   alternative Amazon S3 location when creating a Workspace.
+    #   The Amazon S3 location to back up Workspaces and notebook files for
+    #   the Amazon EMR Studio.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/UpdateStudioInput AWS API Documentation
@@ -7475,9 +7755,9 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_id
     #   The globally unique identifier (GUID) of the user or group. For more
-    #   information, see [UserId][1] and [GroupId][2] in the *AWS SSO
-    #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
-    #   must be specified.
+    #   information, see [UserId][1] and [GroupId][2] in the *Amazon Web
+    #   Services SSO Identity Store API Reference*. Either `IdentityName` or
+    #   `IdentityId` must be specified.
     #
     #
     #
@@ -7487,9 +7767,9 @@ module Aws::EMR
     #
     # @!attribute [rw] identity_name
     #   The name of the user or group to update. For more information, see
-    #   [UserName][1] and [DisplayName][2] in the *AWS SSO Identity Store
-    #   API Reference*. Either `IdentityName` or `IdentityId` must be
-    #   specified.
+    #   [UserName][1] and [DisplayName][2] in the *Amazon Web Services SSO
+    #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
+    #   must be specified.
     #
     #
     #