aws-sdk-emr 1.66.0 → 1.68.0

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

@@ -110,7 +110,7 @@ module Aws::EMR
     #   type using the following format:
     #   `arn:partition:service:region:account:resource`.
     #
-    #   For example, `arn:aws:iam::1234567890:role/ReadOnly` is a correctly
+    #   For example, `arn:aws:IAM::1234567890:role/ReadOnly` is a correctly
     #   formatted runtime role ARN.
     #   @return [String]
     #
@@ -215,14 +215,14 @@ module Aws::EMR
 
     # An automatic scaling policy for a core instance group or task instance
     # group in an Amazon EMR cluster. An automatic scaling policy defines
-    # how an instance group dynamically adds and terminates EC2 instances in
-    # response to the value of a CloudWatch metric. See
+    # how an instance group dynamically adds and terminates Amazon EC2
+    # instances in response to the value of a CloudWatch metric. See
     # PutAutoScalingPolicy.
     #
     # @!attribute [rw] constraints
-    #   The upper and lower EC2 instance limits for an automatic scaling
-    #   policy. Automatic scaling activity will not cause an instance group
-    #   to grow above or below these limits.
+    #   The upper and lower Amazon EC2 instance limits for an automatic
+    #   scaling policy. Automatic scaling activity will not cause an
+    #   instance group to grow above or below these limits.
     #   @return [Types::ScalingConstraints]
     #
     # @!attribute [rw] rules
@@ -241,8 +241,8 @@ module Aws::EMR
 
     # An automatic scaling policy for a core instance group or task instance
     # group in an Amazon EMR cluster. The automatic scaling policy defines
-    # how an instance group dynamically adds and terminates EC2 instances in
-    # response to the value of a CloudWatch metric. See
+    # how an instance group dynamically adds and terminates Amazon EC2
+    # instances in response to the value of a CloudWatch metric. See
     # PutAutoScalingPolicy.
     #
     # @!attribute [rw] status
@@ -250,9 +250,9 @@ module Aws::EMR
     #   @return [Types::AutoScalingPolicyStatus]
     #
     # @!attribute [rw] constraints
-    #   The upper and lower EC2 instance limits for an automatic scaling
-    #   policy. Automatic scaling activity will not cause an instance group
-    #   to grow above or below these limits.
+    #   The upper and lower Amazon EC2 instance limits for an automatic
+    #   scaling policy. Automatic scaling activity will not cause an
+    #   instance group to grow above or below these limits.
     #   @return [Types::ScalingConstraints]
     #
     # @!attribute [rw] rules
@@ -346,7 +346,7 @@ module Aws::EMR
     # @!attribute [rw] block_public_security_group_rules
     #   Indicates whether Amazon EMR block public access is enabled (`true`)
     #   or disabled (`false`). By default, the value is `false` for accounts
-    #   that have created EMR clusters before July 2019. For accounts
+    #   that have created Amazon EMR clusters before July 2019. For accounts
     #   created after this, the default is `true`.
     #   @return [Boolean]
     #
@@ -359,8 +359,8 @@ module Aws::EMR
     #   that allows inbound traffic on Port 23 from IPv4 0.0.0.0/0 or IPv6
     #   port ::/0 as the source.
     #
-    #   By default, Port 22, which is used for SSH access to the cluster EC2
-    #   instances, is in the list of
+    #   By default, Port 22, which is used for SSH access to the cluster
+    #   Amazon EC2 instances, is in the list of
     #   `PermittedPublicSecurityGroupRuleRanges`.
     #   @return [Array<Types::PortRange>]
     #
@@ -525,9 +525,9 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] period
-    #   The period, in seconds, over which the statistic is applied. EMR
-    #   CloudWatch metrics are emitted every five minutes (300 seconds), so
-    #   if an EMR CloudWatch metric is specified, specify `300`.
+    #   The period, in seconds, over which the statistic is applied.
+    #   CloudWatch metrics for Amazon EMR are emitted every five minutes
+    #   (300 seconds), so if you specify a CloudWatch metric, specify `300`.
     #   @return [Integer]
     #
     # @!attribute [rw] statistic
@@ -580,14 +580,14 @@ module Aws::EMR
     #   @return [Types::ClusterStatus]
     #
     # @!attribute [rw] ec2_instance_attributes
-    #   Provides information about the EC2 instances in a cluster grouped by
-    #   category. For example, key name, subnet ID, IAM instance profile,
-    #   and so on.
+    #   Provides information about the Amazon EC2 instances in a cluster
+    #   grouped by category. For example, key name, subnet ID, IAM instance
+    #   profile, and so on.
     #   @return [Types::Ec2InstanceAttributes]
     #
     # @!attribute [rw] instance_collection_type
     #   <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    #   versions 4.8.0 and later, excluding 5.0.x versions.
+    #   releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #    </note>
     #
@@ -604,7 +604,8 @@ module Aws::EMR
     #
     # @!attribute [rw] log_encryption_kms_key_id
     #   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.
+    #   available with Amazon EMR 5.30.0 and later, excluding Amazon EMR
+    #   6.0.0.
     #   @return [String]
     #
     # @!attribute [rw] requested_ami_version
@@ -638,7 +639,7 @@ module Aws::EMR
     #
     # @!attribute [rw] termination_protected
     #   Indicates whether Amazon EMR will lock the cluster to prevent the
-    #   EC2 instances from being terminated by an API call or user
+    #   Amazon EC2 instances from being terminated by an API call or user
     #   intervention, or in the event of a cluster error.
     #   @return [Boolean]
     #
@@ -646,14 +647,14 @@ module Aws::EMR
     #   Indicates whether the cluster is visible to IAM principals in the
     #   Amazon Web Services account associated with the cluster. When
     #   `true`, IAM principals in the Amazon Web Services 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 Amazon Web Services account root user can perform EMR
-    #   actions, regardless of IAM permissions policies attached to other
-    #   IAM principals.
+    #   perform Amazon EMR cluster actions on the cluster that their IAM
+    #   policies allow. When `false`, only the IAM principal that created
+    #   the cluster and the Amazon Web Services account root user can
+    #   perform Amazon EMR actions, regardless of IAM permissions policies
+    #   attached to other IAM principals.
     #
     #   The default value is `true` if a value is not provided when creating
-    #   a cluster using the EMR API RunJobFlow command, the CLI
+    #   a cluster using the Amazon EMR API RunJobFlow command, the CLI
     #   [create-cluster][1] command, or the Amazon Web Services Management
     #   Console.
     #
@@ -679,9 +680,9 @@ module Aws::EMR
     #   An approximation of the cost of the cluster, represented in
     #   m1.small/hours. This value is incremented one time for every hour an
     #   m1.small instance runs. Larger instances are weighted more, so an
-    #   EC2 instance that is roughly four times more expensive would result
-    #   in the normalized instance hours being incremented by four. This
-    #   result is only an approximation and does not reflect the actual
+    #   Amazon EC2 instance that is roughly four times more expensive would
+    #   result in the normalized instance hours being incremented by four.
+    #   This result is only an approximation and does not reflect the actual
     #   billing rate.
     #   @return [Integer]
     #
@@ -693,7 +694,7 @@ module Aws::EMR
     #
     # @!attribute [rw] configurations
     #   Applies only to Amazon EMR releases 4.x and later. The list of
-    #   Configurations supplied to the EMR cluster.
+    #   configurations that are supplied to the Amazon EMR cluster.
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] security_configuration
@@ -704,7 +705,7 @@ module Aws::EMR
     #   An IAM role for automatic scaling policies. The default role is
     #   `EMR_AutoScaling_DefaultRole`. The IAM role provides permissions
     #   that the automatic scaling feature requires to launch and terminate
-    #   EC2 instances in an instance group.
+    #   Amazon EC2 instances in an instance group.
     #   @return [String]
     #
     # @!attribute [rw] scale_down_behavior
