aws-sdk-ec2 1.522.0 → 1.560.0

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

@@ -535,6 +535,63 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Contains information about the current security configuration of an
+    # active VPN tunnel.
+    #
+    # @!attribute [rw] phase_1_encryption_algorithm
+    #   The encryption algorithm negotiated in Phase 1 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_2_encryption_algorithm
+    #   The encryption algorithm negotiated in Phase 2 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_1_integrity_algorithm
+    #   The integrity algorithm negotiated in Phase 1 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_2_integrity_algorithm
+    #   The integrity algorithm negotiated in Phase 2 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_1_dh_group
+    #   The Diffie-Hellman group number being used in Phase 1 IKE
+    #   negotiations.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] phase_2_dh_group
+    #   The Diffie-Hellman group number being used in Phase 2 IKE
+    #   negotiations.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] ike_version
+    #   The version of the Internet Key Exchange (IKE) protocol being used.
+    #   @return [String]
+    #
+    # @!attribute [rw] provisioning_status
+    #   The current provisioning status of the VPN tunnel.
+    #   @return [String]
+    #
+    # @!attribute [rw] provisioning_status_reason
+    #   The reason for the current provisioning status.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ActiveVpnTunnelStatus AWS API Documentation
+    #
+    class ActiveVpnTunnelStatus < Struct.new(
+      :phase_1_encryption_algorithm,
+      :phase_2_encryption_algorithm,
+      :phase_1_integrity_algorithm,
+      :phase_2_integrity_algorithm,
+      :phase_1_dh_group,
+      :phase_2_dh_group,
+      :ike_version,
+      :provisioning_status,
+      :provisioning_status_reason)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Add an operating Region to an IPAM. Operating Regions are Amazon Web
     # Services Regions where the IPAM is allowed to manage IP address CIDRs.
     # IPAM only discovers and monitors resources in the Amazon Web Services
@@ -771,6 +828,10 @@ module Aws::EC2
     #   (for example an EC2 instance).
     #   @return [String]
     #
+    # @!attribute [rw] subnet_id
+    #   The ID of the subnet where the IP address is allocated.
+    #   @return [String]
+    #
     # @!attribute [rw] service_managed
     #   The service that manages the elastic IP address.
     #
@@ -802,6 +863,7 @@ module Aws::EC2
       :customer_owned_ip,
       :customer_owned_ipv_4_pool,
       :carrier_ip,
+      :subnet_id,
       :service_managed,
       :instance_id,
       :public_ip)
@@ -1129,6 +1191,10 @@ module Aws::EC2
     #     specified.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @!attribute [rw] auto_placement
     #   Indicates whether the host accepts any untargeted instance launches
     #   that match its instance type configuration, or if it only accepts
@@ -1187,6 +1253,7 @@ module Aws::EC2
       :outpost_arn,
       :host_maintenance,
       :asset_ids,
+      :availability_zone_id,
       :auto_placement,
       :client_token,
       :instance_type,
@@ -1458,6 +1525,10 @@ module Aws::EC2
     #   The Availability Zone.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @!attribute [rw] instance
     #   Information about the instance.
     #   @return [Types::AnalysisComponent]
@@ -1471,6 +1542,7 @@ module Aws::EC2
     class AnalysisLoadBalancerTarget < Struct.new(
       :address,
       :availability_zone,
+      :availability_zone_id,
       :instance,
       :port)
       SENSITIVE = []
@@ -2438,6 +2510,11 @@ module Aws::EC2
     #   The ID of the internet gateway or virtual private gateway.
     #   @return [String]
     #
+    # @!attribute [rw] public_ipv_4_pool
+    #   The ID of a public IPv4 pool. A public IPv4 pool is a pool of IPv4
+    #   addresses that you've brought to Amazon Web Services with BYOIP.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -2457,6 +2534,7 @@ module Aws::EC2
     #
     class AssociateRouteTableRequest < Struct.new(
       :gateway_id,
+      :public_ipv_4_pool,
       :dry_run,
       :subnet_id,
       :route_table_id)
@@ -3951,7 +4029,12 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] device_name
-    #   The device name (for example, `/dev/sdh` or `xvdh`).
+    #   The device name. For available device names, see [Device names for
+    #   volumes][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/device_naming.html
     #   @return [String]
     #
     # @!attribute [rw] virtual_name
@@ -4774,6 +4857,81 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Reserve powerful GPU instances on a future date to support your short
+    # duration machine learning (ML) workloads. Instances that run inside a
+    # Capacity Block are automatically placed close together inside [Amazon
+    # EC2 UltraClusters][1], for low-latency, petabit-scale, non-blocking
+    # networking.
+    #
+    # You can also reserve Amazon EC2 UltraServers. UltraServers connect
+    # multiple EC2 instances using a low-latency, high-bandwidth accelerator
+    # interconnect (NeuronLink). They are built to tackle very large-scale
+    # AI/ML workloads that require significant processing power. For more
+    # information, see Amazon EC2 UltraServers.
+    #
+    #
+    #
+    # [1]: http://aws.amazon.com/ec2/ultraclusters/
+    #
+    # @!attribute [rw] capacity_block_id
+    #   The ID of the Capacity Block.
+    #   @return [String]
+    #
+    # @!attribute [rw] ultraserver_type
+    #   The EC2 UltraServer type of the Capacity Block.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone
+    #   The Availability Zone of the Capacity Block.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The Availability Zone ID of the Capacity Block.
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_ids
+    #   The ID of the Capacity Reservation.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] start_date
+    #   The date and time at which the Capacity Block was started.
+    #   @return [Time]
+    #
+    # @!attribute [rw] end_date
+    #   The date and time at which the Capacity Block expires. When a
+    #   Capacity Block expires, all instances in the Capacity Block are
+    #   terminated.
+    #   @return [Time]
+    #
+    # @!attribute [rw] create_date
+    #   The date and time at which the Capacity Block was created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] state
+    #   The state of the Capacity Block.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   The tags assigned to the Capacity Block.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityBlock AWS API Documentation
+    #
+    class CapacityBlock < Struct.new(
+      :capacity_block_id,
+      :ultraserver_type,
+      :availability_zone,
+      :availability_zone_id,
+      :capacity_reservation_ids,
+      :start_date,
+      :end_date,
+      :create_date,
+      :state,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a Capacity Block extension. With an extension, you can
     # extend the duration of time for an existing Capacity Block.
     #
@@ -4994,6 +5152,14 @@ module Aws::EC2
     #   The tenancy of the Capacity Block.
     #   @return [String]
     #
+    # @!attribute [rw] ultraserver_type
+    #   The EC2 UltraServer type of the Capacity Block offering.
+    #   @return [String]
+    #
+    # @!attribute [rw] ultraserver_count
+    #   The number of EC2 UltraServers in the offering.
+    #   @return [Integer]
+    #
     # @!attribute [rw] capacity_block_duration_minutes
     #   The number of minutes (in addition to `capacityBlockDurationHours`)
     #   for the duration of the Capacity Block reservation. For example, if
@@ -5014,11 +5180,63 @@ module Aws::EC2
       :upfront_fee,
       :currency_code,
       :tenancy,
+      :ultraserver_type,
+      :ultraserver_count,
       :capacity_block_duration_minutes)
       SENSITIVE = []
       include Aws::Structure
     end
 
+    # Describes the availability of capacity for a Capacity Block.
+    #
+    # @!attribute [rw] capacity_block_id
+    #   The ID of the Capacity Block.
+    #   @return [String]
+    #
+    # @!attribute [rw] interconnect_status
+    #   The status of the high-bandwidth accelerator interconnect. Possible
+    #   states include:
+    #
+    #   * `ok` the accelerator interconnect is healthy.
+    #
+    #   * `impaired` - accelerator interconnect communication is impaired.
+    #
+    #   * `insufficient-data` - insufficient data to determine accelerator
+    #     interconnect status.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_capacity
+    #   The combined amount of `Available` and `Unavailable` capacity in the
+    #   Capacity Block.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_available_capacity
+    #   The remaining capacity. Indicates the number of resources that can
+    #   be launched into the Capacity Block.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_unavailable_capacity
+    #   The unavailable capacity. Indicates the instance capacity that is
+    #   unavailable for use due to a system status check failure.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] capacity_reservation_statuses
+    #   The availability of capacity for the Capacity Block reservations.
+    #   @return [Array<Types::CapacityReservationStatus>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityBlockStatus AWS API Documentation
+    #
+    class CapacityBlockStatus < Struct.new(
+      :capacity_block_id,
+      :interconnect_status,
+      :total_capacity,
+      :total_available_capacity,
+      :total_unavailable_capacity,
+      :capacity_reservation_statuses)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a Capacity Reservation.
     #
     # @!attribute [rw] capacity_reservation_id
@@ -5229,6 +5447,10 @@ module Aws::EC2
     #   have in your account at the requested date and time.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_block_id
+    #   The ID of the Capacity Block.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservation AWS API Documentation
     #
     class CapacityReservation < Struct.new(
@@ -5258,7 +5480,8 @@ module Aws::EC2
       :reservation_type,
       :unused_reservation_billing_owner_id,
       :commitment_info,
-      :delivery_preference)
+      :delivery_preference,
+      :capacity_block_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5540,12 +5763,17 @@ module Aws::EC2
     #   The tenancy of the Capacity Reservation.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationInfo AWS API Documentation
     #
     class CapacityReservationInfo < Struct.new(
       :instance_type,
       :availability_zone,
-      :tenancy)
+      :tenancy,
+      :availability_zone_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5715,6 +5943,38 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes the availability of capacity for a Capacity Reservation.
+    #
+    # @!attribute [rw] capacity_reservation_id
+    #   The ID of the Capacity Reservation.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_capacity
+    #   The combined amount of `Available` and `Unavailable` capacity in the
+    #   Capacity Reservation.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_available_capacity
+    #   The remaining capacity. Indicates the amount of resources that can
+    #   be launched into the Capacity Reservation.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_unavailable_capacity
+    #   The used capacity. Indicates that the capacity is in use by
+    #   resources that are running in the Capacity Reservation.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationStatus AWS API Documentation
+    #
+    class CapacityReservationStatus < Struct.new(
+      :capacity_reservation_id,
+      :total_capacity,
+      :total_available_capacity,
+      :total_unavailable_capacity)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a target Capacity Reservation or Capacity Reservation group.
     #
     # @!attribute [rw] capacity_reservation_id
@@ -6284,6 +6544,13 @@ module Aws::EC2
     #   The IP address of the client.
     #   @return [String]
     #
+    # @!attribute [rw] client_ipv_6_address
+    #   The IPv6 address assigned to the client connection when using a
+    #   dual-stack Client VPN endpoint. This field is only populated when
+    #   the endpoint is configured for dual-stack addressing, and the client
+    #   is using IPv6 for connectivity.
+    #   @return [String]
+    #
     # @!attribute [rw] common_name
     #   The common name associated with the client. This is either the name
     #   of the client certificate, or the Active Directory user name.
@@ -6315,6 +6582,7 @@ module Aws::EC2
       :ingress_packets,
       :egress_packets,
       :client_ip,
+      :client_ipv_6_address,
       :common_name,
       :status,
       :connection_end_time,
@@ -6478,6 +6746,18 @@ module Aws::EC2
     #   reconnect automatically. The default value is `true`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] endpoint_ip_address_type
+    #   The IP address type of the Client VPN endpoint. Possible values are
+    #   `ipv4` for IPv4 addressing only, `ipv6` for IPv6 addressing only, or
+    #   `dual-stack `for both IPv4 and IPv6 addressing.
+    #   @return [String]
+    #
+    # @!attribute [rw] traffic_ip_address_type
+    #   The IP address type of the Client VPN endpoint. Possible values are
+    #   either `ipv4` for IPv4 addressing only, `ipv6` for IPv6 addressing
+    #   only, or `dual-stack` for both IPv4 and IPv6 addressing.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ClientVpnEndpoint AWS API Documentation
     #
     class ClientVpnEndpoint < Struct.new(
@@ -6505,7 +6785,9 @@ module Aws::EC2
       :session_timeout_hours,
       :client_login_banner_options,
       :client_route_enforcement_options,
-      :disconnect_on_session_timeout)
+      :disconnect_on_session_timeout,
+      :endpoint_ip_address_type,
+      :traffic_ip_address_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -7185,8 +7467,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier you provide to ensure idempotency
-    #   of the request. For more information, see [Ensuring idempotency][1]
-    #   in the *Amazon EC2 API Reference*.
+    #   of the request. For more information, see [Ensuring idempotency in
+    #   Amazon EC2 API requests][1] in the *Amazon EC2 API Reference*.
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
@@ -7197,17 +7479,18 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description for the new AMI in the destination Region.
+    #   A description for the new AMI.
     #   @return [String]
     #
     # @!attribute [rw] encrypted
-    #   Specifies whether the destination snapshots of the copied image
-    #   should be encrypted. You can encrypt a copy of an unencrypted
-    #   snapshot, but you cannot create an unencrypted copy of an encrypted
-    #   snapshot. The default KMS key for Amazon EBS is used unless you
-    #   specify a non-default Key Management Service (KMS) KMS key using
-    #   `KmsKeyId`. For more information, see [Use encryption with
-    #   EBS-backed AMIs][1] in the *Amazon EC2 User Guide*.
+    #   Specifies whether to encrypt the snapshots of the copied image.
+    #
+    #   You can encrypt a copy of an unencrypted snapshot, but you cannot
+    #   create an unencrypted copy of an encrypted snapshot. The default KMS
+    #   key for Amazon EBS is used unless you specify a non-default Key
+    #   Management Service (KMS) KMS key using `KmsKeyId`. For more
+    #   information, see [Use encryption with EBS-backed AMIs][1] in the
+    #   *Amazon EC2 User Guide*.
     #
     #
     #
@@ -7243,7 +7526,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] name
-    #   The name of the new AMI in the destination Region.
+    #   The name of the new AMI.
     #   @return [String]
     #
     # @!attribute [rw] source_image_id
@@ -7255,25 +7538,29 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] destination_outpost_arn
-    #   The Amazon Resource Name (ARN) of the Outpost to which to copy the
-    #   AMI. Only specify this parameter when copying an AMI from an Amazon
-    #   Web Services Region to an Outpost. The AMI must be in the Region of
-    #   the destination Outpost. You cannot copy an AMI from an Outpost to a
+    #   The Amazon Resource Name (ARN) of the Outpost for the new AMI.
+    #
+    #   Only specify this parameter when copying an AMI from an Amazon Web
+    #   Services Region to an Outpost. The AMI must be in the Region of the
+    #   destination Outpost. You can't copy an AMI from an Outpost to a
     #   Region, from one Outpost to another, or within the same Outpost.
     #
     #   For more information, see [Copy AMIs from an Amazon Web Services
     #   Region to an Outpost][1] in the *Amazon EBS User Guide*.
     #
+    #   Only one of `DestinationAvailabilityZone`,
+    #   `DestinationAvailabilityZoneId`, or `DestinationOutpostArn` can be
+    #   specified.
+    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#copy-amis
     #   @return [String]
     #
     # @!attribute [rw] copy_image_tags
-    #   Indicates whether to include your user-defined AMI tags when copying
-    #   the AMI.
+    #   Specifies whether to copy your user-defined AMI tags to the new AMI.
     #
-    #   The following tags will not be copied:
+    #   The following tags are not be copied:
     #
     #   * System tags (prefixed with `aws:`)
     #
@@ -7307,18 +7594,42 @@ module Aws::EC2
     #   a time-based AMI copy. The specified completion duration applies to
     #   each of the snapshots associated with the AMI. Each snapshot
     #   associated with the AMI will be completed within the specified
-    #   completion duration, regardless of their size.
+    #   completion duration, with copy throughput automatically adjusted for
+    #   each snapshot based on its size to meet the timing target.
     #
     #   If you do not specify a value, the AMI copy operation is completed
     #   on a best-effort basis.
     #
-    #   For more information, see [ Time-based copies][1].
+    #   <note markdown="1"> This parameter is not supported when copying an AMI to or from a
+    #   Local Zone, or to an Outpost.
+    #
+    #    </note>
+    #
+    #   For more information, see [Time-based copies for Amazon EBS
+    #   snapshots and EBS-backed AMIs][1].
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/time-based-copies.html
     #   @return [Integer]
     #
+    # @!attribute [rw] destination_availability_zone
+    #   The Local Zone for the new AMI (for example, `cn-north-1-pkx-1a`).
+    #
+    #   Only one of `DestinationAvailabilityZone`,
+    #   `DestinationAvailabilityZoneId`, or `DestinationOutpostArn` can be
+    #   specified.
+    #   @return [String]
+    #
+    # @!attribute [rw] destination_availability_zone_id
+    #   The ID of the Local Zone for the new AMI (for example,
+    #   `cnn1-pkx1-az1`).
+    #
+    #   Only one of `DestinationAvailabilityZone`,
+    #   `DestinationAvailabilityZoneId`, or `DestinationOutpostArn` can be
+    #   specified.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -7340,6 +7651,8 @@ module Aws::EC2
       :copy_image_tags,
       :tag_specifications,
       :snapshot_copy_completion_duration_minutes,
+      :destination_availability_zone,
+      :destination_availability_zone_id,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
@@ -7365,11 +7678,11 @@ module Aws::EC2
     #
     # @!attribute [rw] destination_outpost_arn
     #   The Amazon Resource Name (ARN) of the Outpost to which to copy the
-    #   snapshot. Only specify this parameter when copying a snapshot from
-    #   an Amazon Web Services Region to an Outpost. The snapshot must be in
-    #   the Region for the destination Outpost. You cannot copy a snapshot
-    #   from an Outpost to a Region, from one Outpost to another, or within
-    #   the same Outpost.
+    #   snapshot.
+    #
+    #   <note markdown="1"> Only supported when copying a snapshot to an Outpost.
+    #
+    #    </note>
     #
     #   For more information, see [ Copy snapshots from an Amazon Web
     #   Services Region to an Outpost][1] in the *Amazon EBS User Guide*.
@@ -7394,9 +7707,9 @@ module Aws::EC2
     # @!attribute [rw] encrypted
     #   To encrypt a copy of an unencrypted snapshot if encryption by
     #   default is not enabled, enable encryption using this parameter.