@@ -720,25 +721,25 @@ module Aws::EMR
     #   of the instance-hour boundary. With either behavior, Amazon EMR
     #   removes the least active nodes first and blocks instance termination
     #   if it could lead to HDFS corruption. `TERMINATE_AT_TASK_COMPLETION`
-    #   is available only in Amazon EMR version 4.1.0 and later, and is the
+    #   is available only in Amazon EMR releases 4.1.0 and later, and is the
     #   default for versions of Amazon EMR earlier than 5.1.0.
     #   @return [String]
     #
     # @!attribute [rw] custom_ami_id
-    #   Available only in Amazon EMR version 5.7.0 and later. The ID of a
+    #   Available only in Amazon EMR releases 5.7.0 and later. The ID of a
     #   custom Amazon EBS-backed Linux AMI if the cluster uses a custom AMI.
     #   @return [String]
     #
     # @!attribute [rw] ebs_root_volume_size
     #   The size, in GiB, of the Amazon EBS root device volume of the Linux
-    #   AMI that is used for each EC2 instance. Available in Amazon EMR
-    #   version 4.x and later.
+    #   AMI that is used for each Amazon EC2 instance. Available in Amazon
+    #   EMR releases 4.x and later.
     #   @return [Integer]
     #
     # @!attribute [rw] repo_upgrade_on_boot
     #   Applies only when `CustomAmiID` is used. Specifies the type of
-    #   updates that are applied from the Amazon Linux AMI package
-    #   repositories when an instance boots using the AMI.
+    #   updates that the Amazon Linux AMI package repositories apply when an
+    #   instance boots using the AMI.
     #   @return [String]
     #
     # @!attribute [rw] kerberos_attributes
@@ -847,12 +848,19 @@ module Aws::EMR
     #   of the cluster.
     #   @return [Types::ClusterTimeline]
     #
+    # @!attribute [rw] error_details
+    #   A list of tuples that provides information about the errors that
+    #   caused a cluster to terminate. This structure can contain up to 10
+    #   different `ErrorDetail` tuples.
+    #   @return [Array<Types::ErrorDetail>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ClusterStatus AWS API Documentation
     #
     class ClusterStatus < Struct.new(
       :state,
       :state_change_reason,
-      :timeline)
+      :timeline,
+      :error_details)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -875,9 +883,9 @@ module Aws::EMR
     #   An approximation of the cost of the cluster, represented in
     #   m1.small/hours. This value is incremented one time for every hour an
     #   m1.small instance runs. Larger instances are weighted more, so an
-    #   EC2 instance that is roughly four times more expensive would result
-    #   in the normalized instance hours being incremented by four. This
-    #   result is only an approximation and does not reflect the actual
+    #   Amazon EC2 instance that is roughly four times more expensive would
+    #   result in the normalized instance hours being incremented by four.
+    #   This result is only an approximation and does not reflect the actual
     #   billing rate.
     #   @return [Integer]
     #
@@ -951,45 +959,45 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # The EC2 unit limits for a managed scaling policy. The managed scaling
-    # activity of a cluster can not be above or below these limits. The
-    # limit only applies to the core and task nodes. The master node cannot
-    # be scaled after initial configuration.
+    # The Amazon EC2 unit limits for a managed scaling policy. The managed
+    # scaling activity of a cluster can not be above or below these limits.
+    # The limit only applies to the core and task nodes. The master node
+    # cannot be scaled after initial configuration.
     #
     # @!attribute [rw] unit_type
     #   The unit type used for specifying a managed scaling policy.
     #   @return [String]
     #
     # @!attribute [rw] minimum_capacity_units
-    #   The lower boundary of EC2 units. It is measured through vCPU cores
-    #   or instances for instance groups and measured through units for
-    #   instance fleets. Managed scaling activities are not allowed beyond
-    #   this boundary. The limit only applies to the core and task nodes.
-    #   The master node cannot be scaled after initial configuration.
+    #   The lower boundary of Amazon EC2 units. It is measured through vCPU
+    #   cores or instances for instance groups and measured through units
+    #   for instance fleets. Managed scaling activities are not allowed
+    #   beyond this boundary. The limit only applies to the core and task
+    #   nodes. The master node cannot be scaled after initial configuration.
     #   @return [Integer]
     #
     # @!attribute [rw] maximum_capacity_units
-    #   The upper boundary of EC2 units. It is measured through vCPU cores
-    #   or instances for instance groups and measured through units for
-    #   instance fleets. Managed scaling activities are not allowed beyond
-    #   this boundary. The limit only applies to the core and task nodes.
-    #   The master node cannot be scaled after initial configuration.
+    #   The upper boundary of Amazon EC2 units. It is measured through vCPU
+    #   cores or instances for instance groups and measured through units
+    #   for instance fleets. Managed scaling activities are not allowed
+    #   beyond this boundary. The limit only applies to the core and task
+    #   nodes. The master node cannot be scaled after initial configuration.
     #   @return [Integer]
     #
     # @!attribute [rw] maximum_on_demand_capacity_units
-    #   The upper boundary of On-Demand EC2 units. It is measured through
-    #   vCPU cores or instances for instance groups and measured through
-    #   units for instance fleets. The On-Demand units are not allowed to
-    #   scale beyond this boundary. The parameter is used to split capacity
-    #   allocation between On-Demand and Spot Instances.
+    #   The upper boundary of On-Demand Amazon 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 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.
+    #   The upper boundary of Amazon 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
@@ -1239,8 +1247,8 @@ module Aws::EMR
     #   The Amazon Resource Name (ARN) for the session policy that will be
     #   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].
+    #   role. For more information, see [Create an Amazon EMR Studio User
+    #   Role with Session Policies][1].
     #
     #
     #
@@ -1607,7 +1615,7 @@ module Aws::EMR
     # @!attribute [rw] volume_specification
     #   EBS volume specifications such as volume type, IOPS, size (GiB) and
     #   throughput (MiB/s) that are requested for the EBS volume attached to
-    #   an EC2 instance in the cluster.
+    #   an Amazon EC2 instance in the cluster.
     #   @return [Types::VolumeSpecification]
     #
     # @!attribute [rw] device
@@ -1630,7 +1638,7 @@ module Aws::EMR
     # @!attribute [rw] volume_specification
     #   EBS volume specifications such as volume type, IOPS, size (GiB) and
     #   throughput (MiB/s) that are requested for the EBS volume attached to
-    #   an EC2 instance in the cluster.
+    #   an Amazon EC2 instance in the cluster.
     #   @return [Types::VolumeSpecification]
     #
     # @!attribute [rw] volumes_per_instance
@@ -1667,7 +1675,7 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # EBS block device that's attached to an EC2 instance.
+    # EBS block device that's attached to an Amazon EC2 instance.
     #
     # @!attribute [rw] device
     #   The device name that is exposed to the instance, such as /dev/sdh.
@@ -1686,9 +1694,9 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # Provides information about the EC2 instances in a cluster grouped by
-    # category. For example, key name, subnet ID, IAM instance profile, and
-    # so on.
+    # Provides information about the Amazon EC2 instances in a cluster
+    # grouped by category. For example, key name, subnet ID, IAM instance
+    # profile, and so on.
     #
     # @!attribute [rw] ec2_key_name
     #   The name of the Amazon EC2 key pair to use when connecting with SSH
@@ -1705,16 +1713,17 @@ module Aws::EMR
     # @!attribute [rw] requested_ec2_subnet_ids
     #   Applies to clusters configured with the instance fleets option.
     #   Specifies the unique identifier of one or more Amazon EC2 subnets in