-    #   Otherwise, omit this parameter. Encrypted snapshots are encrypted,
-    #   even if you omit this parameter and encryption by default is not
-    #   enabled. You cannot set this parameter to false. For more
+    #   Otherwise, omit this parameter. Copies of encrypted snapshots are
+    #   encrypted, even if you omit this parameter and encryption by default
+    #   is not enabled. You cannot set this parameter to false. For more
     #   information, see [Amazon EBS encryption][1] in the *Amazon EBS User
     #   Guide*.
     #
@@ -7465,6 +7778,11 @@ module Aws::EC2
     #   @return [Array<Types::TagSpecification>]
     #
     # @!attribute [rw] completion_duration_minutes
+    #   <note markdown="1"> Not supported when copying snapshots to or from Local Zones or
+    #   Outposts.
+    #
+    #    </note>
+    #
     #   Specify a completion duration, in 15 minute increments, to initiate
     #   a time-based snapshot copy. Time-based snapshot copy operations
     #   complete within the specified duration. For more information, see [
@@ -7478,6 +7796,15 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/time-based-copies.html
     #   @return [Integer]
     #
+    # @!attribute [rw] destination_availability_zone
+    #   The Local Zone, for example, `cn-north-1-pkx-1a` to which to copy
+    #   the snapshot.
+    #
+    #   <note markdown="1"> Only supported when copying a snapshot to a Local Zone.
+    #
+    #    </note>
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -7498,6 +7825,7 @@ module Aws::EC2
       :source_snapshot_id,
       :tag_specifications,
       :completion_duration_minutes,
+      :destination_availability_zone,
       :dry_run)
       SENSITIVE = [:presigned_url]
       include Aws::Structure
@@ -7889,7 +8217,7 @@ module Aws::EC2
     #   The instance type for which to reserve capacity.
     #
     #   <note markdown="1"> You can request future-dated Capacity Reservations for instance
-    #   types in the C, M, R, I, and T instance families only.
+    #   types in the C, M, R, I, T, and G instance families only.
     #
     #    </note>
     #
@@ -7930,9 +8258,9 @@ module Aws::EC2
     #   The number of instances for which to reserve capacity.
     #
     #   <note markdown="1"> You can request future-dated Capacity Reservations for an instance
-    #   count with a minimum of 100 vCPUs. For example, if you request a
+    #   count with a minimum of 64 vCPUs. For example, if you request a
     #   future-dated Capacity Reservation for `m5.xlarge` instances, you
-    #   must request at least 25 instances (*25 * m5.xlarge = 100 vCPUs*).
+    #   must request at least 25 instances (*16 * m5.xlarge = 64 vCPUs*).
     #
     #    </note>
     #
@@ -8343,6 +8671,22 @@ module Aws::EC2
     #   `true`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] endpoint_ip_address_type
+    #   The IP address type for the Client VPN endpoint. Valid values are
+    #   `ipv4` (default) for IPv4 addressing only, `ipv6` for IPv6
+    #   addressing only, or `dual-stack` for both IPv4 and IPv6 addressing.
+    #   When set to `dual-stack,` clients can connect to the endpoint using
+    #   either IPv4 or IPv6 addresses..
+    #   @return [String]
+    #
+    # @!attribute [rw] traffic_ip_address_type
+    #   The IP address type for traffic within the Client VPN tunnel. Valid
+    #   values are `ipv4` (default) for IPv4 traffic only, `ipv6` for IPv6
+    #   addressing only, or `dual-stack` for both IPv4 and IPv6 traffic.
+    #   When set to `dual-stack`, clients can access both IPv4 and IPv6
+    #   resources through the VPN .
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateClientVpnEndpointRequest AWS API Documentation
     #
     class CreateClientVpnEndpointRequest < Struct.new(
@@ -8365,7 +8709,9 @@ module Aws::EC2
       :session_timeout_hours,
       :client_login_banner_options,
       :client_route_enforcement_options,
-      :disconnect_on_session_timeout)
+      :disconnect_on_session_timeout,
+      :endpoint_ip_address_type,
+      :traffic_ip_address_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8583,11 +8929,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] ip_address
-    #   IPv4 address for the customer gateway device's outside interface.
+    #   The IP address for the customer gateway device's outside interface.
     #   The address must be static. If `OutsideIpAddressType` in your VPN
     #   connection options is set to `PrivateIpv4`, you can use an RFC6598
     #   or RFC1918 private IPv4 address. If `OutsideIpAddressType` is set to
-    #   `PublicIpv4`, you can use a public IPv4 address.
+    #   `Ipv6`, you can use an IPv6 address.
     #   @return [String]
     #
     # @!attribute [rw] bgp_asn_extended
@@ -8638,6 +8984,9 @@ module Aws::EC2
 
     # @!attribute [rw] availability_zone
     #   The Availability Zone in which to create the default subnet.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` must be specified,
+    #   but not both.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -8653,12 +9002,20 @@ module Aws::EC2
     #   before you can create an IPv6 only subnet.
     #   @return [Boolean]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` must be specified,
+    #   but not both.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateDefaultSubnetRequest AWS API Documentation
     #
     class CreateDefaultSubnetRequest < Struct.new(
       :availability_zone,
       :dry_run,
-      :ipv_6_native)
+      :ipv_6_native,
+      :availability_zone_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8702,6 +9059,85 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] client_token
+    #   Unique, case-sensitive identifier that you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensuring
+    #   Idempotency][1].
+    #
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] instance_id
+    #   The ID of the Amazon EC2 Mac instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] mac_credentials
+    #   Specifies the following credentials:
+    #
+    #   * **Internal disk administrative user**
+    #
+    #     * **Username** - Only the default administrative user
+    #       (`aws-managed-user`) is supported and it is used by default. You
+    #       can't specify a different administrative user.
+    #
+    #     * **Password** - If you did not change the default password for
+    #       `aws-managed-user`, specify the default password, which is
+    #       *blank*. Otherwise, specify your password.
+    #   * **Amazon EBS root volume administrative user**
+    #
+    #     * **Username** - If you did not change the default administrative
+    #       user, specify `ec2-user`. Otherwise, specify the username for
+    #       your administrative user.
+    #
+    #     * **Password** - Specify the password for the administrative user.
+    #
+    #   The credentials must be specified in the following JSON format:
+    #
+    #   `{ "internalDiskPassword":"internal-disk-admin_password",
+    #   "rootVolumeUsername":"root-volume-admin_username",
+    #   "rootVolumepassword":"root-volume-admin_password" }`
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_specifications
+    #   The tags to assign to the volume ownership delegation task.
+    #   @return [Array<Types::TagSpecification>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateDelegateMacVolumeOwnershipTaskRequest AWS API Documentation
+    #
+    class CreateDelegateMacVolumeOwnershipTaskRequest < Struct.new(
+      :client_token,
+      :dry_run,
+      :instance_id,
+      :mac_credentials,
+      :tag_specifications)
+      SENSITIVE = [:mac_credentials]
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] mac_modification_task
+    #   Information about the volume ownership delegation task.
+    #   @return [Types::MacModificationTask]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateDelegateMacVolumeOwnershipTaskResult AWS API Documentation
+    #
+    class CreateDelegateMacVolumeOwnershipTaskResult < Struct.new(
+      :mac_modification_task)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dhcp_configurations
     #   A DHCP configuration option.
     #   @return [Array<Types::NewDhcpConfiguration>]
@@ -9309,6 +9745,23 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] snapshot_location
+    #   <note markdown="1"> Only supported for instances in Local Zones. If the source instance
+    #   is not in a Local Zone, omit this parameter.
+    #
+    #    </note>
+    #
+    #   The Amazon S3 location where the snapshots will be stored.
+    #
+    #   * To create local snapshots in the same Local Zone as the source
+    #     instance, specify `local`.
+    #
+    #   * To create regional snapshots in the parent Region of the Local
+    #     Zone, specify `regional` or omit this parameter.
+    #
+    #   Default: `regional`
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -9363,7 +9816,7 @@ module Aws::EC2
     #     snapshots. To create an AMI with volumes or snapshots that have a
     #     different encryption status (for example, where the source volume
     #     and snapshots are unencrypted, and you want to create an AMI with
-    #     encrypted volumes or snapshots), use the CopyImage action.
+    #     encrypted volumes or snapshots), copy the image instead.
     #
     #   * The only option that can be changed for existing mappings or
     #     snapshots is `DeleteOnTermination`.
@@ -9373,6 +9826,7 @@ module Aws::EC2
     #
     class CreateImageRequest < Struct.new(
       :tag_specifications,
+      :snapshot_location,
       :dry_run,
       :instance_id,
       :name,
@@ -9395,6 +9849,71 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] image_id
+    #   The ID of the image to report on.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] resource_types
+    #   The resource types to include in the report.
+    #   @return [Array<Types::ImageUsageResourceTypeRequest>]
+    #
+    # @!attribute [rw] account_ids
+    #   The Amazon Web Services account IDs to include in the report. To
+    #   include all accounts, omit this parameter.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] client_token
+    #   A unique, case-sensitive identifier that you provide to ensure
+    #   idempotency of the request.
+    #
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the report on creation. The `ResourceType` must
+    #   be set to `image-usage-report`; any other value will cause the
+    #   report creation to fail.
+    #
+    #   To tag a report after it has been created, see [CreateTags][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
+    #   @return [Array<Types::TagSpecification>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateImageUsageReportRequest AWS API Documentation
+    #
+    class CreateImageUsageReportRequest < Struct.new(
+      :image_id,
+      :dry_run,
+      :resource_types,
+      :account_ids,
+      :client_token,
+      :tag_specifications)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] report_id
+    #   The ID of the report.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateImageUsageReportResult AWS API Documentation
+    #
+    class CreateImageUsageReportResult < Struct.new(
+      :report_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -9421,6 +9940,12 @@ module Aws::EC2
     #
     #   * `false` - Use the network interface IP address as the source.
     #
+    #   <note markdown="1"> `PreserveClientIp` is only supported on IPv4 EC2 Instance Connect
+    #   Endpoints. To use `PreserveClientIp`, the value for `IpAddressType`
+    #   must be `ipv4`.
+    #
+    #    </note>
+    #
     #   Default: `false`
     #   @return [Boolean]
     #
@@ -9437,6 +9962,25 @@ module Aws::EC2
     #   creation.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] ip_address_type
+    #   The IP address type of the endpoint.
+    #
+    #   If no value is specified, the default value is determined by the IP
+    #   address type of the subnet:
+    #
+    #   * `dualstack` - If the subnet has both IPv4 and IPv6 CIDRs
+    #
+    #   * `ipv4` - If the subnet has only IPv4 CIDRs
+    #
+    #   * `ipv6` - If the subnet has only IPv6 CIDRs
+    #
+    #   <note markdown="1"> `PreserveClientIp` is only supported on IPv4 EC2 Instance Connect
+    #   Endpoints. To use `PreserveClientIp`, the value for `IpAddressType`
+    #   must be `ipv4`.
+    #
+    #    </note>
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateInstanceConnectEndpointRequest AWS API Documentation
     #
     class CreateInstanceConnectEndpointRequest < Struct.new(
@@ -9445,7 +9989,8 @@ module Aws::EC2
       :security_group_ids,
       :preserve_client_ip,
       :client_token,
-      :tag_specifications)
+      :tag_specifications,
+      :ip_address_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -10616,6 +11161,101 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] client_token
+    #   Unique, case-sensitive identifier that you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensuring
+    #   Idempotency][1].
+    #
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] instance_id
+    #   The ID of the Amazon EC2 Mac instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] mac_credentials
+    #   **\[Apple silicon Mac instances only\]** Specifies the following
+    #   credentials:
+    #
+    #   * **Internal disk administrative user**
+    #
+    #     * **Username** - Only the default administrative user
+    #       (`aws-managed-user`) is supported and it is used by default. You
+    #       can't specify a different administrative user.
+    #
+    #     * **Password** - If you did not change the default password for
+    #       `aws-managed-user`, specify the default password, which is
+    #       *blank*. Otherwise, specify your password.
+    #   * **Amazon EBS root volume administrative user**
+    #
+    #     * **Username** - If you did not change the default administrative
+    #       user, specify `ec2-user`. Otherwise, specify the username for
+    #       your administrative user.
+    #
+    #     * **Password** - Specify the password for the administrative user.
+    #
+    #   The credentials must be specified in the following JSON format:
+    #
+    #   `{ "internalDiskPassword":"internal-disk-admin_password",
+    #   "rootVolumeUsername":"root-volume-admin_username",
+    #   "rootVolumepassword":"root-volume-admin_password" }`
+    #   @return [String]
+    #
+    # @!attribute [rw] mac_system_integrity_protection_configuration
+    #   Specifies the overrides to selectively enable or disable individual
+    #   SIP settings. The individual settings you specify here override the
+    #   overall SIP status you specify for
+    #   **MacSystemIntegrityProtectionStatus**.
+    #   @return [Types::MacSystemIntegrityProtectionConfigurationRequest]
+    #
+    # @!attribute [rw] mac_system_integrity_protection_status
+    #   Specifies the overall SIP status for the instance. To enable all SIP
+    #   settings, specify `enabled`. To disable all SIP settings, specify
+    #   `disabled`.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_specifications
+    #   Specifies tags to apply to the SIP modification task.
+    #   @return [Array<Types::TagSpecification>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateMacSystemIntegrityProtectionModificationTaskRequest AWS API Documentation
+    #
+    class CreateMacSystemIntegrityProtectionModificationTaskRequest < Struct.new(
+      :client_token,
+      :dry_run,
+      :instance_id,
+      :mac_credentials,
+      :mac_system_integrity_protection_configuration,
+      :mac_system_integrity_protection_status,
+      :tag_specifications)
+      SENSITIVE = [:mac_credentials]
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] mac_modification_task
+    #   Information about the SIP modification task.
+    #   @return [Types::MacModificationTask]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateMacSystemIntegrityProtectionModificationTaskResult AWS API Documentation
+    #
+    class CreateMacSystemIntegrityProtectionModificationTaskResult < Struct.new(
+      :mac_modification_task)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -11712,6 +12352,10 @@ module Aws::EC2
     #   The Amazon Resource Name (ARN) of the core network.
     #   @return [String]
     #
+    # @!attribute [rw] odb_network_arn
+    #   The Amazon Resource Name (ARN) of the ODB network.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -11771,6 +12415,7 @@ module Aws::EC2
       :local_gateway_id,
       :carrier_gateway_id,
       :core_network_arn,
+      :odb_network_arn,
       :dry_run,
       :route_table_id,
       :destination_cidr_block,
@@ -12225,7 +12870,7 @@ module Aws::EC2
     #   * To create local snapshots in the same Local Zone as the source
     #     instance, specify `local`.
     #
-    #   * To create a regional snapshots in the parent Region of the Local
+    #   * To create regional snapshots in the parent Region of the Local
     #     Zone, specify `regional` or omit this parameter.
     #
     #   Default value: `regional`
@@ -14211,6 +14856,17 @@ module Aws::EC2
     # @!attribute [rw] availability_zone
     #   The ID of the Availability Zone in which to create the volume. For
     #   example, `us-east-1a`.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` must be specified,
+    #   but not both.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone in which to create the volume. For
+    #   example, `use1-az1`.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` must be specified,
+    #   but not both.
     #   @return [String]
     #
     # @!attribute [rw] encrypted
@@ -14239,7 +14895,7 @@ module Aws::EC2
     #
     #   The following are the supported values for each volume type:
     #
-    #   * `gp3`: 3,000 - 16,000 IOPS
+    #   * `gp3`: 3,000 - 80,000 IOPS
     #
     #   * `io1`: 100 - 64,000 IOPS
     #
@@ -14300,7 +14956,9 @@ module Aws::EC2
     #
     #   The following are the supported volumes sizes for each volume type:
     #
-    #   * `gp2` and `gp3`: 1 - 16,384 GiB
+    #   * `gp2`: 1 - 16,384 GiB
+    #
+    #   * `gp3`: 1 - 65,536 GiB
     #
     #   * `io1`: 4 - 16,384 GiB
     #
@@ -14361,12 +15019,12 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] throughput
-    #   The throughput to provision for a volume, with a maximum of 1,000
+    #   The throughput to provision for a volume, with a maximum of 2,000
     #   MiB/s.
     #
     #   This parameter is valid only for `gp3` volumes.
     #
-    #   Valid Range: Minimum value of 125. Maximum value of 1000.
+    #   Valid Range: Minimum value of 125. Maximum value of 2,000.
     #   @return [Integer]
     #
     # @!attribute [rw] client_token
@@ -14432,6 +15090,7 @@ module Aws::EC2
     #
     class CreateVolumeRequest < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :encrypted,
       :iops,
       :kms_key_id,
@@ -15017,6 +15676,12 @@ module Aws::EC2
     #   The tags to apply to the VPN connection.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] pre_shared_key_storage
+    #   Specifies the storage mode for the pre-shared key (PSK). Valid
+    #   values are `Standard`" (stored in the Site-to-Site VPN service) or
+    #   `SecretsManager` (stored in Amazon Web Services Secrets Manager).
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -15036,6 +15701,7 @@ module Aws::EC2
       :vpn_gateway_id,
       :transit_gateway_id,
       :tag_specifications,
+      :pre_shared_key_storage,
       :dry_run,
       :options)
       SENSITIVE = []
@@ -15132,6 +15798,38 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The maximum age for allowed images.
+    #
+    # @!attribute [rw] maximum_days_since_created
+    #   The maximum number of days that have elapsed since the image was
+    #   created. For example, a value of `300` allows images that were
+    #   created within the last 300 days.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreationDateCondition AWS API Documentation
+    #
+    class CreationDateCondition < Struct.new(
+      :maximum_days_since_created)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The maximum age for allowed images.
+    #
+    # @!attribute [rw] maximum_days_since_created
+    #   The maximum number of days that have elapsed since the image was
+    #   created. For example, a value of `300` allows images that were
+    #   created within the last 300 days.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreationDateConditionRequest AWS API Documentation
+    #
+    class CreationDateConditionRequest < Struct.new(
+      :maximum_days_since_created)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the credit option for CPU usage of a T instance.
     #
     # @!attribute [rw] cpu_credits