-    #   which to launch EC2 cluster instances. Subnets must exist within the
-    #   same VPC. Amazon EMR chooses the EC2 subnet with the best fit from
-    #   among the list of `RequestedEc2SubnetIds`, and then launches all
-    #   cluster instances within that Subnet. If this value is not
-    #   specified, and the account and Region support EC2-Classic networks,
-    #   the cluster launches instances in the EC2-Classic network and uses
-    #   `RequestedEc2AvailabilityZones` instead of this setting. If
-    #   EC2-Classic is not supported, and no Subnet is specified, Amazon EMR
-    #   chooses the subnet for you. `RequestedEc2SubnetIDs` and
-    #   `RequestedEc2AvailabilityZones` cannot be specified together.
+    #   which to launch Amazon EC2 cluster instances. Subnets must exist
+    #   within the same VPC. Amazon EMR chooses the Amazon EC2 subnet with
+    #   the best fit from among the list of `RequestedEc2SubnetIds`, and
+    #   then launches all cluster instances within that Subnet. If this
+    #   value is not specified, and the account and Region support
+    #   EC2-Classic networks, the cluster launches instances in the
+    #   EC2-Classic network and uses `RequestedEc2AvailabilityZones` instead
+    #   of this setting. If EC2-Classic is not supported, and no Subnet is
+    #   specified, Amazon EMR chooses the subnet for you.
+    #   `RequestedEc2SubnetIDs` and `RequestedEc2AvailabilityZones` cannot
+    #   be specified together.
     #   @return [Array<String>]
     #
     # @!attribute [rw] ec2_availability_zone
@@ -1723,8 +1732,8 @@ module Aws::EMR
     #
     # @!attribute [rw] requested_ec2_availability_zones
     #   Applies to clusters configured with the instance fleets option.
-    #   Specifies one or more Availability Zones in which to launch EC2
-    #   cluster instances when the EC2-Classic network configuration is
+    #   Specifies one or more Availability Zones in which to launch Amazon
+    #   EC2 cluster instances when the EC2-Classic network configuration is
     #   supported. Amazon EMR chooses the Availability Zone with the best
     #   fit from among the list of `RequestedEc2AvailabilityZones`, and then
     #   launches all cluster instances within that Availability Zone. If you
@@ -1735,7 +1744,7 @@ module Aws::EMR
     #
     # @!attribute [rw] iam_instance_profile
     #   The IAM role that was specified when the cluster was launched. The
-    #   EC2 instances of the cluster assume this role.
+    #   Amazon EC2 instances of the cluster assume this role.
     #   @return [String]
     #
     # @!attribute [rw] emr_managed_master_security_group
@@ -1780,36 +1789,67 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # A tuple that provides information about an error that caused a cluster
+    # to terminate.
+    #
+    # @!attribute [rw] error_code
+    #   The name or code associated with the error.
+    #   @return [String]
+    #
+    # @!attribute [rw] error_data
+    #   A list of key value pairs that provides contextual information about
+    #   why an error occured.
+    #   @return [Array<Hash<String,String>>]
+    #
+    # @!attribute [rw] error_message
+    #   A message that describes the error.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ErrorDetail AWS API Documentation
+    #
+    class ErrorDetail < Struct.new(
+      :error_code,
+      :error_data,
+      :error_message)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies the execution engine (cluster) to run the notebook and
-    # perform the notebook execution, for example, an EMR cluster.
+    # perform the notebook execution, for example, an Amazon EMR cluster.
     #
     # @!attribute [rw] id
-    #   The unique identifier of the execution engine. For an EMR cluster,
-    #   this is the cluster ID.
+    #   The unique identifier of the execution engine. For an Amazon EMR
+    #   cluster, this is the cluster ID.
     #   @return [String]
     #
     # @!attribute [rw] type
-    #   The type of execution engine. A value of `EMR` specifies an EMR
-    #   cluster.
+    #   The type of execution engine. A value of `EMR` specifies an Amazon
+    #   EMR cluster.
     #   @return [String]
     #
     # @!attribute [rw] master_instance_security_group_id
-    #   An optional unique ID of an EC2 security group to associate with the
-    #   master instance of the EMR cluster for this notebook execution. For
-    #   more information see [Specifying EC2 Security Groups for EMR
-    #   Notebooks][1] in the *EMR Management Guide*.
+    #   An optional unique ID of an Amazon EC2 security group to associate
+    #   with the master instance of the Amazon EMR cluster for this notebook
+    #   execution. For more information see [Specifying Amazon EC2 Security
+    #   Groups for Amazon EMR Notebooks][1] in the *EMR Management Guide*.
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-notebooks-security-groups.html
     #   @return [String]
     #
+    # @!attribute [rw] execution_role_arn
+    #   The execution role ARN required for the notebook execution.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ExecutionEngineConfig AWS API Documentation
     #
     class ExecutionEngineConfig < Struct.new(
       :id,
       :type,
-      :master_instance_security_group_id)
+      :master_instance_security_group_id,
+      :execution_role_arn)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1893,8 +1933,9 @@ module Aws::EMR
     #   <note markdown="1"> For accounts that created clusters in a Region before November 25,
     #   2019, block public access is disabled by default in that Region. To
     #   use this feature, you must manually enable and configure it. For
-    #   accounts that did not create an EMR cluster in a Region before this
-    #   date, block public access is enabled by default in that Region.
+    #   accounts that did not create an Amazon EMR cluster in a Region
+    #   before this date, block public access is enabled by default in that
+    #   Region.
     #
     #    </note>
     #   @return [Types::BlockPublicAccessConfiguration]
@@ -2109,7 +2150,7 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # Represents an EC2 instance provisioned as part of cluster.
+    # Represents an Amazon EC2 instance provisioned as part of cluster.
     #
     # @!attribute [rw] id
     #   The unique identifier for the instance in Amazon EMR.
@@ -2144,8 +2185,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] instance_fleet_id
-    #   The unique identifier of the instance fleet to which an EC2 instance
-    #   belongs.
+    #   The unique identifier of the instance fleet to which an Amazon EC2
+    #   instance belongs.
     #   @return [String]
     #
     # @!attribute [rw] market
@@ -2154,7 +2195,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The EC2 instance type, for example `m3.xlarge`.
+    #   The Amazon EC2 instance type, for example `m3.xlarge`.
     #   @return [String]
     #
     # @!attribute [rw] ebs_volumes
@@ -2180,14 +2221,14 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # Describes an instance fleet, which is a group of EC2 instances that
-    # host a particular node type (master, core, or task) in an Amazon EMR
-    # cluster. Instance fleets can consist of a mix of instance types and
-    # On-Demand and Spot Instances, which are provisioned to meet a defined
-    # target capacity.
+    # Describes an instance fleet, which is a group of Amazon EC2 instances
+    # that host a particular node type (master, core, or task) in an Amazon
+    # EMR cluster. Instance fleets can consist of a mix of instance types
+    # and On-Demand and Spot Instances, which are provisioned to meet a
+    # defined target capacity.
     #
     # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    # versions 4.8.0 and later, excluding 5.0.x versions.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
@@ -2307,7 +2348,7 @@ module Aws::EMR
     # The configuration that defines an instance 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.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
@@ -2369,8 +2410,8 @@ module Aws::EMR
     #   @return [Integer]
     #
     # @!attribute [rw] instance_type_configs
-    #   The instance type configurations that define the EC2 instances in
-    #   the instance fleet.
+    #   The instance type configurations that define the Amazon EC2
+    #   instances in the instance fleet.
     #   @return [Array<Types::InstanceTypeConfig>]
     #
     # @!attribute [rw] launch_specifications
@@ -2398,7 +2439,7 @@ module Aws::EMR
     # Configuration parameters for an instance fleet modification request.
     #
     # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    # versions 4.8.0 and later, excluding 5.0.x versions.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
@@ -2436,8 +2477,8 @@ module Aws::EMR
     # 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 and Spot
-    # instance allocation strategies are available in Amazon EMR version
+    # releases 4.8.0 and later, excluding 5.0.x versions. On-Demand and Spot
+    # instance allocation strategies are available in Amazon EMR releases
     # 5.12.1 and later.
     #
     #  </note>
@@ -2453,8 +2494,8 @@ module Aws::EMR
     #   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
+    #   releases 4.8.0 and later, excluding 5.0.x versions. On-Demand
+    #   Instances allocation strategy is available in Amazon EMR releases
     #   5.12.1 and later.
     #
     #    </note>