@@ -15200,11 +15898,13 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] ip_address
-    #   IPv4 address for the customer gateway device's outside interface.
+    #   The IP address for the customer gateway device's outside interface.
     #   The address must be static. If `OutsideIpAddressType` in your VPN
     #   connection options is set to `PrivateIpv4`, you can use an RFC6598
     #   or RFC1918 private IPv4 address. If `OutsideIpAddressType` is set to
-    #   `PublicIpv4`, you can use a public IPv4 address.
+    #   `PublicIpv4`, you can use a public IPv4 address. If
+    #   `OutsideIpAddressType` is set to `Ipv6`, you can use a public IPv6
+    #   address.
     #   @return [String]
     #
     # @!attribute [rw] bgp_asn
@@ -15814,6 +16514,39 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] report_id
+    #   The ID of the report to delete.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteImageUsageReportRequest AWS API Documentation
+    #
+    class DeleteImageUsageReportRequest < Struct.new(
+      :report_id,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] return
+    #   Returns `true` if the request succeeds; otherwise, it returns an
+    #   error.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteImageUsageReportResult AWS API Documentation
+    #
+    class DeleteImageUsageReportResult < Struct.new(
+      :return)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -17149,6 +17882,49 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The snapshot ID and its deletion result code.
+    #
+    # @!attribute [rw] snapshot_id
+    #   The ID of the snapshot.
+    #   @return [String]
+    #
+    # @!attribute [rw] return_code
+    #   The result code from the snapshot deletion attempt. Possible values:
+    #
+    #   * `success` - The snapshot was successfully deleted.
+    #
+    #   * `skipped` - The snapshot was not deleted because it's associated
+    #     with other AMIs.
+    #
+    #   * `missing-permissions` - The snapshot was not deleted because the
+    #     role lacks `DeleteSnapshot` permissions. For more information, see
+    #     [How Amazon EBS works with IAM][1].
+    #
+    #   * `internal-error` - The snapshot was not deleted due to a server
+    #     error.
+    #
+    #   * `client-error` - The snapshot was not deleted due to a client
+    #     configuration error.
+    #
+    #   For details about an error, check the `DeleteSnapshot` event in the
+    #   CloudTrail event history. For more information, see [View event
+    #   history][2] in the *Amazon Web Services CloudTrail User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/security_iam_service-with-iam.html
+    #   [2]: https://docs.aws.amazon.com/awscloudtrail/latest/userguide/tutorial-event-history.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteSnapshotReturnCode AWS API Documentation
+    #
+    class DeleteSnapshotReturnCode < Struct.new(
+      :snapshot_id,
+      :return_code)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Contains the parameters for DeleteSpotDatafeedSubscription.
     #
     # @!attribute [rw] dry_run
@@ -18199,6 +18975,36 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The maximum period since deprecation for allowed images.
+    #
+    # @!attribute [rw] maximum_days_since_deprecated
+    #   The maximum number of days that have elapsed since the image was
+    #   deprecated. When set to `0`, no deprecated images are allowed.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeprecationTimeCondition AWS API Documentation
+    #
+    class DeprecationTimeCondition < Struct.new(
+      :maximum_days_since_deprecated)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The maximum period since deprecation for allowed images.
+    #
+    # @!attribute [rw] maximum_days_since_deprecated
+    #   The maximum number of days that have elapsed since the image was
+    #   deprecated. Set to `0` to exclude all deprecated images.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeprecationTimeConditionRequest AWS API Documentation
+    #
+    class DeprecationTimeConditionRequest < Struct.new(
+      :maximum_days_since_deprecated)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] cidr
     #   The address range, in CIDR notation. The prefix must be the same
     #   prefix that you specified when you provisioned the address range.
@@ -18318,11 +19124,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] cidr
-    #   The CIDR you want to deprovision from the pool. Enter the CIDR you
-    #   want to deprovision with a netmask of `/32`. You must rerun this
-    #   command for each IP address in the CIDR range. If your CIDR is a
-    #   `/24`, you will have to run this command to deprovision each of the
-    #   256 IP addresses in the `/24` CIDR.
+    #   The CIDR you want to deprovision from the pool.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeprovisionPublicIpv4PoolCidrRequest AWS API Documentation
@@ -18358,6 +19160,18 @@ module Aws::EC2
     #   The ID of the AMI.
     #   @return [String]
     #
+    # @!attribute [rw] delete_associated_snapshots
+    #   Specifies whether to delete the snapshots associated with the AMI
+    #   during deregistration.
+    #
+    #   <note markdown="1"> If a snapshot is associated with multiple AMIs, it is not deleted,
+    #   regardless of this setting.
+    #
+    #    </note>
+    #
+    #   Default: The snapshots are not deleted.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -18369,14 +19183,30 @@ module Aws::EC2
     #
     class DeregisterImageRequest < Struct.new(
       :image_id,
+      :delete_associated_snapshots,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
     end
 
+    # @!attribute [rw] return
+    #   Returns `true` if the request succeeds; otherwise, it returns an
+    #   error.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] delete_snapshot_results
+    #   The deletion result for each snapshot associated with the AMI,
+    #   including the snapshot ID and its success or error code.
+    #   @return [Array<Types::DeleteSnapshotReturnCode>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeregisterImageResult AWS API Documentation
     #
-    class DeregisterImageResult < Aws::EmptyStructure; end
+    class DeregisterImageResult < Struct.new(
+      :return,
+      :delete_snapshot_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
@@ -19201,6 +20031,14 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
     #   @return [Integer]
     #
+    # @!attribute [rw] ultraserver_type
+    #   The EC2 UltraServer type of the Capacity Block offerings.
+    #   @return [String]
+    #
+    # @!attribute [rw] ultraserver_count
+    #   The number of EC2 UltraServers in the offerings.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockOfferingsRequest AWS API Documentation
     #
     class DescribeCapacityBlockOfferingsRequest < Struct.new(
@@ -19211,7 +20049,9 @@ module Aws::EC2
       :end_date_range,
       :capacity_duration_hours,
       :next_token,
-      :max_results)
+      :max_results,
+      :ultraserver_type,
+      :ultraserver_count)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -19234,6 +20074,152 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] capacity_block_ids
+    #   The ID of the Capacity Block.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of items to return for this request. To get the
+    #   next page of items, make another request with the token returned in
+    #   the output. For more information, see [Pagination][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
+    #   @return [Integer]
+    #
+    # @!attribute [rw] filters
+    #   One or more filters.
+    #
+    #   * `interconnect-status` - The status of the interconnect for the
+    #     Capacity Block (`ok` \| `impaired` \| `insufficient-data`).
+    #
+    #   ^
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockStatusRequest AWS API Documentation
+    #
+    class DescribeCapacityBlockStatusRequest < Struct.new(
+      :capacity_block_ids,
+      :next_token,
+      :max_results,
+      :filters,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] capacity_block_statuses
+    #   The availability of capacity for a Capacity Block.
+    #   @return [Array<Types::CapacityBlockStatus>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockStatusResult AWS API Documentation
+    #
+    class DescribeCapacityBlockStatusResult < Struct.new(
+      :capacity_block_statuses,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] capacity_block_ids
+    #   The IDs of the Capacity Blocks.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of items to return for this request. To get the
+    #   next page of items, make another request with the token returned in
+    #   the output. For more information, see [Pagination][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
+    #   @return [Integer]
+    #
+    # @!attribute [rw] filters
+    #   One or more filters.
+    #
+    #   * `capacity-block-id` - The ID of the Capacity Block.
+    #
+    #   * `ultraserver-type` - The Capacity Block type. The type can be
+    #     `instances` or `ultraservers`.
+    #
+    #   * `availability-zone` - The Availability Zone of the Capacity Block.
+    #
+    #   * `start-date` - The date and time at which the Capacity Block was
+    #     started.
+    #
+    #   * `end-date` - The date and time at which the Capacity Block
+    #     expires. When a Capacity Block expires, all instances in the
+    #     Capacity Block are terminated.
+    #
+    #   * `create-date` - The date and time at which the Capacity Block was
+    #     created.
+    #
+    #   * `state` - The state of the Capacity Block (`active` \| `expired`
+    #     \| `unavailable` \| `cancelled` \| `failed` \| `scheduled` \|
+    #     `payment-pending` \| `payment-failed`).
+    #
+    #   * `tags` - The tags assigned to the Capacity Block.
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlocksRequest AWS API Documentation
+    #
+    class DescribeCapacityBlocksRequest < Struct.new(
+      :capacity_block_ids,
+      :next_token,
+      :max_results,
+      :filters,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] capacity_blocks
+    #   The Capacity Blocks.
+    #   @return [Array<Types::CapacityBlock>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlocksResult AWS API Documentation
+    #
+    class DescribeCapacityBlocksResult < Struct.new(
+      :capacity_blocks,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] capacity_reservation_ids
     #   The ID of the Capacity Reservation.
     #   @return [Array<String>]
@@ -21699,8 +22685,8 @@ module Aws::EC2
     #
     #   **Note**: The `blockDeviceMapping` attribute is deprecated. Using
     #   this attribute returns the `Client.AuthFailure` error. To get
-    #   information about the block device mappings for an AMI, use the
-    #   DescribeImages action.
+    #   information about the block device mappings for an AMI, describe the
+    #   image instead.
     #   @return [String]
     #
     # @!attribute [rw] image_id
@@ -21724,6 +22710,244 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] image_ids
+    #   The IDs of the images to check for resource references.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] include_all_resource_types
+    #   Specifies whether to check all supported Amazon Web Services
+    #   resource types for image references. When specified, default values
+    #   are applied for `ResourceTypeOptions`. For the default values, see
+    #   [How AMI reference checks work][1] in the *Amazon EC2 User Guide*.
+    #   If you also specify `ResourceTypes` with `ResourceTypeOptions`, your
+    #   specified values override the default values.
+    #
+    #   Supported resource types: `ec2:Instance` \| `ec2:LaunchTemplate` \|
+    #   `ssm:Parameter` \| `imagebuilder:ImageRecipe` \|
+    #   `imagebuilder:ContainerRecipe`
+    #
+    #   Either `IncludeAllResourceTypes` or `ResourceTypes` must be
+    #   specified.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-ami-references.html#how-ami-references-works
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] resource_types
+    #   The Amazon Web Services resource types to check for image
+    #   references.
+    #
+    #   Either `IncludeAllResourceTypes` or `ResourceTypes` must be
+    #   specified.
+    #   @return [Array<Types::ResourceTypeRequest>]
+    #
+    # @!attribute [rw] next_token
+    #   The token returned from a previous paginated request. Pagination
+    #   continues from the end of the items returned by the previous
+    #   request.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of items to return for this request. To get the
+    #   next page of items, make another request with the token returned in
+    #   the output. For more information, see [Pagination][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageReferencesRequest AWS API Documentation
+    #
+    class DescribeImageReferencesRequest < Struct.new(
+      :image_ids,
+      :include_all_resource_types,
+      :resource_types,
+      :next_token,
+      :dry_run,
+      :max_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   The token to include in another request to get the next page of
+    #   items. This value is `null` when there are no more items to return.
+    #   @return [String]
+    #
+    # @!attribute [rw] image_references
+    #   The resources that are referencing the specified images.
+    #   @return [Array<Types::ImageReference>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageReferencesResult AWS API Documentation
+    #
+    class DescribeImageReferencesResult < Struct.new(
+      :next_token,
+      :image_references)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] image_ids
+    #   The IDs of the images for filtering the report entries. If
+    #   specified, only report entries containing these images are returned.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] report_ids
+    #   The IDs of the usage reports.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   The token returned from a previous paginated request. Pagination
+    #   continues from the end of the items returned by the previous
+    #   request.
+    #   @return [String]
+    #
+    # @!attribute [rw] filters
+    #   The filters.
+    #
+    #   * `account-id` - A 12-digit Amazon Web Services account ID.
+    #
+    #   * `creation-time` - The time when the report was created, in the ISO
+    #     8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for
+    #     example, `2025-11-29T11:04:43.305Z`. You can use a wildcard (`*`),
+    #     for example, `2025-11-29T*`, which matches an entire day.
+    #
+    #   * `resource-type` - The resource type (`ec2:Instance` \|
+    #     `ec2:LaunchTemplate`).
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of items to return for this request. To get the
+    #   next page of items, make another request with the token returned in
+    #   the output. For more information, see [Pagination][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageUsageReportEntriesRequest AWS API Documentation
+    #
+    class DescribeImageUsageReportEntriesRequest < Struct.new(
+      :image_ids,
+      :report_ids,
+      :next_token,
+      :filters,
+      :dry_run,
+      :max_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   The token to include in another request to get the next page of
+    #   items. This value is `null` when there are no more items to return.
+    #   @return [String]
+    #
+    # @!attribute [rw] image_usage_report_entries
+    #   The content of the usage reports.
+    #   @return [Array<Types::ImageUsageReportEntry>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageUsageReportEntriesResult AWS API Documentation
+    #
+    class DescribeImageUsageReportEntriesResult < Struct.new(
+      :next_token,
+      :image_usage_report_entries)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] image_ids
+    #   The IDs of the images for filtering the reports. If specified, only
+    #   reports containing these images are returned.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] report_ids
+    #   The IDs of the image usage reports.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   The token returned from a previous paginated request. Pagination
+    #   continues from the end of the items returned by the previous
+    #   request.
+    #   @return [String]
+    #
+    # @!attribute [rw] filters
+    #   The filters.
+    #
+    #   * `creation-time` - The time when the report was created, in the ISO
+    #     8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for
+    #     example, `2025-11-29T11:04:43.305Z`. You can use a wildcard (`*`),
+    #     for example, `2025-11-29T*`, which matches an entire day.
+    #
+    #   * `state` - The state of the report (`available` \| `pending` \|
+    #     `error`).
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of items to return for this request. To get the
+    #   next page of items, make another request with the token returned in
+    #   the output. For more information, see [Pagination][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageUsageReportsRequest AWS API Documentation
+    #
+    class DescribeImageUsageReportsRequest < Struct.new(
+      :image_ids,
+      :report_ids,
+      :next_token,
+      :filters,
+      :dry_run,
+      :max_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   The token to include in another request to get the next page of
+    #   items. This value is `null` when there are no more items to return.
+    #   @return [String]
+    #
+    # @!attribute [rw] image_usage_reports
+    #   The image usage reports.
+    #   @return [Array<Types::ImageUsageReport>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageUsageReportsResult AWS API Documentation
+    #
+    class DescribeImageUsageReportsResult < Struct.new(
+      :next_token,
+      :image_usage_reports)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] executable_users
     #   Scopes the images by users with explicit launch permissions. Specify
     #   an Amazon Web Services account ID, `self` (the sender of the
@@ -21834,6 +23058,10 @@ module Aws::EC2
     #   * `ena-support` - A Boolean that indicates whether enhanced
     #     networking with ENA is enabled.
     #
+    #   * `free-tier-eligible` - A Boolean that indicates whether this image
+    #     can be used under the Amazon Web Services Free Tier (`true` \|
+    #     `false`).
+    #
     #   * `hypervisor` - The hypervisor type (`ovm` \| `xen`).
     #
     #   * `image-allowed` - A Boolean that indicates whether the image meets
@@ -22516,6 +23744,9 @@ module Aws::EC2
     #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone of the
+    #     instance.
+    #
     #   * `event.code` - The code for the scheduled event (`instance-reboot`
     #     \| `system-reboot` \| `system-maintenance` \|
     #     `instance-retirement` \| `instance-stop`).
@@ -22816,6 +24047,12 @@ module Aws::EC2
     #   * `dedicated-hosts-supported` - Indicates whether the instance type
     #     supports Dedicated Hosts. (`true` \| `false`)
     #
+    #   * `ebs-info.attachment-limit-type` - The type of Amazon EBS volume
+    #     attachment limit (`shared` \| `dedicated`).
+    #
+    #   * `ebs-info.maximum-ebs-attachments` - The maximum number of Amazon
+    #     EBS volumes that can be attached to the instance type.
+    #
     #   * `ebs-info.ebs-optimized-info.baseline-bandwidth-in-mbps` - The
     #     baseline bandwidth performance for an EBS-optimized instance type,
     #     in Mbps.
@@ -22850,8 +24087,9 @@ module Aws::EC2
     #     express (NVMe) is supported for EBS volumes (`required` \|
     #     `supported` \| `unsupported`).
     #
-    #   * `free-tier-eligible` - Indicates whether the instance type is
-    #     eligible to use in the free tier (`true` \| `false`).
+    #   * `free-tier-eligible` - A Boolean that indicates whether this
+    #     instance type can be used under the Amazon Web Services Free Tier
+    #     (`true` \| `false`).
     #
     #   * `hibernation-supported` - Indicates whether On-Demand hibernation
     #     is supported (`true` \| `false`).
@@ -22943,6 +24181,9 @@ module Aws::EC2
     #   * `processor-info.supported-features` - The supported CPU features
     #     (`amd-sev-snp`).
     #
+    #   * `reboot-migration-support` - Indicates whether enabling reboot
+    #     migration is supported (`supported` \| `unsupported`).
+    #
     #   * `supported-boot-mode` - The boot mode (`legacy-bios` \| `uefi`).
     #
     #   * `supported-root-device-type` - The root device type (`ebs` \|
@@ -23041,6 +24282,9 @@ module Aws::EC2
     #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone of the
+    #     instance.
+    #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
     #     volume mapped to the instance, for example,
     #     `2022-09-15T17:15:20.000Z`.
@@ -23374,15 +24618,16 @@ module Aws::EC2
     #
     #   * `platform-details` - The platform (`Linux/UNIX` \| `Red Hat BYOL
     #     Linux` \| ` Red Hat Enterprise Linux` \| `Red Hat Enterprise Linux
-    #     with HA` \| `Red Hat Enterprise Linux with SQL Server Standard and
-    #     HA` \| `Red Hat Enterprise Linux with SQL Server Enterprise and
-    #     HA` \| `Red Hat Enterprise Linux with SQL Server Standard` \| `Red
-    #     Hat Enterprise Linux with SQL Server Web` \| `Red Hat Enterprise
-    #     Linux with SQL Server Enterprise` \| `SQL Server Enterprise` \|
-    #     `SQL Server Standard` \| `SQL Server Web` \| `SUSE Linux` \|
-    #     `Ubuntu Pro` \| `Windows` \| `Windows BYOL` \| `Windows with SQL
-    #     Server Enterprise` \| `Windows with SQL Server Standard` \|
-    #     `Windows with SQL Server Web`).
+    #     with HA` \| `Red Hat Enterprise Linux with High Availability` \|
+    #     `Red Hat Enterprise Linux with SQL Server Standard and HA` \| `Red
+    #     Hat Enterprise Linux with SQL Server Enterprise and HA` \| `Red
+    #     Hat Enterprise Linux with SQL Server Standard` \| `Red Hat
+    #     Enterprise Linux with SQL Server Web` \| `Red Hat Enterprise Linux
+    #     with SQL Server Enterprise` \| `SQL Server Enterprise` \| `SQL
+    #     Server Standard` \| `SQL Server Web` \| `SUSE Linux` \| `Ubuntu
+    #     Pro` \| `Windows` \| `Windows BYOL` \| `Windows with SQL Server
+    #     Enterprise` \| `Windows with SQL Server Standard` \| `Windows with
+    #     SQL Server Web`).
     #
     #   * `private-dns-name` - The private IPv4 DNS name of the instance.
     #
@@ -24925,6 +26170,77 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] filters
+    #   Specifies one or more filters for the request:
+    #
+    #   * `instance-id` - The ID of the instance for which the task was
+    #     created.
+    #
+    #   * `task-state` - The state of the task (`successful` \| `failed` \|
+    #     `in-progress` \| `pending`).
+    #
+    #   * `mac-system-integrity-protection-configuration.sip-status` - The
+    #     overall SIP state requested in the task (`enabled` \| `disabled`).
+    #
+    #   * `start-time` - The date and time the task was created.
+    #
+    #   * `task-type` - The type of task (`sip-modification` \|
+    #     `volume-ownership-delegation`).
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] mac_modification_task_ids
+    #   The ID of task.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return for the request in a single
+    #   page. The remaining results can be seen by sending another request
+    #   with the returned `nextToken` value. This value can be between 5 and
+    #   500. If `maxResults` is given a larger value than 500, you receive
+    #   an error.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeMacModificationTasksRequest AWS API Documentation
+    #
+    class DescribeMacModificationTasksRequest < Struct.new(
+      :dry_run,
+      :filters,
+      :mac_modification_task_ids,
+      :max_results,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] mac_modification_tasks
+    #   Information about the tasks.
+    #   @return [Array<Types::MacModificationTask>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeMacModificationTasksResult AWS API Documentation
+    #
+    class DescribeMacModificationTasksResult < Struct.new(
+      :mac_modification_tasks,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -25777,7 +27093,7 @@ module Aws::EC2
     #   * `interface-type` - The type of network interface
     #     (`api_gateway_managed` \| `aws_codestar_connections_managed` \|
     #     `branch` \| `ec2_instance_connect_endpoint` \| `efa` \| `efa-only`
-    #     \| `efs` \| `gateway_load_balancer` \|
+    #     \| `efs` \| `evs` \| `gateway_load_balancer` \|
     #     `gateway_load_balancer_endpoint` \| `global_accelerator_managed`
     #     \| `interface` \| `iot_rules_managed` \| `lambda` \|
     #     `load_balancer` \| `nat_gateway` \| `network_load_balancer` \|
@@ -26394,6 +27710,9 @@ module Aws::EC2
     #   * `modification-result.target-configuration.availability-zone` - The
     #     Availability Zone for the new Reserved Instances.
     #
+    #   * `modification-result.target-configuration.availability-zone-id` -
+    #     The ID of the Availability Zone for the new Reserved Instances.
+    #
     #   * `modification-result.target-configuration.instance-count ` - The
     #     number of new Reserved Instances.
     #
@@ -26449,6 +27768,9 @@ module Aws::EC2
     #
     # @!attribute [rw] availability_zone
     #   The Availability Zone in which the Reserved Instance can be used.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both.
     #   @return [String]
     #
     # @!attribute [rw] include_marketplace
@@ -26501,6 +27823,13 @@ module Aws::EC2
     #   One or more Reserved Instances offering IDs.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -26514,6 +27843,9 @@ module Aws::EC2
     #   * `availability-zone` - The Availability Zone where the Reserved
     #     Instance can be used.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone where the
+    #     Reserved Instance can be used.
+    #
     #   * `duration` - The duration of the Reserved Instance (for example,
     #     one year or three years), in seconds (`31536000` \| `94608000`).
     #
@@ -26588,6 +27920,7 @@ module Aws::EC2
       :offering_class,
       :product_description,
       :reserved_instances_offering_ids,
+      :availability_zone_id,
       :dry_run,
       :filters,
       :instance_tenancy,
@@ -26644,6 +27977,9 @@ module Aws::EC2
     #   * `availability-zone` - The Availability Zone where the Reserved
     #     Instance can be used.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone where the
+    #     Reserved Instance can be used.
+    #
     #   * `duration` - The duration of the Reserved Instance (one year or
     #     three years), in seconds (`31536000` \| `94608000`).
     #
@@ -27282,6 +28618,8 @@ module Aws::EC2
     #
     #   * `group-id`: The security group ID.
     #
+    #   * `group-owner-id`: The group owner ID.
+    #
     #   * `vpc-id`: The ID of the associated VPC.
     #
     #   * `vpc-owner-id`: The account ID of the VPC owner.
@@ -28150,6 +29488,9 @@ module Aws::EC2
     #   * `launched-availability-zone` - The Availability Zone in which the
     #     request is launched.
     #
+    #   * `launched-availability-zone-id` - The ID of the Availability Zone
+    #     in which the request is launched.
+    #
     #   * `network-interface.addresses.primary` - Indicates whether the IP
     #     address is the primary private IP address.
     #
@@ -28250,6 +29591,13 @@ module Aws::EC2
 
     # Contains the parameters for DescribeSpotPriceHistory.
     #
+    # @!attribute [rw] availability_zone_id
+    #   Filters the results by the specified ID of the Availability Zone.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -28283,6 +29631,9 @@ module Aws::EC2
     #   * `availability-zone` - The Availability Zone for which prices
     #     should be returned.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone for which
+    #     prices should be returned.
+    #
     #   * `instance-type` - The type of instance (for example, `m3.medium`).
     #
     #   * `product-description` - The product description for the Spot price
@@ -28303,6 +29654,9 @@ module Aws::EC2
     #
     # @!attribute [rw] availability_zone
     #   Filters the results by the specified Availability Zone.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
     #   @return [String]
     #
     # @!attribute [rw] max_results
@@ -28324,6 +29678,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeSpotPriceHistoryRequest AWS API Documentation
     #
     class DescribeSpotPriceHistoryRequest < Struct.new(
+      :availability_zone_id,
       :dry_run,
       :start_time,
       :end_time,
@@ -30316,6 +31671,9 @@ module Aws::EC2
     #   * `availability-zone` - The Availability Zone in which the volume
     #     was created.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone in which
+    #     the volume was created.
+    #
     #   * `create-time` - The time stamp when the volume was created.
     #
     #   * `encrypted` - Indicates whether the volume is encrypted (`true` \|
@@ -30702,9 +32060,6 @@ module Aws::EC2
     #
     #   * `resource-configuration-group-arn` - The Amazon Resource Name
     #     (ARN) of the resource configuration of type GROUP.
-    #
-    #   * `service-network-resource-association-id` - The ID of the
-    #     association.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -33652,7 +35007,7 @@ module Aws::EC2
     #
     #   The following are the supported values for each volume type:
     #
-    #   * `gp3`: 3,000 - 16,000 IOPS
+    #   * `gp3`: 3,000 - 80,000 IOPS
     #
     #   * `io1`: 100 - 64,000 IOPS
     #
@@ -33682,7 +35037,9 @@ module Aws::EC2
     #
     #   The following are the supported sizes for each volume type:
     #
-    #   * `gp2` and `gp3`: 1 - 16,384 GiB
+    #   * `gp2`: 1 - 16,384 GiB
+    #
+    #   * `gp3`: 1 - 65,536 GiB
     #
     #   * `io1`: 4 - 16,384 GiB
     #
@@ -33722,7 +35079,7 @@ module Aws::EC2
     #
     #   This parameter is valid only for `gp3` volumes.
     #
-    #   Valid Range: Minimum value of 125. Maximum value of 1000.
+    #   Valid Range: Minimum value of 125. Maximum value of 2,000.
     #   @return [Integer]
     #
     # @!attribute [rw] outpost_arn
@@ -33735,6 +35092,28 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone
+    #   The Availability Zone where the EBS volume will be created (for
+    #   example, `us-east-1a`).
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both. If neither is specified, Amazon EC2 automatically
+    #   selects an Availability Zone within the Region.
+    #
+    #   This parameter is not supported when using [CreateFleet][1],
+    #   [CreateImage][2], [DescribeImages][3], [RequestSpotFleet][4],
+    #   [RequestSpotInstances][5], and [RunInstances][6].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
+    #   [3]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html
+    #   [4]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html
+    #   [5]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html
+    #   [6]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
+    #   @return [String]
+    #
     # @!attribute [rw] encrypted
     #   Indicates whether the encryption state of an EBS volume is changed
     #   while being restored from a backing snapshot. The effect of setting
@@ -33821,6 +35200,28 @@ module Aws::EC2
     #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
     #   @return [Integer]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone where the EBS volume will be created
+    #   (for example, `use1-az1`).
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both. If neither is specified, Amazon EC2 automatically
+    #   selects an Availability Zone within the Region.
+    #
+    #   This parameter is not supported when using [CreateFleet][1],
+    #   [CreateImage][2], [DescribeImages][3], [RequestSpotFleet][4],
+    #   [RequestSpotInstances][5], and [RunInstances][6].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
+    #   [3]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html
+    #   [4]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html
+    #   [5]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html
+    #   [6]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EbsBlockDevice AWS API Documentation
     #
     class EbsBlockDevice < Struct.new(
@@ -33832,8 +35233,10 @@ module Aws::EC2
       :kms_key_id,
       :throughput,
       :outpost_arn,
+      :availability_zone,
       :encrypted,
-      :volume_initialization_rate)
+      :volume_initialization_rate,
+      :availability_zone_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -33921,13 +35324,37 @@ module Aws::EC2
     #   Indicates whether non-volatile memory express (NVMe) is supported.
     #   @return [String]
     #
+    # @!attribute [rw] maximum_ebs_attachments
+    #   Indicates the maximum number of Amazon EBS volumes that can be
+    #   attached to the instance type. For more information, see [Amazon EBS
+    #   volume limits for Amazon EC2 instances][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/volume_limits.html
+    #   @return [Integer]
+    #
+    # @!attribute [rw] attachment_limit_type
+    #   Indicates whether the instance type features a shared or dedicated
+    #   Amazon EBS volume attachment limit. For more information, see
+    #   [Amazon EBS volume limits for Amazon EC2 instances][1] in the
+    #   *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/volume_limits.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EbsInfo AWS API Documentation
     #
     class EbsInfo < Struct.new(
       :ebs_optimized_support,
       :encryption_support,
       :ebs_optimized_info,
-      :nvme_support)
+      :nvme_support,
+      :maximum_ebs_attachments,
+      :attachment_limit_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -33952,15 +35379,15 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] associated_resource
-    #   The ARN of the Amazon ECS or Fargate task to which the volume is
-    #   attached.
+    #   The ARN of the Amazon Web Services-managed resource to which the
+    #   volume is attached.
     #   @return [String]
     #
     # @!attribute [rw] volume_owner_id
     #   The ID of the Amazon Web Services account that owns the volume.
     #
     #   This parameter is returned only for volumes that are attached to
-    #   Fargate tasks.
+    #   Amazon Web Services-managed resources.
     #   @return [String]
     #
     # @!attribute [rw] operator
@@ -34118,6 +35545,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] fips_dns_name
+    #   The Federal Information Processing Standards (FIPS) compliant DNS
+    #   name of the EC2 Instance Connect Endpoint.
     #   @return [String]
     #
     # @!attribute [rw] network_interface_ids
@@ -34168,6 +35597,14 @@ module Aws::EC2
     #   The tags assigned to the EC2 Instance Connect Endpoint.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] ip_address_type
+    #   The IP address type of the endpoint.
+    #   @return [String]
+    #
+    # @!attribute [rw] public_dns_names
+    #   The public DNS names of the endpoint.
+    #   @return [Types::InstanceConnectEndpointPublicDnsNames]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ec2InstanceConnectEndpoint AWS API Documentation
     #
     class Ec2InstanceConnectEndpoint < Struct.new(
@@ -34185,7 +35622,9 @@ module Aws::EC2
       :subnet_id,
       :preserve_client_ip,
       :security_group_ids,
-      :tags)
+      :tags,
+      :ip_address_type,
+      :public_dns_names)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -35641,6 +37080,10 @@ module Aws::EC2
     #   The Availability Zones.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] availability_zone_ids
+    #   The IDs of the Availability Zones.
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] cidrs
     #   The CIDR ranges.
     #   @return [Array<String>]
@@ -35842,6 +37285,7 @@ module Aws::EC2
       :addresses,
       :attached_to,
       :availability_zones,
+      :availability_zone_ids,
       :cidrs,
       :component,
       :customer_gateway,
@@ -36897,12 +38341,17 @@ module Aws::EC2
     # Describes an EC2 Fleet.
     #
     # @!attribute [rw] activity_status
-    #   The progress of the EC2 Fleet. If there is an error, the status is
-    #   `error`. After all requests are placed, the status is
-    #   `pending_fulfillment`. If the size of the EC2 Fleet is equal to or
-    #   greater than its target capacity, the status is `fulfilled`. If the
-    #   size of the EC2 Fleet is decreased, the status is
-    #   `pending_termination` while instances are terminating.
+    #   The progress of the EC2 Fleet.
+    #
+    #   For fleets of type `instant`, the status is `fulfilled` after all
+    #   requests are placed, regardless of whether target capacity is met
+    #   (this is the only possible status for `instant` fleets).
+    #
+    #   For fleets of type `request` or `maintain`, the status is
+    #   `pending_fulfillment` after all requests are placed, `fulfilled`
+    #   when the fleet size meets or exceeds target capacity,
+    #   `pending_termination` while instances are terminating when fleet
+    #   size is decreased, and `error` if there's an error.
     #   @return [String]
     #
     # @!attribute [rw] create_time
@@ -37125,7 +38574,7 @@ module Aws::EC2
     #
     #   The following are the supported values for each volume type:
     #
-    #   * `gp3`: 3,000 - 16,000 IOPS
+    #   * `gp3`: 3,000 - 80,000 IOPS
     #
     #   * `io1`: 100 - 64,000 IOPS
     #
@@ -37148,7 +38597,7 @@ module Aws::EC2
     #
     #   This parameter is valid only for `gp3` volumes.
     #
-    #   Valid Range: Minimum value of 125. Maximum value of 1000.
+    #   Valid Range: Minimum value of 125. Maximum value of 2,000.
     #   @return [Integer]
     #
     # @!attribute [rw] kms_key_id
@@ -37178,7 +38627,9 @@ module Aws::EC2
     #
     #   The following are the supported sizes for each volume type:
     #
-    #   * `gp2` and `gp3`: 1 - 16,384 GiB
+    #   * `gp2`: 1 - 16,384 GiB
+    #
+    #   * `gp3`: 1 - 65,536 GiB
     #
     #   * `io1`: 4 - 16,384 GiB
     #
@@ -38130,6 +39581,44 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] vpn_connection_id
+    #   The ID of the VPN connection for which to retrieve the active tunnel
+    #   status.
+    #   @return [String]
+    #
+    # @!attribute [rw] vpn_tunnel_outside_ip_address
+    #   The external IP address of the VPN tunnel for which to retrieve the
+    #   active status.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetActiveVpnTunnelStatusRequest AWS API Documentation
+    #
+    class GetActiveVpnTunnelStatusRequest < Struct.new(
+      :vpn_connection_id,
+      :vpn_tunnel_outside_ip_address,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] active_vpn_tunnel_status
+    #   Information about the current security configuration of the VPN
+    #   tunnel.
+    #   @return [Types::ActiveVpnTunnelStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetActiveVpnTunnelStatusResult AWS API Documentation
+    #
+    class GetActiveVpnTunnelStatusResult < Struct.new(
+      :active_vpn_tunnel_status)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -39118,6 +40607,10 @@ module Aws::EC2
     #   request.
     #   @return [String]
     #
+    # @!attribute [rw] context
+    #   Reserved.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetInstanceTypesFromInstanceRequirementsRequest AWS API Documentation
     #
     class GetInstanceTypesFromInstanceRequirementsRequest < Struct.new(
@@ -39126,7 +40619,8 @@ module Aws::EC2
       :virtualization_types,
       :instance_requirements,
       :max_results,
-      :next_token)
+      :next_token,
+      :context)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -41068,6 +42562,12 @@ module Aws::EC2
     #   versions: `ikev1` or `ikev2`.
     #   @return [String]
     #
+    # @!attribute [rw] sample_type
+    #   The type of sample configuration to generate. Valid values are
+    #   "compatibility" (includes IKEv1) or "recommended" (throws
+    #   UnsupportedOperationException for IKEv1).
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -41081,6 +42581,7 @@ module Aws::EC2
       :vpn_connection_id,
       :vpn_connection_device_type_id,
       :internet_key_exchange_version,
+      :sample_type,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
@@ -41978,8 +43479,9 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] boot_mode
-    #   The boot mode of the image. For more information, see [Boot
-    #   modes][1] in the *Amazon EC2 User Guide*.
+    #   The boot mode of the image. For more information, see [Instance
+    #   launch behavior with Amazon EC2 boot modes][1] in the *Amazon EC2
+    #   User Guide*.
     #
     #
     #
@@ -42062,33 +43564,21 @@ module Aws::EC2
     #
     # @!attribute [rw] source_image_id
     #   The ID of the source AMI from which the AMI was created.