@@ -2494,7 +2535,7 @@ module Aws::EMR
     # Provides status change reason details for the instance 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.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
@@ -2518,33 +2559,35 @@ module Aws::EMR
     # The status of the instance 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.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
     # @!attribute [rw] state
     #   A code representing the instance fleet status.
     #
-    #   * `PROVISIONING`—The instance fleet is provisioning EC2 resources
-    #     and is not yet ready to run jobs.
+    #   * `PROVISIONING`—The instance fleet is provisioning Amazon EC2
+    #     resources and is not yet ready to run jobs.
     #
-    #   * `BOOTSTRAPPING`—EC2 instances and other resources have been
+    #   * `BOOTSTRAPPING`—Amazon EC2 instances and other resources have been
     #     provisioned and the bootstrap actions specified for the instances
     #     are underway.
     #
-    #   * `RUNNING`—EC2 instances and other resources are running. They are
-    #     either executing jobs or waiting to execute jobs.
+    #   * `RUNNING`—Amazon EC2 instances and other resources are running.
+    #     They are either executing jobs or waiting to execute jobs.
     #
-    #   * `RESIZING`—A resize operation is underway. EC2 instances are
-    #     either being added or removed.
+    #   * `RESIZING`—A resize operation is underway. Amazon EC2 instances
+    #     are either being added or removed.
     #
-    #   * `SUSPENDED`—A resize operation could not complete. Existing EC2
-    #     instances are running, but instances can't be added or removed.
+    #   * `SUSPENDED`—A resize operation could not complete. Existing Amazon
+    #     EC2 instances are running, but instances can't be added or
+    #     removed.
     #
-    #   * `TERMINATING`—The instance fleet is terminating EC2 instances.
+    #   * `TERMINATING`—The instance fleet is terminating Amazon EC2
+    #     instances.
     #
-    #   * `TERMINATED`—The instance fleet is no longer active, and all EC2
-    #     instances have been terminated.
+    #   * `TERMINATED`—The instance fleet is no longer active, and all
+    #     Amazon EC2 instances have been terminated.
     #   @return [String]
     #
     # @!attribute [rw] state_change_reason
@@ -2572,7 +2615,7 @@ module Aws::EMR
     # of termination.
     #
     # <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    # versions 4.8.0 and later, excluding 5.0.x versions.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
@@ -2628,7 +2671,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The EC2 instance type for all instances in the instance group.
+    #   The Amazon EC2 instance type for all instances in the instance
+    #   group.
     #   @return [String]
     #
     # @!attribute [rw] requested_instance_count
@@ -2686,8 +2730,8 @@ module Aws::EMR
     #   An automatic scaling policy for a core instance group or task
     #   instance group in an Amazon EMR cluster. The automatic scaling
     #   policy defines how an instance group dynamically adds and terminates
-    #   EC2 instances in response to the value of a CloudWatch metric. See
-    #   PutAutoScalingPolicy.
+    #   Amazon EC2 instances in response to the value of a CloudWatch
+    #   metric. See PutAutoScalingPolicy.
     #   @return [Types::AutoScalingPolicyDescription]
     #
     # @!attribute [rw] custom_ami_id
@@ -2726,7 +2770,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] market
-    #   Market type of the EC2 instances used to create a cluster node.
+    #   Market type of the Amazon EC2 instances used to create a cluster
+    #   node.
     #   @return [String]
     #
     # @!attribute [rw] instance_role
@@ -2741,7 +2786,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The EC2 instance type for all instances in the instance group.
+    #   The Amazon EC2 instance type for all instances in the instance
+    #   group.
     #   @return [String]
     #
     # @!attribute [rw] instance_count
@@ -2753,22 +2799,22 @@ 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] ebs_configuration
-    #   EBS configurations that will be attached to each EC2 instance in the
-    #   instance group.
+    #   EBS configurations that will be attached to each Amazon EC2 instance
+    #   in the instance group.
     #   @return [Types::EbsConfiguration]
     #
     # @!attribute [rw] auto_scaling_policy
     #   An automatic scaling policy for a core instance group or task
     #   instance group in an Amazon EMR cluster. The automatic scaling
     #   policy defines how an instance group dynamically adds and terminates
-    #   EC2 instances in response to the value of a CloudWatch metric. See
-    #   PutAutoScalingPolicy.
+    #   Amazon EC2 instances in response to the value of a CloudWatch
+    #   metric. See PutAutoScalingPolicy.
     #   @return [Types::AutoScalingPolicy]
     #
     # @!attribute [rw] custom_ami_id
@@ -2803,7 +2849,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] market
-    #   Market type of the EC2 instances used to create a cluster node.
+    #   Market type of the Amazon EC2 instances used to create a cluster
+    #   node.
     #   @return [String]
     #
     # @!attribute [rw] instance_role
@@ -2818,7 +2865,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   EC2 instance type.
+    #   Amazon EC2 instance type.
     #   @return [String]
     #
     # @!attribute [rw] instance_request_count
@@ -2891,8 +2938,9 @@ module Aws::EMR
     #   @return [Integer]
     #
     # @!attribute [rw] ec2_instance_ids_to_terminate
-    #   The EC2 InstanceIds to terminate. After you terminate the instances,
-    #   the instance group will not return to its original requested size.
+    #   The Amazon EC2 InstanceIds to terminate. After you terminate the
+    #   instances, the instance group will not return to its original
+    #   requested size.
     #   @return [Array<String>]
     #
     # @!attribute [rw] shrink_policy
@@ -3086,8 +3134,8 @@ module Aws::EMR
     end
 
     # 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. When you
+    # fleet, which determines the Amazon EC2 instances Amazon EMR attempts
+    # to 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
@@ -3095,7 +3143,7 @@ module Aws::EMR
     # 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.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
@@ -3104,7 +3152,7 @@ module Aws::EMR
     # [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-instance-fleet.html
     #
     # @!attribute [rw] instance_type
-    #   An EC2 instance type, such as `m3.xlarge`.
+    #   An Amazon EC2 instance type, such as `m3.xlarge`.
     #   @return [String]
     #
     # @!attribute [rw] weighted_capacity
@@ -3116,16 +3164,16 @@ module Aws::EMR
     #   @return [Integer]
     #
     # @!attribute [rw] bid_price
-    #   The bid price for each EC2 Spot Instance type as defined by
+    #   The bid price for each Amazon EC2 Spot Instance type as defined by
     #   `InstanceType`. Expressed in USD. If neither `BidPrice` nor
     #   `BidPriceAsPercentageOfOnDemandPrice` is provided,
     #   `BidPriceAsPercentageOfOnDemandPrice` defaults to 100%.
     #   @return [String]
     #
     # @!attribute [rw] bid_price_as_percentage_of_on_demand_price
-    #   The bid price, as a percentage of On-Demand price, for each EC2 Spot
-    #   Instance as defined by `InstanceType`. Expressed as a number (for
-    #   example, 20 specifies 20%). If neither `BidPrice` nor
+    #   The bid price, as a percentage of On-Demand price, for each Amazon
+    #   EC2 Spot Instance as defined by `InstanceType`. Expressed as a
+    #   number (for example, 20 specifies 20%). If neither `BidPrice` nor
     #   `BidPriceAsPercentageOfOnDemandPrice` is provided,
     #   `BidPriceAsPercentageOfOnDemandPrice` defaults to 100%.
     #   @return [Float]
@@ -3163,12 +3211,12 @@ module Aws::EMR
     # 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.
+    # releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #  </note>
     #
     # @!attribute [rw] instance_type
-    #   The EC2 instance type, for example `m3.xlarge`.
+    #   The Amazon EC2 instance type, for example `m3.xlarge`.
     #   @return [String]
     #
     # @!attribute [rw] weighted_capacity
@@ -3180,14 +3228,14 @@ module Aws::EMR
     #   @return [Integer]
     #
     # @!attribute [rw] bid_price