-    #
-    #   The ID only appears if the AMI was created using CreateImage,
-    #   CopyImage, or CreateRestoreImageTask. The ID does not appear if the
-    #   AMI was created using any other API. For some older AMIs, the ID
-    #   might not be available. For more information, see [Identify the
-    #   source AMI used to create a new AMI][1] in the *Amazon EC2 User
-    #   Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify-source-ami-used-to-create-new-ami.html
     #   @return [String]
     #
     # @!attribute [rw] source_image_region
     #   The Region of the source AMI.
+    #   @return [String]
     #
-    #   The Region only appears if the AMI was created using CreateImage,
-    #   CopyImage, or CreateRestoreImageTask. The Region does not appear if
-    #   the AMI was created using any other API. For some older AMIs, the
-    #   Region might not be available. For more information, see [Identify
-    #   the source AMI used to create a new AMI][1] in the *Amazon EC2 User
-    #   Guide*.
-    #
+    # @!attribute [rw] free_tier_eligible
+    #   Indicates whether the image is eligible for Amazon Web Services Free
+    #   Tier.
     #
+    #   * If `true`, the AMI is eligible for Free Tier and can be used to
+    #     launch instances under the Free Tier limits.
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify-source-ami-used-to-create-new-ami.html
-    #   @return [String]
+    #   * If `false`, the AMI is not eligible for Free Tier.
+    #   @return [Boolean]
     #
     # @!attribute [rw] image_id
     #   The ID of the AMI.
@@ -42171,6 +43661,7 @@ module Aws::EC2
       :image_allowed,
       :source_image_id,
       :source_image_region,
+      :free_tier_eligible,
       :image_id,
       :image_location,
       :state,
@@ -42220,7 +43711,8 @@ module Aws::EC2
     #   retrieve the UEFI data, use the [GetInstanceUefiData][1] command.
     #   You can inspect and modify the UEFI data by using the
     #   [python-uefivars tool][2] on GitHub. For more information, see [UEFI
-    #   Secure Boot][3] in the *Amazon EC2 User Guide*.
+    #   Secure Boot for Amazon EC2 instances][3] in the *Amazon EC2 User
+    #   Guide*.
     #
     #
     #
@@ -42299,87 +43791,181 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # The list of criteria that are evaluated to determine whch AMIs are
-    # discoverable and usable in the account in the specified Amazon Web
-    # Services Region. Currently, the only criteria that can be specified
-    # are AMI providers.
+    # The criteria that are evaluated to determine which AMIs are
+    # discoverable and usable in your account for the specified Amazon Web
+    # Services Region.
     #
-    # Up to 10 `imageCriteria` objects can be specified, and up to a total
-    # of 200 values for all `imageProviders`. For more information, see
-    # [JSON configuration for the Allowed AMIs criteria][1] in the *Amazon
+    # For more information, see [How Allowed AMIs works][1] in the *Amazon
     # EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#allowed-amis-json-configuration
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#how-allowed-amis-works
     #
     # @!attribute [rw] image_providers
-    #   A list of AMI providers whose AMIs are discoverable and useable in
-    #   the account. Up to a total of 200 values can be specified.
+    #   The image providers whose images are allowed.
     #
     #   Possible values:
     #
-    #   `amazon`: Allow AMIs created by Amazon Web Services.
+    #   * `amazon`: Allow AMIs created by Amazon or verified providers.
+    #
+    #   * `aws-marketplace`: Allow AMIs created by verified providers in the
+    #     Amazon Web Services Marketplace.
+    #
+    #   * `aws-backup-vault`: Allow AMIs created by Amazon Web Services
+    #     Backup.
+    #
+    #   * 12-digit account ID: Allow AMIs created by this account. One or
+    #     more account IDs can be specified.
     #
-    #   `aws-marketplace`: Allow AMIs created by verified providers in the
-    #   Amazon Web Services Marketplace.
+    #   * `none`: Allow AMIs created by your own account only.
     #
-    #   `aws-backup-vault`: Allow AMIs created by Amazon Web Services
-    #   Backup.
+    #   Maximum: 200 values
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] marketplace_product_codes
+    #   The Amazon Web Services Marketplace product codes for allowed
+    #   images.
     #
-    #   12-digit account ID: Allow AMIs created by this account. One or more
-    #   account IDs can be specified.
+    #   Length: 1-25 characters
     #
-    #   `none`: Allow AMIs created by your own account only.
+    #   Valid characters: Letters (`A–Z, a–z`) and numbers (`0–9`)
+    #
+    #   Maximum: 50 values
     #   @return [Array<String>]
     #
+    # @!attribute [rw] image_names
+    #   The names of allowed images. Names can include wildcards (`?` and
+    #   `*`).
+    #
+    #   Length: 1–128 characters. With `?`, the minimum is 3 characters.
+    #
+    #   Valid characters:
+    #
+    #   * Letters: `A–Z, a–z`
+    #
+    #   * Numbers: `0–9`
+    #
+    #   * Special characters: `( ) [ ] . / - ' @ _ * ?`
+    #
+    #   * Spaces
+    #
+    #   Maximum: 50 values
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] deprecation_time_condition
+    #   The maximum period since deprecation for allowed images.
+    #   @return [Types::DeprecationTimeCondition]
+    #
+    # @!attribute [rw] creation_date_condition
+    #   The maximum age for allowed images.
+    #   @return [Types::CreationDateCondition]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageCriterion AWS API Documentation
     #
     class ImageCriterion < Struct.new(
-      :image_providers)
+      :image_providers,
+      :marketplace_product_codes,
+      :image_names,
+      :deprecation_time_condition,
+      :creation_date_condition)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # The list of criteria that are evaluated to determine whch AMIs are
-    # discoverable and usable in the account in the specified Amazon Web
-    # Services Region. Currently, the only criteria that can be specified
-    # are AMI providers.
+    # The criteria that are evaluated to determine which AMIs are
+    # discoverable and usable in your account for the specified Amazon Web
+    # Services Region.
+    #
+    # The `ImageCriteria` can include up to:
+    #
+    # * 10 `ImageCriterion`
+    #
+    # ^
+    #
+    # Each `ImageCriterion` can include up to:
+    #
+    # * 200 values for `ImageProviders`
+    #
+    # * 50 values for `ImageNames`
     #
-    # Up to 10 `imageCriteria` objects can be specified, and up to a total
-    # of 200 values for all `imageProviders`. For more information, see
-    # [JSON configuration for the Allowed AMIs criteria][1] in the *Amazon
+    # * 50 values for `MarketplaceProductCodes`
+    #
+    # For more information, see [How Allowed AMIs works][1] in the *Amazon
     # EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#allowed-amis-json-configuration
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#how-allowed-amis-works
     #
     # @!attribute [rw] image_providers
-    #   A list of image providers whose AMIs are discoverable and useable in
-    #   the account. Up to a total of 200 values can be specified.
+    #   The image providers whose images are allowed.
     #
     #   Possible values:
     #
-    #   `amazon`: Allow AMIs created by Amazon Web Services.
+    #   * `amazon`: Allow AMIs created by Amazon or verified providers.
+    #
+    #   * `aws-marketplace`: Allow AMIs created by verified providers in the
+    #     Amazon Web Services Marketplace.
+    #
+    #   * `aws-backup-vault`: Allow AMIs created by Amazon Web Services
+    #     Backup.
+    #
+    #   * 12-digit account ID: Allow AMIs created by the specified accounts.
+    #     One or more account IDs can be specified.
+    #
+    #   * `none`: Allow AMIs created by your own account only. When `none`
+    #     is specified, no other values can be specified.
+    #
+    #   Maximum: 200 values
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] marketplace_product_codes
+    #   The Amazon Web Services Marketplace product codes for allowed
+    #   images.
+    #
+    #   Length: 1-25 characters
+    #
+    #   Valid characters: Letters (`A–Z, a–z`) and numbers (`0–9`)
+    #
+    #   Maximum: 50 values
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] image_names
+    #   The names of allowed images. Names can include wildcards (`?` and
+    #   `*`).
+    #
+    #   Length: 1–128 characters. With `?`, the minimum is 3 characters.
+    #
+    #   Valid characters:
+    #
+    #   * Letters: `A–Z, a–z`
     #
-    #   `aws-marketplace`: Allow AMIs created by verified providers in the
-    #   Amazon Web Services Marketplace.
+    #   * Numbers: `0–9`
     #
-    #   `aws-backup-vault`: Allow AMIs created by Amazon Web Services
-    #   Backup.
+    #   * Special characters: `( ) [ ] . / - ' @ _ * ?`
     #
-    #   12-digit account ID: Allow AMIs created by this account. One or more
-    #   account IDs can be specified.
+    #   * Spaces
     #
-    #   `none`: Allow AMIs created by your own account only. When `none` is
-    #   specified, no other values can be specified.
+    #   Maximum: 50 values
     #   @return [Array<String>]
     #
+    # @!attribute [rw] deprecation_time_condition
+    #   The maximum period since deprecation for allowed images.
+    #   @return [Types::DeprecationTimeConditionRequest]
+    #
+    # @!attribute [rw] creation_date_condition
+    #   The maximum age for allowed images.
+    #   @return [Types::CreationDateConditionRequest]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageCriterionRequest AWS API Documentation
     #
     class ImageCriterionRequest < Struct.new(
-      :image_providers)
+      :image_providers,
+      :marketplace_product_codes,
+      :image_names,
+      :deprecation_time_condition,
+      :creation_date_condition)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -42531,6 +44117,226 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # A resource that is referencing an image.
+    #
+    # @!attribute [rw] image_id
+    #   The ID of the referenced image.
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_type
+    #   The type of resource referencing the image.
+    #   @return [String]
+    #
+    # @!attribute [rw] arn
+    #   The Amazon Resource Name (ARN) of the resource referencing the
+    #   image.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageReference AWS API Documentation
+    #
+    class ImageReference < Struct.new(
+      :image_id,
+      :resource_type,
+      :arn)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The configuration and status of an image usage report.
+    #
+    # @!attribute [rw] image_id
+    #   The ID of the image that was specified when the report was created.
+    #   @return [String]
+    #
+    # @!attribute [rw] report_id
+    #   The ID of the report.
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_types
+    #   The resource types that were specified when the report was created.
+    #   @return [Array<Types::ImageUsageResourceType>]
+    #
+    # @!attribute [rw] account_ids
+    #   The IDs of the Amazon Web Services accounts that were specified when
+    #   the report was created.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] state
+    #   The current state of the report. Possible values:
+    #
+    #   * `available` - The report is available to view.
+    #
+    #   * `pending` - The report is being created and not available to view.
+    #
+    #   * `error` - The report could not be created.
+    #   @return [String]
+    #
+    # @!attribute [rw] state_reason
+    #   Provides additional details when the report is in an `error` state.
+    #   @return [String]
+    #
+    # @!attribute [rw] creation_time
+    #   The date and time when the report was created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] expiration_time
+    #   The date and time when Amazon EC2 will delete the report (30 days
+    #   after the report was created).
+    #   @return [Time]
+    #
+    # @!attribute [rw] tags
+    #   Any tags assigned to the report.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageUsageReport AWS API Documentation
+    #
+    class ImageUsageReport < Struct.new(
+      :image_id,
+      :report_id,
+      :resource_types,
+      :account_ids,
+      :state,
+      :state_reason,
+      :creation_time,
+      :expiration_time,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A single entry in an image usage report, detailing how an image is
+    # being used by a specific Amazon Web Services account and resource
+    # type.
+    #
+    # @!attribute [rw] resource_type
+    #   The type of resource (`ec2:Instance` or `ec2:LaunchTemplate`).
+    #   @return [String]
+    #
+    # @!attribute [rw] report_id
+    #   The ID of the report.
+    #   @return [String]
+    #
+    # @!attribute [rw] usage_count
+    #   The number of times resources of this type reference this image in
+    #   the account.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] account_id
+    #   The ID of the account that uses the image.
+    #   @return [String]
+    #
+    # @!attribute [rw] image_id
+    #   The ID of the image.
+    #   @return [String]
+    #
+    # @!attribute [rw] report_creation_time
+    #   The date and time the report creation was initiated.
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageUsageReportEntry AWS API Documentation
+    #
+    class ImageUsageReportEntry < Struct.new(
+      :resource_type,
+      :report_id,
+      :usage_count,
+      :account_id,
+      :image_id,
+      :report_creation_time)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A resource type to include in the report. Associated options can also
+    # be specified if the resource type is a launch template.
+    #
+    # @!attribute [rw] resource_type
+    #   The resource type.
+    #
+    #   Valid values: `ec2:Instance` \| `ec2:LaunchTemplate`
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_type_options
+    #   The options that affect the scope of the report. Valid only when
+    #   `ResourceType` is `ec2:LaunchTemplate`.
+    #   @return [Array<Types::ImageUsageResourceTypeOption>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageUsageResourceType AWS API Documentation
+    #
+    class ImageUsageResourceType < Struct.new(
+      :resource_type,
+      :resource_type_options)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The options that affect the scope of the report.
+    #
+    # @!attribute [rw] option_name
+    #   The name of the option.
+    #   @return [String]
+    #
+    # @!attribute [rw] option_values
+    #   The number of launch template versions to check.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageUsageResourceTypeOption AWS API Documentation
+    #
+    class ImageUsageResourceTypeOption < Struct.new(
+      :option_name,
+      :option_values)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The options that affect the scope of the report.
+    #
+    # @!attribute [rw] option_name
+    #   The name of the option.
+    #
+    #   Valid value: `version-depth` - The number of launch template
+    #   versions to check.
+    #   @return [String]
+    #
+    # @!attribute [rw] option_values
+    #   A value for the specified option.
+    #
+    #   Valid values: Integers between `1` and `10000`
+    #
+    #   Default: `20`
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageUsageResourceTypeOptionRequest AWS API Documentation
+    #
+    class ImageUsageResourceTypeOptionRequest < Struct.new(
+      :option_name,
+      :option_values)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A resource type to include in the report. Associated options can also
+    # be specified if the resource type is a launch template.
+    #
+    # @!attribute [rw] resource_type
+    #   The resource type.
+    #
+    #   Valid values: `ec2:Instance` \| `ec2:LaunchTemplate`
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_type_options
+    #   The options that affect the scope of the report. Valid only when
+    #   `ResourceType` is `ec2:LaunchTemplate`.
+    #   @return [Array<Types::ImageUsageResourceTypeOptionRequest>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageUsageResourceTypeRequest AWS API Documentation
+    #
+    class ImageUsageResourceTypeRequest < Struct.new(
+      :resource_type,
+      :resource_type_options)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] client_vpn_endpoint_id
     #   The ID of the Client VPN endpoint to which the client certificate
     #   revocation list applies.
@@ -43119,6 +44925,11 @@ module Aws::EC2
     #   The Availability Zone where the resulting instance will reside.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone where the resulting instance will
+    #   reside.
+    #   @return [String]
+    #
     # @!attribute [rw] bytes_converted
     #   The number of bytes converted so far.
     #   @return [Integer]
@@ -43147,6 +44958,7 @@ module Aws::EC2
     #
     class ImportInstanceVolumeDetailItem < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :bytes_converted,
       :description,
       :image,
@@ -43375,6 +45187,13 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone for the resulting EBS volume.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` must be specified,
+    #   but not both.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -43384,6 +45203,9 @@ module Aws::EC2
     #
     # @!attribute [rw] availability_zone
     #   The Availability Zone for the resulting EBS volume.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` must be specified,
+    #   but not both.
     #   @return [String]
     #
     # @!attribute [rw] image
@@ -43401,6 +45223,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportVolumeRequest AWS API Documentation
     #
     class ImportVolumeRequest < Struct.new(
+      :availability_zone_id,
       :dry_run,
       :availability_zone,
       :image,
@@ -43428,6 +45251,11 @@ module Aws::EC2
     #   The Availability Zone where the resulting volume will reside.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone where the resulting volume will
+    #   reside.
+    #   @return [String]
+    #
     # @!attribute [rw] bytes_converted
     #   The number of bytes converted so far.
     #   @return [Integer]
@@ -43448,6 +45276,7 @@ module Aws::EC2
     #
     class ImportVolumeTaskDetails < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :bytes_converted,
       :description,
       :image,
@@ -43532,6 +45361,46 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Information about the volume initialization. For more information, see
+    # [Initialize Amazon EBS volumes][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html
+    #
+    # @!attribute [rw] initialization_type
+    #   The method used for volume initialization. Possible values include:
+    #
+    #   * `default` - Volume initialized using the default volume
+    #     initialization rate or fast snapshot restore.
+    #
+    #   * `provisioned-rate` - Volume initialized using an Amazon EBS
+    #     Provisioned Rate for Volume Initialization.
+    #   @return [String]
+    #
+    # @!attribute [rw] progress
+    #   The current volume initialization progress as a percentage (0-100).
+    #   Returns `100` when volume initialization has completed.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] estimated_time_to_complete_in_seconds
+    #   The estimated remaining time, in seconds, for volume initialization
+    #   to complete. Returns `0` when volume initialization has completed.
+    #
+    #   Only available for volumes created with Amazon EBS Provisioned Rate
+    #   for Volume Initialization.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InitializationStatusDetails AWS API Documentation
+    #
+    class InitializationStatusDetails < Struct.new(
+      :initialization_type,
+      :progress,
+      :estimated_time_to_complete_in_seconds)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes an instance.
     #
     # @!attribute [rw] architecture
@@ -43640,6 +45509,16 @@ module Aws::EC2
     #   The CPU options for the instance.
     #   @return [Types::CpuOptions]
     #
+    # @!attribute [rw] capacity_block_id
+    #   The ID of the Capacity Block.
+    #
+    #   <note markdown="1"> For P5 instances, a Capacity Block ID refers to a group of
+    #   instances. For Trn2u instances, a capacity block ID refers to an EC2
+    #   UltraServer.
+    #
+    #    </note>
+    #   @return [String]
+    #
     # @!attribute [rw] capacity_reservation_id
     #   The ID of the Capacity Reservation.
     #   @return [String]
@@ -43776,10 +45655,14 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] public_dns_name
-    #   \[IPv4 only\] The public DNS name assigned to the instance. This
-    #   name is not available until the instance enters the `running` state.
-    #   This name is only available if you've enabled DNS hostnames for
-    #   your VPC.
+    #   The public DNS name assigned to the instance. This name is not
+    #   available until the instance enters the `running` state. This name
+    #   is only available if you've enabled DNS hostnames for your VPC. The
+    #   format of this name depends on the [public hostname type][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/hostname-types.html#public-hostnames
     #   @return [String]
     #
     # @!attribute [rw] state_transition_reason