-    #   The bid price for each EC2 Spot Instance type as defined by
+    #   The bid price for each Amazon EC2 Spot Instance type as defined by
     #   `InstanceType`. Expressed in USD.
     #   @return [String]
     #
     # @!attribute [rw] bid_price_as_percentage_of_on_demand_price
-    #   The bid price, as a percentage of On-Demand price, for each EC2 Spot
-    #   Instance as defined by `InstanceType`. Expressed as a number (for
-    #   example, 20 specifies 20%).
+    #   The bid price, as a percentage of On-Demand price, for each Amazon
+    #   EC2 Spot Instance as defined by `InstanceType`. Expressed as a
+    #   number (for example, 20 specifies 20%).
     #   @return [Float]
     #
     # @!attribute [rw] configurations
@@ -3282,7 +3330,7 @@ module Aws::EMR
     #
     # @!attribute [rw] log_encryption_kms_key_id
     #   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.
+    #   available with Amazon EMR 5.30.0 and later, excluding 6.0.0.
     #   @return [String]
     #
     # @!attribute [rw] ami_version
@@ -3317,14 +3365,14 @@ module Aws::EMR
     #   Indicates whether the cluster is visible to IAM principals in the
     #   Amazon Web Services account associated with the cluster. When
     #   `true`, IAM principals in the Amazon Web Services account can
-    #   perform EMR cluster actions that their IAM policies allow. When
-    #   `false`, only the IAM principal that created the cluster and the
-    #   Amazon Web Services account root user can perform EMR actions,
-    #   regardless of IAM permissions policies attached to other IAM
-    #   principals.
+    #   perform Amazon EMR cluster actions that their IAM policies allow.
+    #   When `false`, only the IAM principal that created the cluster and
+    #   the Amazon Web Services account root user can perform Amazon EMR
+    #   actions, regardless of IAM permissions policies attached to other
+    #   IAM principals.
     #
     #   The default value is `true` if a value is not provided when creating
-    #   a cluster using the EMR API RunJobFlow command, the CLI
+    #   a cluster using the Amazon EMR API RunJobFlow command, the CLI
     #   [create-cluster][1] command, or the Amazon Web Services Management
     #   Console.
     #
@@ -3335,7 +3383,7 @@ module Aws::EMR
     #
     # @!attribute [rw] job_flow_role
     #   The IAM role that was specified when the job flow was launched. The
-    #   EC2 instances of the job flow assume this role.
+    #   Amazon EC2 instances of the job flow assume this role.
     #   @return [String]
     #
     # @!attribute [rw] service_role
@@ -3347,7 +3395,7 @@ module Aws::EMR
     #   An IAM role for automatic scaling policies. The default role is
     #   `EMR_AutoScaling_DefaultRole`. The IAM role provides a way for the
     #   automatic scaling feature to get the required permissions it needs
-    #   to launch and terminate EC2 instances in an instance group.
+    #   to launch and terminate Amazon EC2 instances in an instance group.
     #   @return [String]
     #
     # @!attribute [rw] scale_down_behavior
@@ -3363,8 +3411,8 @@ module Aws::EMR
     #   of the instance-hour boundary. With either behavior, Amazon EMR
     #   removes the least active nodes first and blocks instance termination
     #   if it could lead to HDFS corruption. `TERMINATE_AT_TASK_COMPLETION`
-    #   available only in Amazon EMR version 4.1.0 and later, and is the
-    #   default for versions of Amazon EMR earlier than 5.1.0.
+    #   available only in Amazon EMR releases 4.1.0 and later, and is the
+    #   default for releases of Amazon EMR earlier than 5.1.0.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/JobFlowDetail AWS API Documentation
@@ -3437,15 +3485,15 @@ module Aws::EMR
     # configuration.
     #
     # @!attribute [rw] master_instance_type
-    #   The EC2 instance type of the master node.
+    #   The Amazon EC2 instance type of the master node.
     #   @return [String]
     #
     # @!attribute [rw] slave_instance_type
-    #   The EC2 instance type of the core and task nodes.
+    #   The Amazon EC2 instance type of the core and task nodes.
     #   @return [String]
     #
     # @!attribute [rw] instance_count
-    #   The number of EC2 instances in the cluster.
+    #   The number of Amazon EC2 instances in the cluster.
     #   @return [Integer]
     #
     # @!attribute [rw] instance_groups
@@ -3454,17 +3502,17 @@ module Aws::EMR
     #
     # @!attribute [rw] instance_fleets
     #   <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    #   versions 4.8.0 and later, excluding 5.0.x versions.
+    #   releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #    </note>
     #
-    #   Describes the EC2 instances and instance configurations for clusters
-    #   that use the instance fleet configuration.
+    #   Describes the Amazon EC2 instances and instance configurations for
+    #   clusters that use the instance fleet configuration.
     #   @return [Array<Types::InstanceFleetConfig>]
     #
     # @!attribute [rw] ec2_key_name
-    #   The name of the EC2 key pair that can be used to connect to the
-    #   master node using SSH as the user called "hadoop."
+    #   The name of the Amazon EC2 key pair that can be used to connect to
+    #   the master node using SSH as the user called "hadoop."
     #   @return [String]
     #
     # @!attribute [rw] placement
@@ -3509,11 +3557,11 @@ module Aws::EMR
     #
     # @!attribute [rw] ec2_subnet_ids
     #   Applies to clusters that use the instance fleet configuration. When
-    #   multiple EC2 subnet IDs are specified, Amazon EMR evaluates them and
-    #   launches instances in the optimal subnet.
+    #   multiple Amazon EC2 subnet IDs are specified, Amazon EMR evaluates
+    #   them and launches instances in the optimal subnet.
     #
     #   <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    #   versions 4.8.0 and later, excluding 5.0.x versions.
+    #   releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #    </note>
     #   @return [Array<String>]
@@ -4019,6 +4067,10 @@ module Aws::EMR
     #   for this `ListNotebookExecutions` call.
     #   @return [String]
     #
+    # @!attribute [rw] execution_engine_id
+    #   The unique ID of the execution engine.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/ListNotebookExecutionsInput AWS API Documentation
     #
     class ListNotebookExecutionsInput < Struct.new(
@@ -4026,7 +4078,8 @@ module Aws::EMR
       :status,
       :from,
       :to,
-      :marker)
+      :marker,
+      :execution_engine_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4268,7 +4321,7 @@ module Aws::EMR
     # master node cannot be scaled after initial configuration.
     #
     # @!attribute [rw] compute_limits
-    #   The EC2 unit limits for a managed scaling policy. The managed
+    #   The Amazon EC2 unit limits for a managed scaling policy. The managed
     #   scaling activity of a cluster is not allowed to go above or below
     #   these limits. The limit only applies to the core and task nodes. The
     #   master node cannot be scaled after initial configuration.
@@ -4374,21 +4427,21 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # A notebook execution. An execution is a specific instance that an EMR
-    # Notebook is run using the `StartNotebookExecution` action.
+    # A notebook execution. An execution is a specific instance that an
+    # Amazon EMR Notebook is run using the `StartNotebookExecution` action.
     #
     # @!attribute [rw] notebook_execution_id
     #   The unique identifier of a notebook execution.
     #   @return [String]
     #
     # @!attribute [rw] editor_id
-    #   The unique identifier of the EMR Notebook that is used for the
-    #   notebook execution.
+    #   The unique identifier of the Amazon EMR Notebook that is used for
+    #   the notebook execution.
     #   @return [String]
     #
     # @!attribute [rw] execution_engine
-    #   The execution engine, such as an EMR cluster, used to run the EMR
-    #   notebook and perform the notebook execution.
+    #   The execution engine, such as an Amazon EMR cluster, used to run the
+    #   Amazon EMR notebook and perform the notebook execution.
     #   @return [Types::ExecutionEngineConfig]
     #
     # @!attribute [rw] notebook_execution_name