@@ -43877,6 +45760,7 @@ module Aws::EC2
       :tags,
       :virtualization_type,
       :cpu_options,
+      :capacity_block_id,
       :capacity_reservation_id,
       :capacity_reservation_specification,
       :hibernation_options,
@@ -44074,7 +45958,7 @@ module Aws::EC2
     # Describes a block device mapping.
     #
     # @!attribute [rw] device_name
-    #   The device name (for example, `/dev/sdh` or `xvdh`).
+    #   The device name.
     #   @return [String]
     #
     # @!attribute [rw] ebs
@@ -44094,7 +45978,12 @@ module Aws::EC2
     # Describes a block device mapping entry.
     #
     # @!attribute [rw] device_name
-    #   The device name (for example, `/dev/sdh` or `xvdh`).
+    #   The device name. For available device names, see [Device names for
+    #   volumes][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/device_naming.html
     #   @return [String]
     #
     # @!attribute [rw] ebs
@@ -44149,6 +46038,48 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The DNS names of the endpoint.
+    #
+    # @!attribute [rw] dns_name
+    #   The DNS name of the EC2 Instance Connect Endpoint.
+    #   @return [String]
+    #
+    # @!attribute [rw] fips_dns_name
+    #   The Federal Information Processing Standards (FIPS) compliant DNS
+    #   name of the EC2 Instance Connect Endpoint.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceConnectEndpointDnsNames AWS API Documentation
+    #
+    class InstanceConnectEndpointDnsNames < Struct.new(
+      :dns_name,
+      :fips_dns_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The public DNS names of the endpoint, including IPv4-only and
+    # dualstack DNS names.
+    #
+    # @!attribute [rw] ipv_4
+    #   The IPv4-only DNS name of the EC2 Instance Connect Endpoint.
+    #   @return [Types::InstanceConnectEndpointDnsNames]
+    #
+    # @!attribute [rw] dualstack
+    #   The dualstack DNS name of the EC2 Instance Connect Endpoint. A
+    #   dualstack DNS name supports connections from both IPv4 and IPv6
+    #   clients.
+    #   @return [Types::InstanceConnectEndpointDnsNames]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceConnectEndpointPublicDnsNames AWS API Documentation
+    #
+    class InstanceConnectEndpointPublicDnsNames < Struct.new(
+      :ipv_4,
+      :dualstack)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a Reserved Instance listing state.
     #
     # @!attribute [rw] instance_count
@@ -44606,10 +46537,33 @@ module Aws::EC2
     #   your instance.
     #   @return [String]
     #
+    # @!attribute [rw] reboot_migration
+    #   Specifies whether to attempt reboot migration during a
+    #   user-initiated reboot of an instance that has a scheduled
+    #   `system-reboot` event:
+    #
+    #   * `default` - Amazon EC2 attempts to migrate the instance to new
+    #     hardware (reboot migration). If successful, the `system-reboot`
+    #     event is cleared. If unsuccessful, an in-place reboot occurs and
+    #     the event remains scheduled.
+    #
+    #   * `disabled` - Amazon EC2 keeps the instance on the same hardware
+    #     (in-place reboot). The `system-reboot` event remains scheduled.
+    #
+    #   This setting only applies to supported instances that have a
+    #   scheduled reboot event. For more information, see [Enable or disable
+    #   reboot migration][1] in the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/schedevents_actions_reboot.html#reboot-migration
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceMaintenanceOptions AWS API Documentation
     #
     class InstanceMaintenanceOptions < Struct.new(
-      :auto_recovery)
+      :auto_recovery,
+      :reboot_migration)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -44943,7 +46897,7 @@ module Aws::EC2
     # @!attribute [rw] interface_type
     #   The type of network interface.
     #
-    #   Valid values: `interface` \| `efa` \| `efa-only` \| `trunk`
+    #   Valid values: `interface` \| `efa` \| `efa-only` \| `evs` \| `trunk`
     #   @return [String]
     #
     # @!attribute [rw] ipv_4_prefixes
@@ -46503,6 +48457,10 @@ module Aws::EC2
     #   The Availability Zone of the instance.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone of the instance.
+    #   @return [String]
+    #
     # @!attribute [rw] outpost_arn
     #   The Amazon Resource Name (ARN) of the Outpost.
     #   @return [String]
@@ -46545,6 +48503,7 @@ module Aws::EC2
     #
     class InstanceStatus < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :outpost_arn,
       :operator,
       :events,
@@ -46726,6 +48685,12 @@ module Aws::EC2
     #   in.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_block_id
+    #   The ID of the Capacity Block. This parameter is only supported for
+    #   Ultraserver instances and identifies instances within the
+    #   Ultraserver domain.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceTopology AWS API Documentation
     #
     class InstanceTopology < Struct.new(
@@ -46734,7 +48699,8 @@ module Aws::EC2
       :group_name,
       :network_nodes,
       :availability_zone,
-      :zone_id)
+      :zone_id,
+      :capacity_block_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -46881,6 +48847,17 @@ module Aws::EC2
     #   clock (PHC) is supported.
     #   @return [String]
     #
+    # @!attribute [rw] reboot_migration_support
+    #   Indicates whether reboot migration during a user-initiated reboot is
+    #   supported for instances that have a scheduled `system-reboot` event.
+    #   For more information, see [Enable or disable reboot migration][1] in
+    #   the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/schedevents_actions_reboot.html#reboot-migration
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceTypeInfo AWS API Documentation
     #
     class InstanceTypeInfo < Struct.new(
@@ -46913,7 +48890,8 @@ module Aws::EC2
       :nitro_tpm_info,
       :media_accelerator_info,
       :neuron_info,
-      :phc_support)
+      :phc_support,
+      :reboot_migration_support)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -49534,7 +51512,7 @@ module Aws::EC2
     #
     #   The following are the supported values for each volume type:
     #
-    #   * `gp3`: 3,000 - 16,000 IOPS
+    #   * `gp3`: 3,000 - 80,000 IOPS
     #
     #   * `io1`: 100 - 64,000 IOPS
     #
@@ -49566,7 +51544,9 @@ module Aws::EC2
     #   ID or a volume size. The following are the supported volumes sizes
     #   for each volume type:
     #
-    #   * `gp2` and `gp3`: 1 - 16,384 GiB
+    #   * `gp2`: 1 - 16,384 GiB
+    #
+    #   * `gp3`: 1 - 65,536 GiB
     #
     #   * `io1`: 4 - 16,384 GiB
     #
@@ -49588,9 +51568,9 @@ module Aws::EC2
     #
     # @!attribute [rw] throughput
     #   The throughput to provision for a `gp3` volume, with a maximum of
-    #   1,000 MiB/s.
+    #   2,000 MiB/s.
     #
-    #   Valid Range: Minimum value of 125. Maximum value of 1000.
+    #   Valid Range: Minimum value of 125. Maximum value of 2,000.
     #   @return [Integer]
     #
     # @!attribute [rw] volume_initialization_rate
@@ -49658,8 +51638,6 @@ module Aws::EC2
     # @!attribute [rw] count
     #   The number of elastic inference accelerators to attach to the
     #   instance.
-    #
-    #   Default: 1
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateElasticInferenceAccelerator AWS API Documentation
@@ -49685,8 +51663,6 @@ module Aws::EC2
     # @!attribute [rw] count
     #   The number of elastic inference accelerators to attach to the
     #   instance.
-    #
-    #   Default: 1
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateElasticInferenceAcceleratorResponse AWS API Documentation
@@ -49976,8 +51952,6 @@ module Aws::EC2
     #   requests. The larger the number, the further instance metadata
     #   requests can travel.
     #
-    #   Default: 1
-    #
     #   Possible values: Integers from 1 to 64
     #   @return [Integer]
     #
@@ -50639,6 +52613,10 @@ module Aws::EC2
     #   The Availability Zone of the instance.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone of the instance.
+    #   @return [String]
+    #
     # @!attribute [rw] affinity
     #   The affinity setting for the instance on the Dedicated Host.
     #   @return [String]
@@ -50679,6 +52657,7 @@ module Aws::EC2
     #
     class LaunchTemplatePlacement < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :affinity,
       :group_name,
       :host_id,
@@ -50695,6 +52674,16 @@ module Aws::EC2
     #
     # @!attribute [rw] availability_zone
     #   The Availability Zone for the instance.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone for the instance.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
     #   @return [String]
     #
     # @!attribute [rw] affinity
@@ -50739,6 +52728,7 @@ module Aws::EC2
     #
     class LaunchTemplatePlacementRequest < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :affinity,
       :group_name,
       :host_id,
@@ -51965,6 +53955,154 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Information about a System Integrity Protection (SIP) modification
+    # task or volume ownership delegation task for an Amazon EC2 Mac
+    # instance.
+    #
+    # @!attribute [rw] instance_id
+    #   The ID of the Amazon EC2 Mac instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] mac_modification_task_id
+    #   The ID of task.
+    #   @return [String]
+    #
+    # @!attribute [rw] mac_system_integrity_protection_config
+    #   \[SIP modification tasks only\] Information about the SIP
+    #   configuration.
+    #   @return [Types::MacSystemIntegrityProtectionConfiguration]
+    #
+    # @!attribute [rw] start_time
+    #   The date and time the task was created, in the UTC timezone
+    #   (`YYYY-MM-DDThh:mm:ss.sssZ`).
+    #   @return [Time]
+    #
+    # @!attribute [rw] tags
+    #   The tags assigned to the task.
+    #   @return [Array<Types::Tag>]
+    #
+    # @!attribute [rw] task_state
+    #   The state of the task.
+    #   @return [String]
+    #
+    # @!attribute [rw] task_type
+    #   The type of task.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/MacModificationTask AWS API Documentation
+    #
+    class MacModificationTask < Struct.new(
+      :instance_id,
+      :mac_modification_task_id,
+      :mac_system_integrity_protection_config,
+      :start_time,
+      :tags,
+      :task_state,
+      :task_type)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Describes the configuration for a System Integrity Protection (SIP)
+    # modification task.
+    #
+    # @!attribute [rw] apple_internal
+    #   Indicates whether Apple Internal was enabled or disabled by the
+    #   task.
+    #   @return [String]
+    #
+    # @!attribute [rw] base_system
+    #   Indicates whether Base System was enabled or disabled by the task.
+    #   @return [String]
+    #
+    # @!attribute [rw] debugging_restrictions
+    #   Indicates whether Debugging Restrictions was enabled or disabled by
+    #   the task.
+    #   @return [String]
+    #
+    # @!attribute [rw] d_trace_restrictions
+    #   Indicates whether Dtrace Restrictions was enabled or disabled by the
+    #   task.
+    #   @return [String]
+    #
+    # @!attribute [rw] filesystem_protections
+    #   Indicates whether Filesystem Protections was enabled or disabled by
+    #   the task.
+    #   @return [String]
+    #
+    # @!attribute [rw] kext_signing
+    #   Indicates whether Kext Signing was enabled or disabled by the task.
+    #   @return [String]
+    #
+    # @!attribute [rw] nvram_protections
+    #   Indicates whether NVRAM Protections was enabled or disabled by the
+    #   task.
+    #   @return [String]
+    #
+    # @!attribute [rw] status
+    #   Indicates SIP was enabled or disabled by the task.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/MacSystemIntegrityProtectionConfiguration AWS API Documentation
+    #
+    class MacSystemIntegrityProtectionConfiguration < Struct.new(
+      :apple_internal,
+      :base_system,
+      :debugging_restrictions,
+      :d_trace_restrictions,
+      :filesystem_protections,
+      :kext_signing,
+      :nvram_protections,
+      :status)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Describes a custom configuration for a System Integrity Protection
+    # (SIP) modification task.
+    #
+    # @!attribute [rw] apple_internal
+    #   Enables or disables Apple Internal.
+    #   @return [String]
+    #
+    # @!attribute [rw] base_system
+    #   Enables or disables Base System.
+    #   @return [String]
+    #
+    # @!attribute [rw] debugging_restrictions
+    #   Enables or disables Debugging Restrictions.
+    #   @return [String]
+    #
+    # @!attribute [rw] d_trace_restrictions
+    #   Enables or disables Dtrace Restrictions.
+    #   @return [String]
+    #
+    # @!attribute [rw] filesystem_protections
+    #   Enables or disables Filesystem Protections.
+    #   @return [String]
+    #
+    # @!attribute [rw] kext_signing
+    #   Enables or disables Kext Signing.
+    #   @return [String]
+    #
+    # @!attribute [rw] nvram_protections
+    #   Enables or disables Nvram Protections.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/MacSystemIntegrityProtectionConfigurationRequest AWS API Documentation
+    #
+    class MacSystemIntegrityProtectionConfigurationRequest < Struct.new(
+      :apple_internal,
+      :base_system,
+      :debugging_restrictions,
+      :d_trace_restrictions,
+      :filesystem_protections,
+      :kext_signing,
+      :nvram_protections)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Details for Site-to-Site VPN tunnel endpoint maintenance events.
     #
     # @!attribute [rw] pending_maintenance
@@ -53183,7 +55321,7 @@ module Aws::EC2
     #   value is specified for `DeleteOnTermination`, the default is `true`
     #   and the volume is deleted when the instance is terminated. You
     #   can't modify the `DeleteOnTermination` attribute for volumes that
-    #   are attached to Fargate tasks.
+    #   are attached to Amazon Web Services-managed resources.
     #
     #   To add instance store volumes to an Amazon EBS-backed instance, you
     #   must add them when you launch the instance. For more information,
@@ -53346,6 +55484,80 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the operation,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] instance_connect_endpoint_id
+    #   The ID of the EC2 Instance Connect Endpoint to modify.
+    #   @return [String]
+    #
+    # @!attribute [rw] ip_address_type
+    #   The new IP address type for the EC2 Instance Connect Endpoint.
+    #
+    #   <note markdown="1"> `PreserveClientIp` is only supported on IPv4 EC2 Instance Connect
+    #   Endpoints. To use `PreserveClientIp`, the value for `IpAddressType`
+    #   must be `ipv4`.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @!attribute [rw] security_group_ids
+    #   Changes the security groups for the EC2 Instance Connect Endpoint.
+    #   The new set of groups you specify replaces the current set. You must
+    #   specify at least one group, even if it's just the default security
+    #   group in the VPC. You must specify the ID of the security group, not
+    #   the name.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] preserve_client_ip
+    #   Indicates whether the client IP address is preserved as the source.
+    #   The following are the possible values.
+    #
+    #   * `true` - Use the client IP address as the source.
+    #
+    #   * `false` - Use the network interface IP address as the source.
+    #
+    #   <note markdown="1"> `PreserveClientIp=true` is only supported on IPv4 EC2 Instance
+    #   Connect Endpoints. If modifying `PreserveClientIp` to `true`, either
+    #   the endpoint's existing `IpAddressType` must be `ipv4`, or if
+    #   modifying `IpAddressType` in the same request, the new value must be
+    #   `ipv4`.
+    #
+    #    </note>
+    #
+    #   Default: `false`
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyInstanceConnectEndpointRequest AWS API Documentation
+    #
+    class ModifyInstanceConnectEndpointRequest < Struct.new(
+      :dry_run,
+      :instance_connect_endpoint_id,
+      :ip_address_type,
+      :security_group_ids,
+      :preserve_client_ip)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] return
+    #   The return value of the request. Returns `true` if the specified
+    #   product code is owned by the requester and associated with the
+    #   specified instance.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyInstanceConnectEndpointResult AWS API Documentation
+    #
+    class ModifyInstanceConnectEndpointResult < Struct.new(
+      :return)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] instance_id
     #   The ID of the instance to update.
     #   @return [String]
@@ -53574,6 +55786,28 @@ module Aws::EC2
     #   to default.
     #   @return [String]
     #
+    # @!attribute [rw] reboot_migration
+    #   Specifies whether to attempt reboot migration during a
+    #   user-initiated reboot of an instance that has a scheduled
+    #   `system-reboot` event:
+    #
+    #   * `default` - Amazon EC2 attempts to migrate the instance to new
+    #     hardware (reboot migration). If successful, the `system-reboot`
+    #     event is cleared. If unsuccessful, an in-place reboot occurs and
+    #     the event remains scheduled.
+    #
+    #   * `disabled` - Amazon EC2 keeps the instance on the same hardware
+    #     (in-place reboot). The `system-reboot` event remains scheduled.
+    #
+    #   This setting only applies to supported instances that have a
+    #   scheduled reboot event. For more information, see [Enable or disable
+    #   reboot migration][1] in the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/schedevents_actions_reboot.html#reboot-migration
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -53586,6 +55820,7 @@ module Aws::EC2
     class ModifyInstanceMaintenanceOptionsRequest < Struct.new(
       :instance_id,
       :auto_recovery,
+      :reboot_migration,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
@@ -53600,11 +55835,34 @@ module Aws::EC2
     #   your instance.
     #   @return [String]
     #
+    # @!attribute [rw] reboot_migration
+    #   Specifies whether to attempt reboot migration during a
+    #   user-initiated reboot of an instance that has a scheduled
+    #   `system-reboot` event:
+    #
+    #   * `default` - Amazon EC2 attempts to migrate the instance to new
+    #     hardware (reboot migration). If successful, the `system-reboot`
+    #     event is cleared. If unsuccessful, an in-place reboot occurs and
+    #     the event remains scheduled.
+    #
+    #   * `disabled` - Amazon EC2 keeps the instance on the same hardware
+    #     (in-place reboot). The `system-reboot` event remains scheduled.
+    #
+    #   This setting only applies to supported instances that have a
+    #   scheduled reboot event. For more information, see [Enable or disable
+    #   reboot migration][1] in the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/schedevents_actions_reboot.html#reboot-migration
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyInstanceMaintenanceOptionsResult AWS API Documentation
     #
     class ModifyInstanceMaintenanceOptionsResult < Struct.new(
       :instance_id,
-      :auto_recovery)
+      :auto_recovery,
+      :reboot_migration)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -54533,6 +56791,10 @@ module Aws::EC2
     #   will only apply to the primary network interface (eth0).
     #   @return [Boolean]
     #