@@ -4396,7 +4449,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] notebook_params
-    #   Input parameters in JSON format passed to the EMR Notebook at
+    #   Input parameters in JSON format passed to the Amazon EMR Notebook at
     #   runtime for execution.
     #   @return [String]
     #
@@ -4455,9 +4508,10 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] notebook_instance_security_group_id
-    #   The unique identifier of the EC2 security group associated with the
-    #   EMR Notebook instance. For more information see [Specifying EC2
-    #   Security Groups for EMR Notebooks][1] in the *EMR Management Guide*.
+    #   The unique identifier of the Amazon EC2 security group associated
+    #   with the Amazon EMR Notebook instance. For more information see
+    #   [Specifying Amazon EC2 Security Groups for Amazon EMR Notebooks][1]
+    #   in the *Amazon EMR Management Guide*.
     #
     #
     #
@@ -4471,6 +4525,22 @@ module Aws::EMR
     #   maximum of 256 characters.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] notebook_s3_location
+    #   The Amazon S3 location that stores the notebook execution input.
+    #   @return [Types::NotebookS3LocationForOutput]
+    #
+    # @!attribute [rw] output_notebook_s3_location
+    #   The Amazon S3 location for the notebook execution output.
+    #   @return [Types::OutputNotebookS3LocationForOutput]
+    #
+    # @!attribute [rw] output_notebook_format
+    #   The output format for the notebook execution.
+    #   @return [String]
+    #
+    # @!attribute [rw] environment_variables
+    #   The environment variables associated with the notebook execution.
+    #   @return [Hash<String,String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/NotebookExecution AWS API Documentation
     #
     class NotebookExecution < Struct.new(
@@ -4486,7 +4556,11 @@ module Aws::EMR
       :output_notebook_uri,
       :last_state_change_reason,
       :notebook_instance_security_group_id,
-      :tags)
+      :tags,
+      :notebook_s3_location,
+      :output_notebook_s3_location,
+      :output_notebook_format,
+      :environment_variables)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4549,6 +4623,14 @@ module Aws::EMR
     #   The timestamp when notebook execution started.
     #   @return [Time]
     #
+    # @!attribute [rw] notebook_s3_location
+    #   The Amazon S3 location that stores the notebook execution input.
+    #   @return [Types::NotebookS3LocationForOutput]
+    #
+    # @!attribute [rw] execution_engine_id
+    #   The unique ID of the execution engine for the notebook execution.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/NotebookExecutionSummary AWS API Documentation
     #
     class NotebookExecutionSummary < Struct.new(
@@ -4557,7 +4639,49 @@ module Aws::EMR
       :notebook_execution_name,
       :status,
       :start_time,
-      :end_time)
+      :end_time,
+      :notebook_s3_location,
+      :execution_engine_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The Amazon S3 location that stores the notebook execution input.
+    #
+    # @!attribute [rw] bucket
+    #   The Amazon S3 bucket that stores the notebook execution input.
+    #   @return [String]
+    #
+    # @!attribute [rw] key
+    #   The key to the Amazon S3 location that stores the notebook execution
+    #   input.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/NotebookS3LocationForOutput AWS API Documentation
+    #
+    class NotebookS3LocationForOutput < Struct.new(
+      :bucket,
+      :key)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The Amazon S3 location that stores the notebook execution input.
+    #
+    # @!attribute [rw] bucket
+    #   The Amazon S3 bucket that stores the notebook execution input.
+    #   @return [String]
+    #
+    # @!attribute [rw] key
+    #   The key to the Amazon S3 location that stores the notebook execution
+    #   input.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/NotebookS3LocationFromInput AWS API Documentation
+    #
+    class NotebookS3LocationFromInput < Struct.new(
+      :bucket,
+      :key)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4635,8 +4759,8 @@ module Aws::EMR
     # 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
+    # releases 4.8.0 and later, excluding 5.0.x versions. On-Demand
+    # Instances allocation strategy is available in Amazon EMR releases
     # 5.12.1 and later.
     #
     #  </note>
@@ -4683,24 +4807,64 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # The Amazon S3 location that stores the notebook execution output.
+    #
+    # @!attribute [rw] bucket
+    #   The Amazon S3 bucket that stores the notebook execution output.
+    #   @return [String]
+    #
+    # @!attribute [rw] key
+    #   The key to the Amazon S3 location that stores the notebook execution
+    #   output.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/OutputNotebookS3LocationForOutput AWS API Documentation
+    #
+    class OutputNotebookS3LocationForOutput < Struct.new(
+      :bucket,
+      :key)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The Amazon S3 location that stores the notebook execution output.
+    #
+    # @!attribute [rw] bucket
+    #   The Amazon S3 bucket that stores the notebook execution output.
+    #   @return [String]
+    #
+    # @!attribute [rw] key
+    #   The key to the Amazon S3 location that stores the notebook execution
+    #   output.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/OutputNotebookS3LocationFromInput AWS API Documentation
+    #
+    class OutputNotebookS3LocationFromInput < Struct.new(
+      :bucket,
+      :key)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Placement group configuration for an Amazon EMR cluster. The
     # configuration specifies the placement strategy that can be applied to
     # instance roles during cluster creation.
     #
     # To use this configuration, consider attaching managed policy
-    # AmazonElasticMapReducePlacementGroupPolicy to the EMR role.
+    # AmazonElasticMapReducePlacementGroupPolicy to the Amazon EMR role.
     #
     # @!attribute [rw] instance_role
     #   Role of the instance in the cluster.
     #
-    #   Starting with Amazon EMR version 5.23.0, the only supported instance
+    #   Starting with Amazon EMR release 5.23.0, the only supported instance
     #   role is `MASTER`.
     #   @return [String]
     #
     # @!attribute [rw] placement_strategy
-    #   EC2 Placement Group strategy associated with instance role.
+    #   Amazon EC2 Placement Group strategy associated with instance role.
     #
-    #   Starting with Amazon EMR version 5.23.0, the only supported
+    #   Starting with Amazon EMR release 5.23.0, the only supported
     #   placement strategy is `SPREAD` for the `MASTER` instance role.
     #   @return [String]
     #
@@ -4729,7 +4893,7 @@ module Aws::EMR
     #   `AvailabilityZone` (singular) is used for uniform instance groups.
     #
     #   <note markdown="1"> The instance fleet configuration is available only in Amazon EMR
-    #   versions 4.8.0 and later, excluding 5.0.x versions.
+    #   releases 4.8.0 and later, excluding 5.0.x versions.
     #
     #    </note>
     #   @return [Array<String>]
@@ -4856,8 +5020,9 @@ module Aws::EMR
     #   <note markdown="1"> For accounts that created clusters in a Region before November 25,
     #   2019, block public access is disabled by default in that Region. To
     #   use this feature, you must manually enable and configure it. For
-    #   accounts that did not create an EMR cluster in a Region before this
-    #   date, block public access is enabled by default in that Region.
+    #   accounts that did not create an Amazon EMR cluster in a Region
+    #   before this date, block public access is enabled by default in that
+    #   Region.
     #
     #    </note>
     #   @return [Types::BlockPublicAccessConfiguration]
@@ -4875,8 +5040,8 @@ module Aws::EMR
     class PutBlockPublicAccessConfigurationOutput < Aws::EmptyStructure; end
 
     # @!attribute [rw] cluster_id
-    #   Specifies the ID of an EMR cluster where the managed scaling policy
-    #   is attached.
+    #   Specifies the ID of an Amazon EMR cluster where the managed scaling
+    #   policy is attached.
     #   @return [String]
     #
     # @!attribute [rw] managed_scaling_policy
@@ -5014,7 +5179,7 @@ module Aws::EMR
     # @!attribute [rw] log_encryption_kms_key_id
     #   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
+    #   only available with Amazon EMR releases 5.30.0 and later, excluding
     #   Amazon EMR 6.0.0.
     #   @return [String]
     #
@@ -5083,11 +5248,11 @@ module Aws::EMR
     #    </note>
     #
     #   A list of strings that indicates third-party software to use with