+    # @!attribute [rw] associated_subnet_ids
+    #   A list of subnet IDs to associate with the network interface.
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -54578,6 +56840,7 @@ module Aws::EC2
       :enable_primary_ipv_6,
       :connection_tracking_specification,
       :associate_public_ip_address,
+      :associated_subnet_ids,
       :dry_run,
       :network_interface_id,
       :description,
@@ -54642,6 +56905,65 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] network_interface_id
+    #   A network interface ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] hostname_type
+    #   The public hostname type. For more information, see [EC2 instance
+    #   hostnames, DNS names, and domains][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #   * `public-dual-stack-dns-name`: A dual-stack public hostname for a
+    #     network interface. Requests from within the VPC resolve to both
+    #     the private IPv4 address and the IPv6 Global Unicast Address of
+    #     the network interface. Requests from the internet resolve to both
+    #     the public IPv4 and the IPv6 GUA address of the network interface.
+    #
+    #   * `public-ipv4-dns-name`: An IPv4-enabled public hostname for a
+    #     network interface. Requests from within the VPC resolve to the
+    #     private primary IPv4 address of the network interface. Requests
+    #     from the internet resolve to the public IPv4 address of the
+    #     network interface.
+    #
+    #   * `public-ipv6-dns-name`: An IPv6-enabled public hostname for a
+    #     network interface. Requests from within the VPC or from the
+    #     internet resolve to the IPv6 GUA of the network interface.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the operation,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyPublicIpDnsNameOptionsRequest AWS API Documentation
+    #
+    class ModifyPublicIpDnsNameOptionsRequest < Struct.new(
+      :network_interface_id,
+      :hostname_type,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] successful
+    #   Whether or not the request was successful.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyPublicIpDnsNameOptionsResult AWS API Documentation
+    #
+    class ModifyPublicIpDnsNameOptionsResult < Struct.new(
+      :successful)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Contains the parameters for ModifyReservedInstances.
     #
     # @!attribute [rw] reserved_instances_ids
@@ -55327,8 +57649,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] default_route_table_propagation
-    #   Enable or disable automatic propagation of routes to the default
-    #   propagation route table.
+    #   Indicates whether resource attachments automatically propagate
+    #   routes to the default propagation route table. Enabled by default.
+    #   If `defaultRouteTablePropagation` is set to `enable`, Amazon Web
+    #   Services Transit Gateway will create the default transit gateway
+    #   route table.
     #   @return [String]
     #
     # @!attribute [rw] propagation_default_route_table_id
@@ -56274,7 +58599,9 @@ module Aws::EC2
     #
     #   The following are the supported volumes sizes for each volume type:
     #
-    #   * `gp2` and `gp3`: 1 - 16,384 GiB
+    #   * `gp2`: 1 - 16,384 GiB
+    #
+    #   * `gp3`: 1 - 65,536 GiB
     #
     #   * `io1`: 4 - 16,384 GiB
     #
@@ -56304,7 +58631,7 @@ module Aws::EC2
     #
     #   The following are the supported values for each volume type:
     #
-    #   * `gp3`: 3,000 - 16,000 IOPS
+    #   * `gp3`: 3,000 - 80,000 IOPS
     #
     #   * `io1`: 100 - 64,000 IOPS
     #
@@ -56325,12 +58652,12 @@ module Aws::EC2
     #
     # @!attribute [rw] throughput
     #   The target throughput of the volume, in MiB/s. This parameter is
-    #   valid only for `gp3` volumes. The maximum value is 1,000.
+    #   valid only for `gp3` volumes. The maximum value is 2,000.
     #
     #   Default: The existing value is retained if the source and target
     #   volume type is `gp3`. Otherwise, the default value is 125.
     #
-    #   Valid Range: Minimum value of 125. Maximum value of 1000.
+    #   Valid Range: Minimum value of 125. Maximum value of 2,000.
     #   @return [Integer]
     #
     # @!attribute [rw] multi_attach_enabled
@@ -57100,6 +59427,12 @@ module Aws::EC2
     #   Valid values: `True` \| `False`
     #   @return [Boolean]
     #
+    # @!attribute [rw] pre_shared_key_storage
+    #   Specifies the storage mode for the pre-shared key (PSK). Valid
+    #   values are `Standard` (stored in Site-to-Site VPN service) or
+    #   `SecretsManager` (stored in Amazon Web Services Secrets Manager).
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyVpnTunnelOptionsRequest AWS API Documentation
     #
     class ModifyVpnTunnelOptionsRequest < Struct.new(
@@ -57107,7 +59440,8 @@ module Aws::EC2
       :vpn_tunnel_outside_ip_address,
       :tunnel_options,
       :dry_run,
-      :skip_tunnel_replacement)
+      :skip_tunnel_replacement,
+      :pre_shared_key_storage)
       SENSITIVE = [:tunnel_options]
       include Aws::Structure
     end
@@ -58456,9 +60790,35 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] private_dns_name
-    #   The private DNS name.
+    #   The private hostname. For more information, see [EC2 instance
+    #   hostnames, DNS names, and domains][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
     #   @return [String]
     #
+    # @!attribute [rw] public_dns_name
+    #   A public hostname. For more information, see [EC2 instance
+    #   hostnames, DNS names, and domains][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
+    #   @return [String]
+    #
+    # @!attribute [rw] public_ip_dns_name_options
+    #   Public hostname type options. For more information, see [EC2
+    #   instance hostnames, DNS names, and domains][1] in the *Amazon EC2
+    #   User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
+    #   @return [Types::PublicIpDnsNameOptions]
+    #
     # @!attribute [rw] private_ip_address
     #   The IPv4 address of the network interface within the subnet.
     #   @return [String]
@@ -58527,6 +60887,10 @@ module Aws::EC2
     #   The service provider that manages the network interface.
     #   @return [Types::OperatorResponse]
     #
+    # @!attribute [rw] associated_subnets
+    #   The subnets associated with this network interface.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/NetworkInterface AWS API Documentation
     #
     class NetworkInterface < Struct.new(
@@ -58543,6 +60907,8 @@ module Aws::EC2
       :outpost_arn,
       :owner_id,
       :private_dns_name,
+      :public_dns_name,
+      :public_ip_dns_name_options,
       :private_ip_address,
       :private_ip_addresses,
       :ipv_4_prefixes,
@@ -58557,7 +60923,8 @@ module Aws::EC2
       :deny_all_igw_traffic,
       :ipv_6_native,
       :ipv_6_address,
-      :operator)
+      :operator,
+      :associated_subnets)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -58752,6 +61119,18 @@ module Aws::EC2
     #   The IPv6 address.
     #   @return [String]
     #
+    # @!attribute [rw] public_ipv_6_dns_name
+    #   An IPv6-enabled public hostname for a network interface. Requests
+    #   from within the VPC or from the internet resolve to the IPv6 GUA of
+    #   the network interface. For more information, see [EC2 instance
+    #   hostnames, DNS names, and domains][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
+    #   @return [String]
+    #
     # @!attribute [rw] is_primary_ipv_6
     #   Determines if an IPv6 address associated with a network interface is
     #   the primary IPv6 address. When you enable an IPv6 GUA address to be
@@ -58769,6 +61148,7 @@ module Aws::EC2
     #
     class NetworkInterfaceIpv6Address < Struct.new(
       :ipv_6_address,
+      :public_ipv_6_dns_name,
       :is_primary_ipv_6)
       SENSITIVE = []
       include Aws::Structure
@@ -60004,6 +62384,20 @@ module Aws::EC2
 
     # Describes the placement of an instance.
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone of the instance.
+    #
+    #   On input, you can specify `AvailabilityZone` or
+    #   `AvailabilityZoneId`, but not both. If you specify neither one,
+    #   Amazon EC2 automatically selects an Availability Zone for you.
+    #
+    #   This parameter is not supported for [CreateFleet][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet
+    #   @return [String]
+    #
     # @!attribute [rw] affinity
     #   The affinity setting for the instance on the Dedicated Host.
     #
@@ -60017,8 +62411,9 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] group_name
-    #   The name of the placement group that the instance is in. If you
-    #   specify `GroupName`, you can't specify `GroupId`.
+    #   The name of the placement group that the instance is in.
+    #
+    #   On input, you can specify `GroupId` or `GroupName`, but not both.
     #   @return [String]
     #
     # @!attribute [rw] partition_number
@@ -60065,8 +62460,8 @@ module Aws::EC2
     # @!attribute [rw] host_resource_group_arn
     #   The ARN of the host resource group in which to launch the instances.
     #
-    #   If you specify this parameter, either omit the **Tenancy** parameter
-    #   or set it to `host`.
+    #   On input, if you specify this parameter, either omit the **Tenancy**
+    #   parameter or set it to `host`.
     #
     #   This parameter is not supported for [CreateFleet][1].
     #
@@ -60076,15 +62471,17 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] group_id
-    #   The ID of the placement group that the instance is in. If you
-    #   specify `GroupId`, you can't specify `GroupName`.
+    #   The ID of the placement group that the instance is in.
+    #
+    #   On input, you can specify `GroupId` or `GroupName`, but not both.
     #   @return [String]
     #
     # @!attribute [rw] availability_zone
     #   The Availability Zone of the instance.
     #
-    #   If not specified, an Availability Zone will be automatically chosen
-    #   for you based on the load balancing criteria for the Region.
+    #   On input, you can specify `AvailabilityZone` or
+    #   `AvailabilityZoneId`, but not both. If you specify neither one,
+    #   Amazon EC2 automatically selects an Availability Zone for you.
     #
     #   This parameter is not supported for [CreateFleet][1].
     #
@@ -60096,6 +62493,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Placement AWS API Documentation
     #
     class Placement < Struct.new(
+      :availability_zone_id,
       :affinity,
       :group_name,
       :partition_number,
@@ -60979,6 +63377,55 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Public hostname type options. For more information, see [EC2 instance
+    # hostnames, DNS names, and domains][1] in the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
+    #
+    # @!attribute [rw] dns_hostname_type
+    #   The public hostname type. For more information, see [EC2 instance
+    #   hostnames, DNS names, and domains][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html
+    #   @return [String]
+    #
+    # @!attribute [rw] public_ipv_4_dns_name
+    #   An IPv4-enabled public hostname for a network interface. Requests
+    #   from within the VPC resolve to the private primary IPv4 address of
+    #   the network interface. Requests from the internet resolve to the
+    #   public IPv4 address of the network interface.
+    #   @return [String]
+    #
+    # @!attribute [rw] public_ipv_6_dns_name
+    #   An IPv6-enabled public hostname for a network interface. Requests
+    #   from within the VPC or from the internet resolve to the IPv6 GUA of
+    #   the network interface.
+    #   @return [String]
+    #
+    # @!attribute [rw] public_dual_stack_dns_name
+    #   A dual-stack public hostname for a network interface. Requests from
+    #   within the VPC resolve to both the private IPv4 address and the IPv6
+    #   Global Unicast Address of the network interface. Requests from the
+    #   internet resolve to both the public IPv4 and the IPv6 GUA address of
+    #   the network interface.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PublicIpDnsNameOptions AWS API Documentation
+    #
+    class PublicIpDnsNameOptions < Struct.new(
+      :dns_hostname_type,
+      :public_ipv_4_dns_name,
+      :public_ipv_6_dns_name,
+      :public_dual_stack_dns_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes an IPv4 address pool.
     #
     # @!attribute [rw] pool_id
@@ -61177,10 +63624,15 @@ module Aws::EC2
     #   The Capacity Reservation.
     #   @return [Types::CapacityReservation]
     #
+    # @!attribute [rw] capacity_blocks
+    #   The Capacity Block.
+    #   @return [Array<Types::CapacityBlock>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PurchaseCapacityBlockResult AWS API Documentation
     #
     class PurchaseCapacityBlockResult < Struct.new(
-      :capacity_reservation)
+      :capacity_reservation,
+      :capacity_blocks)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -61538,8 +63990,8 @@ module Aws::EC2
     #   The full path to your AMI manifest in Amazon S3 storage. The
     #   specified bucket must have the `aws-exec-read` canned access control
     #   list (ACL) to ensure that it can be accessed by Amazon EC2. For more
-    #   information, see [Canned ACLs][1] in the *Amazon S3 Service
-    #   Developer Guide*.
+    #   information, see [Canned ACL][1] in the *Amazon S3 Service Developer
+    #   Guide*.
     #
     #
     #
@@ -61554,8 +64006,10 @@ module Aws::EC2
     #   you can publish AMIs that include billable software and list them on
     #   the Amazon Web Services Marketplace. You must first register as a
     #   seller on the Amazon Web Services Marketplace. For more information,
-    #   see [Getting started as a seller][1] and [AMI-based products][2] in
-    #   the *Amazon Web Services Marketplace Seller Guide*.
+    #   see [Getting started as an Amazon Web Services Marketplace
+    #   seller][1] and [AMI-based products in Amazon Web Services
+    #   Marketplace][2] in the *Amazon Web Services Marketplace Seller
+    #   Guide*.
     #
     #
     #
@@ -61572,8 +64026,8 @@ module Aws::EC2
     #
     #    </note>
     #
-    #   For more information, see [Boot modes][1] in the *Amazon EC2 User
-    #   Guide*.
+    #   For more information, see [Instance launch behavior with Amazon EC2
+    #   boot modes][1] in the *Amazon EC2 User Guide*.
     #
     #
     #
@@ -61594,7 +64048,8 @@ module Aws::EC2
     #   retrieve the UEFI data, use the [GetInstanceUefiData][1] command.
     #   You can inspect and modify the UEFI data by using the
     #   [python-uefivars tool][2] on GitHub. For more information, see [UEFI
-    #   Secure Boot][3] in the *Amazon EC2 User Guide*.
+    #   Secure Boot for Amazon EC2 instances][3] in the *Amazon EC2 User
+    #   Guide*.
     #
     #
     #
@@ -61683,8 +64138,8 @@ module Aws::EC2
     #   If you create an AMI on an Outpost, then all backing snapshots must
     #   be on the same Outpost or in the Region of that Outpost. AMIs on an
     #   Outpost that include local snapshots can be used to launch instances
-    #   on the same Outpost only. For more information, [Amazon EBS local
-    #   snapshots on Outposts][1] in the *Amazon EBS User Guide*.
+    #   on the same Outpost only. For more information, [Create AMIs from
+    #   local snapshots][1] in the *Amazon EBS User Guide*.
     #
     #
     #
@@ -62589,6 +65044,10 @@ module Aws::EC2
     #   The Amazon Resource Name (ARN) of the core network.
     #   @return [String]
     #
+    # @!attribute [rw] odb_network_arn
+    #   The Amazon Resource Name (ARN) of the ODB network.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -62646,6 +65105,7 @@ module Aws::EC2
       :local_gateway_id,
       :carrier_gateway_id,
       :core_network_arn,
+      :odb_network_arn,
       :dry_run,
       :route_table_id,
       :destination_cidr_block,
@@ -63812,6 +66272,10 @@ module Aws::EC2
     #   Any tags assigned to the resource.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @!attribute [rw] reserved_instances_id
     #   The ID of the Reserved Instance.
     #   @return [String]
@@ -63866,6 +66330,7 @@ module Aws::EC2
       :recurring_charges,
       :scope,
       :tags,
+      :availability_zone_id,
       :reserved_instances_id,
       :instance_type,
       :availability_zone,
@@ -63909,6 +66374,10 @@ module Aws::EC2
     #   instances in a specific Availability Zone.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReservedInstancesConfiguration AWS API Documentation
     #
     class ReservedInstancesConfiguration < Struct.new(
@@ -63916,7 +66385,8 @@ module Aws::EC2
       :instance_count,
       :instance_type,
       :platform,
-      :scope)
+      :scope,
+      :availability_zone_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -64125,6 +66595,10 @@ module Aws::EC2
     #   an Availability Zone.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @!attribute [rw] reserved_instances_offering_id
     #   The ID of the Reserved Instance offering. This is the offering ID
     #   used in GetReservedInstancesExchangeQuote to confirm that an
@@ -64166,6 +66640,7 @@ module Aws::EC2
       :pricing_details,
       :recurring_charges,
       :scope,
+      :availability_zone_id,
       :reserved_instances_offering_id,
       :instance_type,
       :availability_zone,
@@ -64427,6 +66902,68 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The options that affect the scope of the response.
+    #
+    # @!attribute [rw] option_name
+    #   The name of the option.
+    #
+    #   * For `ec2:Instance`:
+    #
+    #     Specify `state-name` - The current state of the EC2 instance.
+    #
+    #   * For `ec2:LaunchTemplate`:
+    #
+    #     Specify `version-depth` - The number of launch template versions
+    #     to check, starting from the most recent version.
+    #   @return [String]
+    #
+    # @!attribute [rw] option_values
+    #   A value for the specified option.
+    #
+    #   * For `state-name`:
+    #
+    #     * Valid values: `pending` \| `running` \| `shutting-down` \|
+    #       `terminated` \| `stopping` \| `stopped`
+    #
+    #     * Default: All states
+    #   * For `version-depth`:
+    #
+    #     * Valid values: Integers between `1` and `10000`
+    #
+    #     * Default: `10`
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ResourceTypeOption AWS API Documentation
+    #
+    class ResourceTypeOption < Struct.new(
+      :option_name,
+      :option_values)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A resource type to check for image references. Associated options can
+    # also be specified if the resource type is an EC2 instance or launch
+    # template.
+    #
+    # @!attribute [rw] resource_type
+    #   The resource type.
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_type_options
+    #   The options that affect the scope of the response. Valid only when
+    #   `ResourceType` is `ec2:Instance` or `ec2:LaunchTemplate`.
+    #   @return [Array<Types::ResourceTypeOption>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ResourceTypeRequest AWS API Documentation
+    #
+    class ResourceTypeRequest < Struct.new(
+      :resource_type,
+      :resource_type_options)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the error that's returned when you cannot delete a launch
     # template version.
     #
@@ -65340,6 +67877,9 @@ module Aws::EC2
     #
     #   * `EnableVgwRoutePropagation` - The route was propagated by route
     #     propagation.
+    #
+    #   * `Advertisement` - The route was created dynamically by Amazon VPC
+    #     Route Server.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -65357,6 +67897,15 @@ module Aws::EC2
     #   The Amazon Resource Name (ARN) of the core network.
     #   @return [String]
     #
+    # @!attribute [rw] odb_network_arn
+    #   The Amazon Resource Name (ARN) of the ODB network.
+    #   @return [String]
+    #
+    # @!attribute [rw] ip_address
+    #   The next hop IP address for routes propagated by VPC Route Server
+    #   into VPC route tables.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Route AWS API Documentation
     #
     class Route < Struct.new(
@@ -65375,7 +67924,9 @@ module Aws::EC2
       :origin,
       :state,
       :vpc_peering_connection_id,
-      :core_network_arn)
+      :core_network_arn,
+      :odb_network_arn,
+      :ip_address)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -65953,6 +68504,11 @@ module Aws::EC2
     #   The ID of the internet gateway or virtual private gateway.
     #   @return [String]
     #
+    # @!attribute [rw] public_ipv_4_pool
+    #   The ID of a public IPv4 pool. A public IPv4 pool is a pool of IPv4
+    #   addresses that you've brought to Amazon Web Services with BYOIP.
+    #   @return [String]
+    #
     # @!attribute [rw] association_state
     #   The state of the association.
     #   @return [Types::RouteTableAssociationState]
@@ -65965,6 +68521,7 @@ module Aws::EC2
       :route_table_id,
       :subnet_id,
       :gateway_id,
+      :public_ipv_4_pool,
       :association_state)
       SENSITIVE = []
       include Aws::Structure
@@ -66080,12 +68637,12 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The instance type. For more information, see [Amazon EC2 instance
-    #   types][1] in the *Amazon EC2 User Guide*.
+    #   The instance type. For more information, see [Amazon EC2 Instance
+    #   Types Guide][1].
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
+    #   [1]: https://docs.aws.amazon.com/ec2/latest/instancetypes/instance-types.html
     #   @return [String]
     #
     # @!attribute [rw] ipv_6_address_count
@@ -66123,8 +68680,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] key_name
-    #   The name of the key pair. You can create a key pair using
-    #   [CreateKeyPair][1] or [ImportKeyPair][2].
+    #   The name of the key pair. For more information, see [Create a key
+    #   pair for your EC2 instance][1].
     #
     #   If you do not specify a key pair, you can't connect to the instance
     #   unless you choose an AMI that is configured to allow users another
@@ -66132,8 +68689,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateKeyPair.html
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportKeyPair.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-key-pairs.html
     #   @return [String]
     #
     # @!attribute [rw] max_count
@@ -66190,16 +68746,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] security_group_ids
-    #   The IDs of the security groups. You can create a security group
-    #   using [CreateSecurityGroup][1].
+    #   The IDs of the security groups.
     #
     #   If you specify a network interface, you must specify any security
     #   groups as part of the network interface instead of using this
     #   parameter.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html
     #   @return [Array<String>]
     #
     # @!attribute [rw] security_groups
@@ -66223,11 +68774,11 @@ module Aws::EC2
     #   The user data to make available to the instance. User data must be
     #   base64-encoded. Depending on the tool or SDK that you're using, the
     #   base64-encoding might be performed for you. For more information,
-    #   see [Work with instance user data][1].
+    #   see [Run commands at launch using instance user data][1].
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-add-user-data.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html
     #   @return [String]
     #
     # @!attribute [rw] elastic_gpu_specification
@@ -66337,25 +68888,24 @@ module Aws::EC2
     #
     # @!attribute [rw] metadata_options
     #   The metadata options for the instance. For more information, see
-    #   [Instance metadata and user data][1].
+    #   [Configure the Instance Metadata Service options][1].
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html
     #   @return [Types::InstanceMetadataOptionsRequest]
     #
     # @!attribute [rw] enclave_options
     #   Indicates whether the instance is enabled for Amazon Web Services
-    #   Nitro Enclaves. For more information, see [What is Amazon Web
-    #   Services Nitro Enclaves?][1] in the *Amazon Web Services Nitro
-    #   Enclaves User Guide*.
+    #   Nitro Enclaves. For more information, see [Amazon Web Services Nitro
+    #   Enclaves User Guide][1].
     #
     #   You can't enable Amazon Web Services Nitro Enclaves and hibernation
     #   on the same instance.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html
+    #   [1]: https://docs.aws.amazon.com/enclaves/latest/user/
     #   @return [Types::EnclaveOptionsRequest]
     #
     # @!attribute [rw] private_dns_name_options
@@ -66370,11 +68920,12 @@ module Aws::EC2
     #
     # @!attribute [rw] disable_api_stop
     #   Indicates whether an instance is enabled for stop protection. For
-    #   more information, see [Stop protection][1].
+    #   more information, see [Enable stop protection for your EC2
+    #   instances][1].
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html#Using_StopProtection
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-stop-protection.html
     #   @return [Boolean]
     #
     # @!attribute [rw] enable_primary_ipv_6
@@ -66448,7 +68999,8 @@ module Aws::EC2
     #   randomly generated token is used for the request to ensure
     #   idempotency.
     #
-    #   For more information, see [Ensuring Idempotency][1].
+    #   For more information, see [Ensuring idempotency in Amazon EC2 API
+    #   requests][1].
     #
     #   Constraints: Maximum 64 ASCII characters
     #
@@ -66457,7 +69009,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #   [1]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html
     #   @return [String]
     #
     # @!attribute [rw] additional_info
@@ -67902,6 +70454,11 @@ module Aws::EC2
     #   The association's state reason.
     #   @return [String]
     #
+    # @!attribute [rw] group_owner_id
+    #   The Amazon Web Services account ID of the owner of the security
+    #   group.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SecurityGroupVpcAssociation AWS API Documentation
     #
     class SecurityGroupVpcAssociation < Struct.new(
@@ -67909,7 +70466,8 @@ module Aws::EC2
       :vpc_id,
       :vpc_owner_id,
       :state,
-      :state_reason)
+      :state_reason,
+      :group_owner_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -67952,8 +70510,18 @@ module Aws::EC2
     #   The service state.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_ids
+    #   The IDs of the Availability Zones in which the service is available.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] availability_zones
     #   The Availability Zones in which the service is available.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
     #   @return [Array<String>]
     #
     # @!attribute [rw] acceptance_required
@@ -68018,6 +70586,7 @@ module Aws::EC2
       :service_id,
       :service_name,
       :service_state,
+      :availability_zone_ids,
       :availability_zones,
       :acceptance_required,
       :manages_vpc_endpoints,
@@ -68053,8 +70622,18 @@ module Aws::EC2
     #   The Region where the service is hosted.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_ids
+    #   The IDs of the Availability Zones in which the service is available.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] availability_zones
     #   The Availability Zones in which the service is available.
+    #
+    #   Either `AvailabilityZone` or `AvailabilityZoneId` can be specified,
+    #   but not both
     #   @return [Array<String>]
     #
     # @!attribute [rw] owner
@@ -68114,6 +70693,7 @@ module Aws::EC2
       :service_id,
       :service_type,
       :service_region,
+      :availability_zone_ids,
       :availability_zones,
       :owner,
       :base_endpoint_dns_names,
@@ -68360,8 +70940,8 @@ module Aws::EC2
     #
     # @!attribute [rw] volume_id
     #   The ID of the volume that was used to create the snapshot. Snapshots
-    #   created by the CopySnapshot action have an arbitrary volume ID that
-    #   should not be used for any purpose.
+    #   created by a copy snapshot operation have an arbitrary volume ID
+    #   that you should not use for any purpose.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -69533,6 +72113,16 @@ module Aws::EC2
     #
     # @!attribute [rw] launched_availability_zone
     #   The Availability Zone in which the request is launched.
+    #
+    #   Either `launchedAvailabilityZone` or `launchedAvailabilityZoneId`
+    #   can be specified, but not both
+    #   @return [String]
+    #
+    # @!attribute [rw] launched_availability_zone_id
+    #   The ID of the Availability Zone in which the request is launched.
+    #
+    #   Either `launchedAvailabilityZone` or `launchedAvailabilityZoneId`
+    #   can be specified, but not both
     #   @return [String]
     #
     # @!attribute [rw] product_description
@@ -69613,6 +72203,7 @@ module Aws::EC2
       :launch_group,
       :launch_specification,
       :launched_availability_zone,
+      :launched_availability_zone_id,
       :product_description,
       :spot_instance_request_id,
       :spot_price,
@@ -70163,6 +72754,10 @@ module Aws::EC2
     #   The Availability Zone.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @!attribute [rw] instance_type
     #   The instance type.
     #   @return [String]
@@ -70190,6 +72785,7 @@ module Aws::EC2
     #
     class SpotPrice < Struct.new(
       :availability_zone,
+      :availability_zone_id,
       :instance_type,
       :product_description,
       :spot_price,
@@ -70601,8 +73197,8 @@ module Aws::EC2
     # @!attribute [rw] hibernate
     #   Hibernates the instance if the instance was enabled for hibernation
     #   at launch. If the instance cannot hibernate successfully, a normal
-    #   shutdown occurs. For more information, see [Hibernate your
-    #   instance][1] in the *Amazon EC2 User Guide*.
+    #   shutdown occurs. For more information, see [Hibernate your Amazon
+    #   EC2 instance][1] in the *Amazon EC2 User Guide*.
     #
     #   Default: `false`
     #
@@ -70611,6 +73207,17 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html
     #   @return [Boolean]
     #
+    # @!attribute [rw] skip_os_shutdown
+    #   Specifies whether to bypass the graceful OS shutdown process when
+    #   the instance is stopped.
+    #
+    #   Bypassing the graceful OS shutdown might result in data loss or
+    #   corruption (for example, memory contents not flushed to disk or loss
+    #   of in-flight IOs) or skipped shutdown scripts.
+    #
+    #   Default: `false`
+    #   @return [Boolean]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
@@ -70642,6 +73249,7 @@ module Aws::EC2
     class StopInstancesRequest < Struct.new(
       :instance_ids,
       :hibernate,
+      :skip_os_shutdown,
       :dry_run,
       :force)
       SENSITIVE = []
@@ -70809,12 +73417,30 @@ module Aws::EC2
     #   The state of VPC Block Public Access (BPA).
     #   @return [Types::BlockPublicAccessStates]
     #
+    # @!attribute [rw] type
+    #   Indicates if this is a subnet used with Amazon Elastic VMware
+    #   Service (EVS). Possible values are `Elastic VMware Service` or no
+    #   value. For more information about Amazon EVS, see [ *Amazon Elastic
+    #   VMware Service API Reference* ][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/evs/latest/APIReference/Welcome.html
+    #   @return [String]
+    #
     # @!attribute [rw] subnet_id
     #   The ID of the subnet.
     #   @return [String]
     #
     # @!attribute [rw] state
     #   The current state of the subnet.
+    #
+    #   * `failed`: The underlying infrastructure to support the subnet
+    #     failed to provision as expected.
+    #
+    #   * `failed-insufficient-capacity`: The underlying infrastructure to
+    #     support the subnet failed to provision due to a shortage of EC2
+    #     instance capacity.
     #   @return [String]
     #
     # @!attribute [rw] vpc_id
@@ -70870,6 +73496,7 @@ module Aws::EC2
       :ipv_6_native,
       :private_dns_name_options_on_launch,
       :block_public_access_states,
+      :type,
       :subnet_id,
       :state,
       :vpc_id,
@@ -71565,6 +74192,21 @@ module Aws::EC2
     #   request into smaller batches.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] force
+    #   Forces the instances to terminate. The instance will first attempt a
+    #   graceful shutdown, which includes flushing file system caches and
+    #   metadata. If the graceful shutdown fails to complete within the
+    #   timeout period, the instance shuts down forcibly without flushing
+    #   the file system caches and metadata.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] skip_os_shutdown
+    #   Specifies whether to bypass the graceful OS shutdown process when
+    #   the instance is terminated.
+    #
+    #   Default: `false`
+    #   @return [Boolean]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
@@ -71576,6 +74218,8 @@ module Aws::EC2
     #
     class TerminateInstancesRequest < Struct.new(
       :instance_ids,
+      :force,
+      :skip_os_shutdown,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
@@ -72637,10 +75281,10 @@ module Aws::EC2
     #
     # @!attribute [rw] default_route_table_association
     #   Indicates whether resource attachments are automatically associated
-    #   with the default association route table. Enabled by default. If
-    #   `defaultRouteTableAssociation` is set to `enable`, Amazon Web
-    #   Services Transit Gateway will create the default transit gateway
-    #   route table.
+    #   with the default association route table. Enabled by default. Either
+    #   `defaultRouteTableAssociation` or `defaultRouteTablePropagation`
+    #   must be set to `enable` for Amazon Web Services Transit Gateway to
+    #   create the default transit gateway route table.
     #   @return [String]
     #
     # @!attribute [rw] association_default_route_table_id
@@ -72651,8 +75295,8 @@ module Aws::EC2
     #   Indicates whether resource attachments automatically propagate
     #   routes to the default propagation route table. Enabled by default.
     #   If `defaultRouteTablePropagation` is set to `enable`, Amazon Web
-    #   Services Transit Gateway will create the default transit gateway
-    #   route table.
+    #   Services Transit Gateway creates the default transit gateway route
+    #   table.
     #   @return [String]
     #
     # @!attribute [rw] propagation_default_route_table_id
@@ -75272,6 +77916,10 @@ module Aws::EC2
 
     # Describes a volume.
     #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone for the volume.
+    #   @return [String]
+    #
     # @!attribute [rw] outpost_arn
     #   The Amazon Resource Name (ARN) of the Outpost.
     #   @return [String]
@@ -75372,6 +78020,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Volume AWS API Documentation
     #
     class Volume < Struct.new(
+      :availability_zone_id,
       :outpost_arn,
       :iops,
       :tags,
@@ -75402,16 +78051,16 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] associated_resource
-    #   The ARN of the Amazon ECS or Fargate task to which the volume is
-    #   attached.
+    #   The ARN of the Amazon Web Services-managed resource to which the
+    #   volume is attached.
     #   @return [String]
     #
     # @!attribute [rw] instance_owning_service
-    #   The service principal of Amazon Web Services service that owns the
-    #   underlying instance to which the volume is attached.
+    #   The service principal of the Amazon Web Services service that owns
+    #   the underlying resource to which the volume is attached.
     #
     #   This parameter is returned only for volumes that are attached to
-    #   Fargate tasks.
+    #   Amazon Web Services-managed resources.
     #   @return [String]
     #
     # @!attribute [rw] volume_id
@@ -75421,15 +78070,15 @@ module Aws::EC2
     # @!attribute [rw] instance_id
     #   The ID of the instance.
     #
-    #   If the volume is attached to a Fargate task, this parameter returns
-    #   `null`.
+    #   If the volume is attached to an Amazon Web Services-managed
+    #   resource, this parameter returns `null`.
     #   @return [String]
     #
     # @!attribute [rw] device
     #   The device name.
     #
-    #   If the volume is attached to a Fargate task, this parameter returns
-    #   `null`.
+    #   If the volume is attached to an Amazon Web Services-managed
+    #   resource, this parameter returns `null`.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -75610,6 +78259,21 @@ module Aws::EC2
     #
     # @!attribute [rw] name
     #   The name of the volume status.
+    #
+    #   * `io-enabled` - Indicates the volume I/O status. For more
+    #     information, see [Amazon EBS volume status checks][1].
+    #
+    #   * `io-performance` - Indicates the volume performance status. For
+    #     more information, see [Amazon EBS volume status checks][1].
+    #
+    #   * `initialization-state` - Indicates the status of the volume
+    #     initialization process. For more information, see [Initialize
+    #     Amazon EBS volumes][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/monitoring-volume-checks.html
+    #   [2]: https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -75713,6 +78377,24 @@ module Aws::EC2
     #   Information about the instances to which the volume is attached.
     #   @return [Array<Types::VolumeStatusAttachmentStatus>]
     #
+    # @!attribute [rw] initialization_status_details
+    #   Information about the volume initialization. It can take up to 5
+    #   minutes for the volume initialization information to be updated.
+    #
+    #   Only available for volumes created from snapshots. Not available for
+    #   empty volumes created without a snapshot.
+    #
+    #   For more information, see [ Initialize Amazon EBS volumes][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html
+    #   @return [Types::InitializationStatusDetails]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VolumeStatusItem AWS API Documentation
     #
     class VolumeStatusItem < Struct.new(
@@ -75722,7 +78404,9 @@ module Aws::EC2
       :events,
       :volume_id,
       :volume_status,
-      :attachment_statuses)
+      :attachment_statuses,
+      :initialization_status_details,
+      :availability_zone_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -76626,6 +79310,11 @@ module Aws::EC2
     #   Information about the VPN tunnel.
     #   @return [Array<Types::VgwTelemetry>]
     #
+    # @!attribute [rw] pre_shared_key_arn
+    #   The Amazon Resource Name (ARN) of the Secrets Manager secret storing
+    #   the pre-shared key(s) for the VPN connection.
+    #   @return [String]
+    #
     # @!attribute [rw] vpn_connection_id
     #   The ID of the VPN connection.
     #   @return [String]
@@ -76667,6 +79356,7 @@ module Aws::EC2
       :routes,
       :tags,
       :vgw_telemetry,
+      :pre_shared_key_arn,
       :vpn_connection_id,
       :state,
       :customer_gateway_configuration,
@@ -76746,7 +79436,7 @@ module Aws::EC2
     #   The type of IPv4 address assigned to the outside interface of the
     #   customer gateway.
     #
-    #   Valid values: `PrivateIpv4` \| `PublicIpv4`
+    #   Valid values: `PrivateIpv4` \| `PublicIpv4` \| `Ipv6`
     #
     #   Default: `PublicIpv4`
     #   @return [String]
@@ -76825,10 +79515,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] outside_ip_address_type
-    #   The type of IPv4 address assigned to the outside interface of the
+    #   The type of IP address assigned to the outside interface of the
     #   customer gateway device.
     #
-    #   Valid values: `PrivateIpv4` \| `PublicIpv4`
+    #   Valid values: `PrivateIpv4` \| `PublicIpv4` \| `Ipv6`
     #
     #   Default: `PublicIpv4`
     #   @return [String]