-    #   the job flow that accepts a user argument list. EMR accepts and
-    #   forwards the argument list to the corresponding installation script
-    #   as bootstrap action arguments. For more information, see "Launch a
-    #   Job Flow on the MapR Distribution for Hadoop" in the [Amazon EMR
-    #   Developer Guide][1]. Supported values are:
+    #   the job flow that accepts a user argument list. Amazon EMR accepts
+    #   and forwards the argument list to the corresponding installation
+    #   script as bootstrap action arguments. For more information, see
+    #   "Launch a Job Flow on the MapR Distribution for Hadoop" in the
+    #   [Amazon EMR Developer Guide][1]. Supported values are:
     #
     #   * "mapr-m3" - launch the cluster using MapR M3 Edition.
     #
@@ -5127,7 +5292,7 @@ module Aws::EMR
     #
     # @!attribute [rw] configurations
     #   For Amazon EMR releases 4.0 and later. The list of configurations
-    #   supplied for the EMR cluster you are creating.
+    #   supplied for the Amazon EMR cluster that you are creating.
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] visible_to_all_users
@@ -5135,29 +5300,30 @@ module Aws::EMR
     #   the value is set to `true`. Setting it to `false` now has no effect.
     #
     #   Set this value to `true` so that IAM principals in the Amazon Web
-    #   Services account associated with the cluster can perform EMR actions
-    #   on the cluster that their IAM policies allow. This value defaults to
-    #   `true` for clusters created using the EMR API or the CLI
-    #   [create-cluster][1] command.
+    #   Services account associated with the cluster can perform Amazon EMR
+    #   actions on the cluster that their IAM policies allow. This value
+    #   defaults to `true` for clusters created using the Amazon EMR API or
+    #   the CLI [create-cluster][1] command.
     #
     #   When set to `false`, only the IAM principal that created the cluster
-    #   and the Amazon Web Services account root user can perform EMR
+    #   and the Amazon Web Services account root user can perform Amazon 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 EMRManagement Guide*.
+    #   [Understanding the Amazon 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
+    #   [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
-    #   Also called instance profile and EC2 role. An IAM role for an EMR
-    #   cluster. The EC2 instances of the cluster assume this role. The
-    #   default role is `EMR_EC2_DefaultRole`. In order to use the default
-    #   role, you must have already created it using the CLI or console.
+    #   Also called instance profile and Amazon EC2 role. An IAM role for an
+    #   Amazon EMR cluster. The Amazon EC2 instances of the cluster assume
+    #   this role. The default role is `EMR_EC2_DefaultRole`. In order to
+    #   use the default role, you must have already created it using the CLI
+    #   or console.
     #   @return [String]
     #
     # @!attribute [rw] service_role
@@ -5180,7 +5346,7 @@ module Aws::EMR
     #   An IAM role for automatic scaling policies. The default role is
     #   `EMR_AutoScaling_DefaultRole`. The IAM role provides permissions
     #   that the automatic scaling feature requires to launch and terminate
-    #   EC2 instances in an instance group.
+    #   Amazon EC2 instances in an instance group.
     #   @return [String]
     #
     # @!attribute [rw] scale_down_behavior
@@ -5196,19 +5362,19 @@ module Aws::EMR
     #   Amazon EC2 instances, regardless of the instance-hour boundary. With
     #   either behavior, Amazon EMR removes the least active nodes first and
     #   blocks instance termination if it could lead to HDFS corruption.
-    #   `TERMINATE_AT_TASK_COMPLETION` available only in Amazon EMR version
-    #   4.1.0 and later, and is the default for versions of Amazon EMR
+    #   `TERMINATE_AT_TASK_COMPLETION` available only in Amazon EMR releases
+    #   4.1.0 and later, and is the default for releases of Amazon EMR
     #   earlier than 5.1.0.
     #   @return [String]
     #
     # @!attribute [rw] custom_ami_id
-    #   Available only in Amazon EMR version 5.7.0 and later. The ID of a
+    #   Available only in Amazon EMR releases 5.7.0 and later. The ID of a
     #   custom Amazon EBS-backed Linux AMI. If specified, Amazon EMR uses
-    #   this AMI when it launches cluster EC2 instances. For more
+    #   this AMI when it launches cluster Amazon EC2 instances. For more
     #   information about custom AMIs in Amazon EMR, see [Using a Custom
     #   AMI][1] in the *Amazon EMR Management Guide*. If omitted, the
     #   cluster uses the base Linux AMI for the `ReleaseLabel` specified.
-    #   For Amazon EMR versions 2.x and 3.x, use `AmiVersion` instead.
+    #   For Amazon EMR releases 2.x and 3.x, use `AmiVersion` instead.
     #
     #   For information about creating a custom AMI, see [Creating an Amazon
     #   EBS-Backed Linux AMI][2] in the *Amazon Elastic Compute Cloud User
@@ -5224,8 +5390,8 @@ module Aws::EMR
     #
     # @!attribute [rw] ebs_root_volume_size
     #   The size, in GiB, of the Amazon EBS root device volume of the Linux
-    #   AMI that is used for each EC2 instance. Available in Amazon EMR
-    #   version 4.x and later.
+    #   AMI that is used for each Amazon EC2 instance. Available in Amazon
+    #   EMR releases 4.x and later.
     #   @return [Integer]
     #
     # @!attribute [rw] repo_upgrade_on_boot
@@ -5357,20 +5523,20 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # The upper and lower EC2 instance limits for an automatic scaling
-    # policy. Automatic scaling activities triggered by automatic scaling
-    # rules will not cause an instance group to grow above or below these
-    # limits.
+    # The upper and lower Amazon EC2 instance limits for an automatic
+    # scaling policy. Automatic scaling activities triggered by automatic
+    # scaling rules will not cause an instance group to grow above or below
+    # these limits.
     #
     # @!attribute [rw] min_capacity
-    #   The lower boundary of EC2 instances in an instance group below which
-    #   scaling activities are not allowed to shrink. Scale-in activities
-    #   will not terminate instances below this boundary.
+    #   The lower boundary of Amazon EC2 instances in an instance group
+    #   below which scaling activities are not allowed to shrink. Scale-in
+    #   activities will not terminate instances below this boundary.
     #   @return [Integer]
     #
     # @!attribute [rw] max_capacity
-    #   The upper boundary of EC2 instances in an instance group beyond
-    #   which scaling activities are not allowed to grow. Scale-out
+    #   The upper boundary of Amazon EC2 instances in an instance group
+    #   beyond which scaling activities are not allowed to grow. Scale-out
     #   activities will not add instances beyond this boundary.
     #   @return [Integer]
     #
@@ -5384,9 +5550,9 @@ module Aws::EMR
     end
 
     # A scale-in or scale-out rule that defines scaling activity, including
-    # the CloudWatch metric alarm that triggers activity, how EC2 instances
-    # are added or removed, and the periodicity of adjustments. The
-    # automatic scaling policy for an instance group can comprise one or
+    # the CloudWatch metric alarm that triggers activity, how Amazon EC2
+    # instances are added or removed, and the periodicity of adjustments.
+    # The automatic scaling policy for an instance group can comprise one or
     # more automatic scaling rules.
     #
     # @!attribute [rw] name
@@ -5609,11 +5775,11 @@ module Aws::EMR
     #
     # @!attribute [rw] visible_to_all_users
     #   A value of `true` indicates that an IAM principal in the Amazon Web
-    #   Services account can perform EMR actions on the cluster that the IAM
-    #   policies attached to the principal allow. A value of `false`
+    #   Services account can perform Amazon 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.
+    #   the Amazon Web Services root user can perform Amazon EMR actions on
+    #   the cluster.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/SetVisibleToAllUsersInput AWS API Documentation
@@ -5648,32 +5814,33 @@ module Aws::EMR
     end
 
     # An automatic scaling configuration, which describes how the policy
-    # adds or removes instances, the cooldown period, and the number of EC2
-    # instances that will be added each time the CloudWatch metric alarm
-    # condition is satisfied.
+    # adds or removes instances, the cooldown period, and the number of
+    # Amazon EC2 instances that will be added each time the CloudWatch
+    # metric alarm condition is satisfied.
     #
     # @!attribute [rw] adjustment_type
-    #   The way in which EC2 instances are added (if `ScalingAdjustment` is
-    #   a positive number) or terminated (if `ScalingAdjustment` is a
-    #   negative number) each time the scaling activity is triggered.
-    #   `CHANGE_IN_CAPACITY` is the default. `CHANGE_IN_CAPACITY` indicates
-    #   that the EC2 instance count increments or decrements by
-    #   `ScalingAdjustment`, which should be expressed as an integer.
-    #   `PERCENT_CHANGE_IN_CAPACITY` indicates the instance count increments
-    #   or decrements by the percentage specified by `ScalingAdjustment`,
-    #   which should be expressed as an integer. For example, 20 indicates
-    #   an increase in 20% increments of cluster capacity. `EXACT_CAPACITY`
-    #   indicates the scaling activity results in an instance group with the
-    #   number of EC2 instances specified by `ScalingAdjustment`, which
-    #   should be expressed as a positive integer.
+    #   The way in which Amazon EC2 instances are added (if
+    #   `ScalingAdjustment` is a positive number) or terminated (if
+    #   `ScalingAdjustment` is a negative number) each time the scaling
+    #   activity is triggered. `CHANGE_IN_CAPACITY` is the default.
+    #   `CHANGE_IN_CAPACITY` indicates that the Amazon EC2 instance count
+    #   increments or decrements by `ScalingAdjustment`, which should be
+    #   expressed as an integer. `PERCENT_CHANGE_IN_CAPACITY` indicates the
+    #   instance count increments or decrements by the percentage specified
+    #   by `ScalingAdjustment`, which should be expressed as an integer. For
+    #   example, 20 indicates an increase in 20% increments of cluster
+    #   capacity. `EXACT_CAPACITY` indicates the scaling activity results in
+    #   an instance group with the number of Amazon EC2 instances specified
+    #   by `ScalingAdjustment`, which should be expressed as a positive
+    #   integer.
     #   @return [String]
     #
     # @!attribute [rw] scaling_adjustment
     #   The amount by which to scale in or scale out, based on the specified
-    #   `AdjustmentType`. A positive value adds to the instance group's EC2
-    #   instance count while a negative number removes instances. If
-    #   `AdjustmentType` is set to `EXACT_CAPACITY`, the number should only
-    #   be a positive integer. If `AdjustmentType` is set to
+    #   `AdjustmentType`. A positive value adds to the instance group's
+    #   Amazon EC2 instance count while a negative number removes instances.
+    #   If `AdjustmentType` is set to `EXACT_CAPACITY`, the number should
+    #   only be a positive integer. If `AdjustmentType` is set to
     #   `PERCENT_CHANGE_IN_CAPACITY`, the value should express the
     #   percentage as an integer. For example, -20 indicates a decrease in
     #   20% increments of cluster capacity.
@@ -5720,8 +5887,8 @@ module Aws::EMR
     # 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. Spot Instance
-    # allocation strategy is available in Amazon EMR version 5.12.1 and
+    # releases 4.8.0 and later, excluding 5.0.x versions. Spot Instance
+    # allocation strategy is available in Amazon EMR releases 5.12.1 and
     # later.
     #
     #  </note>
@@ -5813,15 +5980,15 @@ module Aws::EMR
     end
 
     # @!attribute [rw] editor_id
-    #   The unique identifier of the EMR Notebook to use for notebook
+    #   The unique identifier of the Amazon EMR Notebook to use for notebook
     #   execution.
     #   @return [String]
     #
     # @!attribute [rw] relative_path
     #   The path and file name of the notebook file for this execution,
-    #   relative to the path specified for the EMR Notebook. For example, if
-    #   you specify a path of `s3://MyBucket/MyNotebooks` when you create an
-    #   EMR Notebook for a notebook with an ID of
+    #   relative to the path specified for the Amazon EMR Notebook. For
+    #   example, if you specify a path of `s3://MyBucket/MyNotebooks` when
+    #   you create an Amazon EMR Notebook for a notebook with an ID of
     #   `e-ABCDEFGHIJK1234567890ABCD` (the `EditorID` of this request), and
     #   you specify a `RelativePath` of
     #   `my_notebook_executions/notebook_execution.ipynb`, the location of
@@ -5834,7 +6001,7 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] notebook_params
-    #   Input parameters in JSON format passed to the EMR Notebook at
+    #   Input parameters in JSON format passed to the Amazon EMR Notebook at
     #   runtime for execution.
     #   @return [String]
     #
@@ -5845,12 +6012,12 @@ module Aws::EMR
     #
     # @!attribute [rw] service_role
     #   The name or ARN of the IAM role that is used as the service role for
-    #   Amazon EMR (the EMR role) for the notebook execution.
+    #   Amazon EMR (the Amazon EMR role) for the notebook execution.
     #   @return [String]
     #
     # @!attribute [rw] notebook_instance_security_group_id
     #   The unique identifier of the Amazon EC2 security group to associate
-    #   with the EMR Notebook for this notebook execution.
+    #   with the Amazon EMR Notebook for this notebook execution.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -5860,6 +6027,22 @@ module Aws::EMR
     #   maximum of 256 characters.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] notebook_s3_location
+    #   The Amazon S3 location for the notebook execution input.
+    #   @return [Types::NotebookS3LocationFromInput]
+    #
+    # @!attribute [rw] output_notebook_s3_location
+    #   The Amazon S3 location for the notebook execution output.
+    #   @return [Types::OutputNotebookS3LocationFromInput]
+    #
+    # @!attribute [rw] output_notebook_format
+    #   The output format for the notebook execution.
+    #   @return [String]
+    #
+    # @!attribute [rw] environment_variables
+    #   The environment variables associated with the notebook execution.
+    #   @return [Hash<String,String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/StartNotebookExecutionInput AWS API Documentation
     #
     class StartNotebookExecutionInput < Struct.new(
@@ -5870,7 +6053,11 @@ module Aws::EMR
       :execution_engine,
       :service_role,
       :notebook_instance_security_group_id,
-      :tags)
+      :tags,
+      :notebook_s3_location,
+      :output_notebook_s3_location,
+      :output_notebook_format,
+      :environment_variables)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5932,7 +6119,7 @@ module Aws::EMR
     #   type using the following format:
     #   `arn:partition:service:region:account:resource`.
     #
-    #   For example, `arn:aws:iam::1234567890:role/ReadOnly` is a correctly
+    #   For example, `arn:aws:IAM::1234567890:role/ReadOnly` is a correctly
     #   formatted runtime role ARN.
     #   @return [String]
     #
@@ -6194,8 +6381,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] auth_mode
-    #   Specifies whether the Amazon EMR Studio authenticates users using
-    #   IAM or IAM Identity Center.
+    #   Specifies whether the Amazon EMR Studio authenticates users with IAM
+    #   or IAM Identity Center.
     #   @return [String]
     #
     # @!attribute [rw] vpc_id
@@ -6330,7 +6517,7 @@ module Aws::EMR
     end
 
     # The list of supported product configurations that allow user-supplied
-    # arguments. EMR accepts these arguments and forwards them to the
+    # arguments. Amazon EMR accepts these arguments and forwards them to the
     # corresponding installation script as bootstrap action arguments.
     #
     # @!attribute [rw] name
@@ -6511,7 +6698,7 @@ module Aws::EMR
 
     # EBS volume specifications such as volume type, IOPS, size (GiB) and
     # throughput (MiB/s) that are requested for the EBS volume attached to
-    # an EC2 instance in the cluster.
+    # an Amazon EC2 instance in the cluster.
     #
     # @!attribute [rw] volume_type
     #   The volume type. Volume types supported are gp3, gp2, io1, st1, sc1,