aws-sdk-ec2 1.265.0 → 1.269.0

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

@@ -430,7 +430,8 @@ module Aws::EC2
     #
     # @!attribute [rw] network_border_group
     #   The name of the unique set of Availability Zones, Local Zones, or
-    #   Wavelength Zones from which AWS advertises IP addresses.
+    #   Wavelength Zones from which Amazon Web Services advertises IP
+    #   addresses.
     #   @return [String]
     #
     # @!attribute [rw] customer_owned_ip
@@ -584,24 +585,20 @@ module Aws::EC2
     #
     # @!attribute [rw] network_border_group
     #   A unique set of Availability Zones, Local Zones, or Wavelength Zones
-    #   from which AWS advertises IP addresses. Use this parameter to limit
-    #   the IP address to this location. IP addresses cannot move between
-    #   network border groups.
+    #   from which Amazon Web Services advertises IP addresses. Use this
+    #   parameter to limit the IP address to this location. IP addresses
+    #   cannot move between network border groups.
     #
     #   Use [DescribeAvailabilityZones][1] to view the network border
     #   groups.
     #
-    #   <note markdown="1"> You cannot use a network border group with EC2 Classic. If you
-    #   attempt this operation on EC2 classic, you will receive an
-    #   `InvalidParameterCombination` error. For more information, see
-    #   [Error Codes][2].
-    #
-    #    </note>
+    #   You cannot use a network border group with EC2 Classic. If you
+    #   attempt this operation on EC2 Classic, you receive an
+    #   `InvalidParameterCombination` error.
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html
     #   @return [String]
     #
     # @!attribute [rw] customer_owned_ipv_4_pool
@@ -651,7 +648,7 @@ module Aws::EC2
     #
     # @!attribute [rw] network_border_group
     #   The set of Availability Zones, Local Zones, or Wavelength Zones from
-    #   which AWS advertises IP addresses.
+    #   which Amazon Web Services advertises IP addresses.
     #   @return [String]
     #
     # @!attribute [rw] domain
@@ -3335,6 +3332,72 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes a Capacity Reservation Fleet cancellation error.
+    #
+    # @!attribute [rw] code
+    #   The error code.
+    #   @return [String]
+    #
+    # @!attribute [rw] message
+    #   The error message.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CancelCapacityReservationFleetError AWS API Documentation
+    #
+    class CancelCapacityReservationFleetError < Struct.new(
+      :code,
+      :message)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass CancelCapacityReservationFleetsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         dry_run: false,
+    #         capacity_reservation_fleet_ids: ["CapacityReservationFleetId"], # required
+    #       }
+    #
+    # @!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] capacity_reservation_fleet_ids
+    #   The IDs of the Capacity Reservation Fleets to cancel.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CancelCapacityReservationFleetsRequest AWS API Documentation
+    #
+    class CancelCapacityReservationFleetsRequest < Struct.new(
+      :dry_run,
+      :capacity_reservation_fleet_ids)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] successful_fleet_cancellations
+    #   Information about the Capacity Reservation Fleets that were
+    #   successfully cancelled.
+    #   @return [Array<Types::CapacityReservationFleetCancellationState>]
+    #
+    # @!attribute [rw] failed_fleet_cancellations
+    #   Information about the Capacity Reservation Fleets that could not be
+    #   cancelled.
+    #   @return [Array<Types::FailedCapacityReservationFleetCancellationResult>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CancelCapacityReservationFleetsResult AWS API Documentation
+    #
+    class CancelCapacityReservationFleetsResult < Struct.new(
+      :successful_fleet_cancellations,
+      :failed_fleet_cancellations)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CancelCapacityReservationRequest
     #   data as a hash:
     #
@@ -3849,6 +3912,12 @@ module Aws::EC2
     #   Reservation was created.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_reservation_fleet_id
+    #   The ID of the Capacity Reservation Fleet to which the Capacity
+    #   Reservation belongs. Only valid for Capacity Reservations that were
+    #   created by a Capacity Reservation Fleet.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservation AWS API Documentation
     #
     class CapacityReservation < Struct.new(
@@ -3871,7 +3940,172 @@ module Aws::EC2
       :instance_match_criteria,
       :create_date,
       :tags,
-      :outpost_arn)
+      :outpost_arn,
+      :capacity_reservation_fleet_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Information about a Capacity Reservation Fleet.
+    #
+    # @!attribute [rw] capacity_reservation_fleet_id
+    #   The ID of the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_fleet_arn
+    #   The ARN of the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The state of the Capacity Reservation Fleet. Possible states
+    #   include:
+    #
+    #   * `submitted` - The Capacity Reservation Fleet request has been
+    #     submitted and Amazon Elastic Compute Cloud is preparing to create
+    #     the Capacity Reservations.
+    #
+    #   * `modifying` - The Capacity Reservation Fleet is being modified.
+    #     The Fleet remains in this state until the modification is
+    #     complete.
+    #
+    #   * `active` - The Capacity Reservation Fleet has fulfilled its total
+    #     target capacity and it is attempting to maintain this capacity.
+    #     The Fleet remains in this state until it is modified or deleted.
+    #
+    #   * `partially_fulfilled` - The Capacity Reservation Fleet has
+    #     partially fulfilled its total target capacity. There is
+    #     insufficient Amazon EC2 to fulfill the total target capacity. The
+    #     Fleet is attempting to asynchronously fulfill its total target
+    #     capacity.
+    #
+    #   * `expiring` - The Capacity Reservation Fleet has reach its end date
+    #     and it is in the process of expiring. One or more of its Capacity
+    #     reservations might still be active.
+    #
+    #   * `expired` - The Capacity Reservation Fleet has reach its end date.
+    #     The Fleet and its Capacity Reservations are expired. The Fleet
+    #     can't create new Capacity Reservations.
+    #
+    #   * `cancelling` - The Capacity Reservation Fleet is in the process of
+    #     being cancelled. One or more of its Capacity reservations might
+    #     still be active.
+    #
+    #   * `cancelled` - The Capacity Reservation Fleet has been manually
+    #     cancelled. The Fleet and its Capacity Reservations are cancelled
+    #     and the Fleet can't create new Capacity Reservations.
+    #
+    #   * `failed` - The Capacity Reservation Fleet failed to reserve
+    #     capacity for the specified instance types.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_target_capacity
+    #   The total number of capacity units for which the Capacity
+    #   Reservation Fleet reserves capacity. For more information, see
+    #   [Total target capacity][1] in the Amazon EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#target-capacity
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_fulfilled_capacity
+    #   The capacity units that have been fulfilled.
+    #   @return [Float]
+    #
+    # @!attribute [rw] tenancy
+    #   The tenancy of the Capacity Reservation Fleet. Tenancies include:
+    #
+    #   * `default` - The Capacity Reservation Fleet is created on hardware
+    #     that is shared with other Amazon Web Services accounts.
+    #
+    #   * `dedicated` - The Capacity Reservation Fleet is created on
+    #     single-tenant hardware that is dedicated to a single Amazon Web
+    #     Services account.
+    #   @return [String]
+    #
+    # @!attribute [rw] end_date
+    #   The date and time at which the Capacity Reservation Fleet expires.
+    #   @return [Time]
+    #
+    # @!attribute [rw] create_time
+    #   The date and time at which the Capacity Reservation Fleet was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] instance_match_criteria
+    #   Indicates the type of instance launches that the Capacity
+    #   Reservation Fleet accepts. All Capacity Reservations in the Fleet
+    #   inherit this instance matching criteria.
+    #
+    #   Currently, Capacity Reservation Fleets support `open` instance
+    #   matching criteria only. This means that instances that have matching
+    #   attributes (instance type, platform, and Availability Zone) run in
+    #   the Capacity Reservations automatically. Instances do not need to
+    #   explicitly target a Capacity Reservation Fleet to use its reserved
+    #   capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] allocation_strategy
+    #   The strategy used by the Capacity Reservation Fleet to determine
+    #   which of the specified instance types to use. For more information,
+    #   see For more information, see [ Allocation strategy][1] in the
+    #   Amazon EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#allocation-strategy
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_type_specifications
+    #   Information about the instance types for which to reserve the
+    #   capacity.
+    #   @return [Array<Types::FleetCapacityReservation>]
+    #
+    # @!attribute [rw] tags
+    #   The tags assigned to the Capacity Reservation Fleet.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationFleet AWS API Documentation
+    #
+    class CapacityReservationFleet < Struct.new(
+      :capacity_reservation_fleet_id,
+      :capacity_reservation_fleet_arn,
+      :state,
+      :total_target_capacity,
+      :total_fulfilled_capacity,
+      :tenancy,
+      :end_date,
+      :create_time,
+      :instance_match_criteria,
+      :allocation_strategy,
+      :instance_type_specifications,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Describes a Capacity Reservation Fleet that was successfully
+    # cancelled.
+    #
+    # @!attribute [rw] current_fleet_state
+    #   The current state of the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] previous_fleet_state
+    #   The previous state of the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_fleet_id
+    #   The ID of the Capacity Reservation Fleet that was successfully
+    #   cancelled.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationFleetCancellationState AWS API Documentation
+    #
+    class CapacityReservationFleetCancellationState < Struct.new(
+      :current_fleet_state,
+      :previous_fleet_state,
+      :capacity_reservation_fleet_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4925,11 +5159,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] aws_account_id
-    #   The AWS account ID.
+    #   The Amazon Web Services account ID.
     #   @return [String]
     #
     # @!attribute [rw] aws_service
-    #   The AWS service.
+    #   The Amazon Web Services service.
     #   @return [String]
     #
     # @!attribute [rw] co_ip
@@ -5230,7 +5464,7 @@ module Aws::EC2
     # @!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].
+    #   idempotency][1].
     #
     #
     #
@@ -5622,6 +5856,218 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateCapacityReservationFleetRequest
+    #   data as a hash:
+    #
+    #       {
+    #         allocation_strategy: "String",
+    #         client_token: "String",
+    #         instance_type_specifications: [ # required
+    #           {
+    #             instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
+    #             instance_platform: "Linux/UNIX", # accepts Linux/UNIX, Red Hat Enterprise Linux, SUSE Linux, Windows, Windows with SQL Server, Windows with SQL Server Enterprise, Windows with SQL Server Standard, Windows with SQL Server Web, Linux with SQL Server Standard, Linux with SQL Server Web, Linux with SQL Server Enterprise
+    #             weight: 1.0,
+    #             availability_zone: "String",
+    #             availability_zone_id: "String",
+    #             ebs_optimized: false,
+    #             priority: 1,
+    #           },
+    #         ],
+    #         tenancy: "default", # accepts default
+    #         total_target_capacity: 1, # required
+    #         end_date: Time.now,
+    #         instance_match_criteria: "open", # accepts open
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "capacity-reservation", # accepts capacity-reservation, client-vpn-endpoint, customer-gateway, carrier-gateway, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, instance-event-window, internet-gateway, ipv4pool-ec2, ipv6pool-ec2, key-pair, launch-template, local-gateway, local-gateway-route-table, local-gateway-virtual-interface, local-gateway-virtual-interface-group, local-gateway-route-table-vpc-association, local-gateway-route-table-virtual-interface-group-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, placement-group, prefix-list, replace-root-volume-task, reserved-instances, route-table, security-group, security-group-rule, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-endpoint, vpc-endpoint-service, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] allocation_strategy
+    #   The strategy used by the Capacity Reservation Fleet to determine
+    #   which of the specified instance types to use. Currently, only the
+    #   `prioritized` allocation strategy is supported. For more
+    #   information, see [ Allocation strategy][1] in the Amazon EC2 User
+    #   Guide.
+    #
+    #   Valid values: `prioritized`
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#allocation-strategy
+    #   @return [String]
+    #
+    # @!attribute [rw] client_token
+    #   Unique, case-sensitive identifier that you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensure
+    #   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] instance_type_specifications
+    #   Information about the instance types for which to reserve the
+    #   capacity.
+    #   @return [Array<Types::ReservationFleetInstanceSpecification>]
+    #
+    # @!attribute [rw] tenancy
+    #   Indicates the tenancy of the Capacity Reservation Fleet. All
+    #   Capacity Reservations in the Fleet inherit this tenancy. The
+    #   Capacity Reservation Fleet can have one of the following tenancy
+    #   settings:
+    #
+    #   * `default` - The Capacity Reservation Fleet is created on hardware
+    #     that is shared with other Amazon Web Services accounts.
+    #
+    #   * `dedicated` - The Capacity Reservations are created on
+    #     single-tenant hardware that is dedicated to a single Amazon Web
+    #     Services account.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_target_capacity
+    #   The total number of capacity units to be reserved by the Capacity
+    #   Reservation Fleet. This value, together with the instance type
+    #   weights that you assign to each instance type used by the Fleet
+    #   determine the number of instances for which the Fleet reserves
+    #   capacity. Both values are based on units that make sense for your
+    #   workload. For more information, see [ Total target capacity][1] in
+    #   the Amazon EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#target-capacity
+    #   @return [Integer]
+    #
+    # @!attribute [rw] end_date
+    #   The date and time at which the Capacity Reservation Fleet expires.
+    #   When the Capacity Reservation Fleet expires, its state changes to
+    #   `expired` and all of the Capacity Reservations in the Fleet expire.
+    #
+    #   The Capacity Reservation Fleet expires within an hour after the
+    #   specified time. For example, if you specify `5/31/2019`, `13:30:55`,
+    #   the Capacity Reservation Fleet is guaranteed to expire between
+    #   `13:30:55` and `14:30:55` on `5/31/2019`.
+    #   @return [Time]
+    #
+    # @!attribute [rw] instance_match_criteria
+    #   Indicates the type of instance launches that the Capacity
+    #   Reservation Fleet accepts. All Capacity Reservations in the Fleet
+    #   inherit this instance matching criteria.
+    #
+    #   Currently, Capacity Reservation Fleets support `open` instance
+    #   matching criteria only. This means that instances that have matching
+    #   attributes (instance type, platform, and Availability Zone) run in
+    #   the Capacity Reservations automatically. Instances do not need to
+    #   explicitly target a Capacity Reservation Fleet to use its reserved
+    #   capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_specifications
+    #   The tags to assign to the Capacity Reservation Fleet. The tags are
+    #   automatically assigned to the Capacity Reservations in the Fleet.
+    #   @return [Array<Types::TagSpecification>]
+    #
+    # @!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/CreateCapacityReservationFleetRequest AWS API Documentation
+    #
+    class CreateCapacityReservationFleetRequest < Struct.new(
+      :allocation_strategy,
+      :client_token,
+      :instance_type_specifications,
+      :tenancy,
+      :total_target_capacity,
+      :end_date,
+      :instance_match_criteria,
+      :tag_specifications,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] capacity_reservation_fleet_id
+    #   The ID of the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The status of the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_target_capacity
+    #   The total number of capacity units for which the Capacity
+    #   Reservation Fleet reserves capacity.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_fulfilled_capacity
+    #   The requested capacity units that have been successfully reserved.
+    #   @return [Float]
+    #
+    # @!attribute [rw] instance_match_criteria
+    #   The instance matching criteria for the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] allocation_strategy
+    #   The allocation strategy used by the Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] create_time
+    #   The date and time at which the Capacity Reservation Fleet was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] end_date
+    #   The date and time at which the Capacity Reservation Fleet expires.
+    #   @return [Time]
+    #
+    # @!attribute [rw] tenancy
+    #   Indicates the tenancy of Capacity Reservation Fleet.
+    #   @return [String]
+    #
+    # @!attribute [rw] fleet_capacity_reservations
+    #   Information about the individual Capacity Reservations in the
+    #   Capacity Reservation Fleet.
+    #   @return [Array<Types::FleetCapacityReservation>]
+    #
+    # @!attribute [rw] tags
+    #   The tags assigned to the Capacity Reservation Fleet.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateCapacityReservationFleetResult AWS API Documentation
+    #
+    class CreateCapacityReservationFleetResult < Struct.new(
+      :capacity_reservation_fleet_id,
+      :state,
+      :total_target_capacity,
+      :total_fulfilled_capacity,
+      :instance_match_criteria,
+      :allocation_strategy,
+      :create_time,
+      :end_date,
+      :tenancy,
+      :fleet_capacity_reservations,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateCapacityReservationRequest
     #   data as a hash:
     #
@@ -6947,8 +7393,8 @@ module Aws::EC2
     #   specify at least one field.
     #
     #   Specify the fields using the `$\{field-id\}` format, separated by
-    #   spaces. For the CLI, use single quotation marks (' ') to surround
-    #   the parameter value.
+    #   spaces. For the CLI, surround this parameter value with single
+    #   quotes on Linux or double quotes on Windows.
     #
     #
     #
@@ -8006,8 +8452,8 @@ module Aws::EC2
     #       {
     #         destination_cidr_block: "String", # required
     #         local_gateway_route_table_id: "LocalGatewayRoutetableId", # required
-    #         dry_run: false,
     #         local_gateway_virtual_interface_group_id: "LocalGatewayVirtualInterfaceGroupId", # required
+    #         dry_run: false,
     #       }
     #
     # @!attribute [rw] destination_cidr_block
@@ -8019,6 +8465,10 @@ module Aws::EC2
     #   The ID of the local gateway route table.
     #   @return [String]
     #
+    # @!attribute [rw] local_gateway_virtual_interface_group_id
+    #   The ID of the virtual interface group.
+    #   @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.
@@ -8026,17 +8476,13 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
-    # @!attribute [rw] local_gateway_virtual_interface_group_id
-    #   The ID of the virtual interface group.
-    #   @return [String]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateLocalGatewayRouteRequest AWS API Documentation
     #
     class CreateLocalGatewayRouteRequest < Struct.new(
       :destination_cidr_block,
       :local_gateway_route_table_id,
-      :dry_run,
-      :local_gateway_virtual_interface_group_id)
+      :local_gateway_virtual_interface_group_id,
+      :dry_run)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -9820,11 +10266,11 @@ module Aws::EC2
     #         ],
     #         availability_zone: "String",
     #         availability_zone_id: "String",
+    #         cidr_block: "String", # required
     #         ipv_6_cidr_block: "String",
     #         outpost_arn: "String",
     #         vpc_id: "VpcId", # required
     #         dry_run: false,
-    #         cidr_block: "String", # required
     #       }
     #
     # @!attribute [rw] tag_specifications
@@ -9855,6 +10301,13 @@ module Aws::EC2
     #   The AZ ID or the Local Zone ID of the subnet.
     #   @return [String]
     #
+    # @!attribute [rw] cidr_block
+    #   The IPv4 network range for the subnet, in CIDR notation. For
+    #   example, `10.0.0.0/24`. We modify the specified CIDR block to its
+    #   canonical form; for example, if you specify `100.68.0.18/18`, we
+    #   modify it to `100.68.0.0/18`.
+    #   @return [String]
+    #
     # @!attribute [rw] ipv_6_cidr_block
     #   The IPv6 network range for the subnet, in CIDR notation. The subnet
     #   size must use a /64 prefix length.
@@ -9877,24 +10330,17 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
-    # @!attribute [rw] cidr_block
-    #   The IPv4 network range for the subnet, in CIDR notation. For
-    #   example, `10.0.0.0/24`. We modify the specified CIDR block to its
-    #   canonical form; for example, if you specify `100.68.0.18/18`, we
-    #   modify it to `100.68.0.0/18`.
-    #   @return [String]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateSubnetRequest AWS API Documentation
     #
     class CreateSubnetRequest < Struct.new(
       :tag_specifications,
       :availability_zone,
       :availability_zone_id,
+      :cidr_block,
       :ipv_6_cidr_block,
       :outpost_arn,
       :vpc_id,
-      :dry_run,
-      :cidr_block)
+      :dry_run)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -9992,8 +10438,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
@@ -10020,8 +10466,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -10066,7 +10512,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] traffic_direction
-    #   The type of traffic (`ingress` \| `egress`).
+    #   The type of traffic.
     #   @return [String]
     #
     # @!attribute [rw] rule_number
@@ -10076,7 +10522,7 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] rule_action
-    #   The action to take (`accept` \| `reject`) on the filtered traffic.
+    #   The action to take on the filtered traffic.
     #   @return [String]
     #
     # @!attribute [rw] destination_port_range
@@ -10119,8 +10565,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
@@ -10155,8 +10601,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -10258,8 +10704,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
@@ -10292,8 +10738,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -10357,8 +10803,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
@@ -10387,8 +10833,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -11444,8 +11890,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -11559,8 +12005,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -11679,8 +12125,8 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
-    #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1].
+    #   idempotency of the request. For more information, see [How to ensure
+    #   idempotency][1].
     #
     #
     #
@@ -15309,6 +15755,91 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeCapacityReservationFleetsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         capacity_reservation_fleet_ids: ["CapacityReservationFleetId"],
+    #         next_token: "String",
+    #         max_results: 1,
+    #         filters: [
+    #           {
+    #             name: "String",
+    #             values: ["String"],
+    #           },
+    #         ],
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] capacity_reservation_fleet_ids
+    #   The IDs of the Capacity Reservation Fleets to describe.
+    #   @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 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] filters
+    #   One or more filters.
+    #
+    #   * `state` - The state of the Fleet (`submitted` \| `modifying` \|
+    #     `active` \| `partially_fulfilled` \| `expiring` \| `expired` \|
+    #     `cancelling` \| `cancelled` \| `failed`).
+    #
+    #   * `instance-match-criteria` - The instance matching criteria for the
+    #     Fleet. Only `open` is supported.
+    #
+    #   * `tenancy` - The tenancy of the Fleet (`default` \| `dedicated`).
+    #
+    #   * `allocation-strategy` - The allocation strategy used by the Fleet.
+    #     Only `prioritized` is supported.
+    #   @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/DescribeCapacityReservationFleetsRequest AWS API Documentation
+    #
+    class DescribeCapacityReservationFleetsRequest < Struct.new(
+      :capacity_reservation_fleet_ids,
+      :next_token,
+      :max_results,
+      :filters,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] capacity_reservation_fleets
+    #   Information about the Capacity Reservation Fleets.
+    #   @return [Array<Types::CapacityReservationFleet>]
+    #
+    # @!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/DescribeCapacityReservationFleetsResult AWS API Documentation
+    #
+    class DescribeCapacityReservationFleetsResult < Struct.new(
+      :capacity_reservation_fleets,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeCapacityReservationsRequest
     #   data as a hash:
     #
@@ -17302,9 +17833,10 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] owners
-    #   Filters the AFI by owner. Specify an AWS account ID, `self` (owner
-    #   is the sender of the request), or an AWS owner alias (valid values
-    #   are `amazon` \| `aws-marketplace`).
+    #   Filters the AFI by owner. Specify an Amazon Web Services account ID,
+    #   `self` (owner is the sender of the request), or an Amazon Web
+    #   Services owner alias (valid values are `amazon` \|
+    #   `aws-marketplace`).
     #   @return [Array<String>]
     #
     # @!attribute [rw] filters
@@ -17319,12 +17851,12 @@ module Aws::EC2
     #
     #   * `name` - The name of the AFI.
     #
-    #   * `owner-id` - The AWS account ID of the AFI owner.
+    #   * `owner-id` - The Amazon Web Services account ID of the AFI owner.
     #
     #   * `product-code` - The product code.
     #
-    #   * `shell-version` - The version of the AWS Shell that was used to
-    #     create the bitstream.
+    #   * `shell-version` - The version of the Amazon Web Services Shell
+    #     that was used to create the bitstream.
     #
     #   * `state` - The state of the AFI (`pending` \| `failed` \|
     #     `available` \| `unavailable`).
@@ -18727,9 +19259,12 @@ module Aws::EC2
     #   * `instance-storage-info.disk.type` - The storage technology for the
     #     local instance storage disks (`hdd` \| `ssd`).
     #
+    #   * `instance-storage-info.encryption-supported` - Indicates whether
+    #     data is encrypted at rest (`required` \| `unsupported`).
+    #
     #   * `instance-storage-info.nvme-support` - Indicates whether
     #     non-volatile memory express (NVMe) is supported for instance store
-    #     (`required` \| `supported`) \| `unsupported`).
+    #     (`required` \| `supported` \| `unsupported`).
     #
     #   * `instance-storage-info.total-size-in-gb` - The total amount of
     #     storage available from all local instance storage, in GB.
@@ -25502,8 +26037,8 @@ module Aws::EC2
     #
     #   * `service-id` - The ID of the service.
     #
-    #   * `vpc-endpoint-owner` - The AWS account number of the owner of the
-    #     endpoint.
+    #   * `vpc-endpoint-owner` - The ID of the Amazon Web Services account
+    #     ID that owns the endpoint.
     #
     #   * `vpc-endpoint-state` - The state of the endpoint
     #     (`pendingAcceptance` \| `pending` \| `available` \| `deleting` \|
@@ -27743,7 +28278,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes the disk.
+    # Describes a disk.
     #
     # @!attribute [rw] size_in_gb
     #   The size of the disk in GB.
@@ -28898,71 +29433,91 @@ module Aws::EC2
     # @!attribute [rw] event_sub_type
     #   The event.
     #
-    #   The following are the `error` events:
+    #   `error` events:
     #
-    #   * `iamFleetRoleInvalid` - The EC2 Fleet or Spot Fleet did not have
+    #   * `iamFleetRoleInvalid` - The EC2 Fleet or Spot Fleet does not have
     #     the required permissions either to launch or terminate an
     #     instance.
     #
-    #   * `spotFleetRequestConfigurationInvalid` - The configuration is not
-    #     valid. For more information, see the description of the event.
+    #   * `allLaunchSpecsTemporarilyBlacklisted` - None of the
+    #     configurations are valid, and several attempts to launch instances
+    #     have failed. For more information, see the description of the
+    #     event.
     #
     #   * `spotInstanceCountLimitExceeded` - You've reached the limit on
     #     the number of Spot Instances that you can launch.
     #
-    #   The following are the `fleetRequestChange` events:
+    #   * `spotFleetRequestConfigurationInvalid` - The configuration is not
+    #     valid. For more information, see the description of the event.
+    #
+    #   `fleetRequestChange` events:
     #
     #   * `active` - The EC2 Fleet or Spot Fleet request has been validated
     #     and Amazon EC2 is attempting to maintain the target number of
-    #     running Spot Instances.
+    #     running instances.
     #
     #   * `cancelled` - The EC2 Fleet or Spot Fleet request is canceled and
-    #     has no running Spot Instances. The EC2 Fleet or Spot Fleet will be
-    #     deleted two days after its instances were terminated.
+    #     has no running instances. The EC2 Fleet or Spot Fleet will be
+    #     deleted two days after its instances are terminated.
     #
     #   * `cancelled_running` - The EC2 Fleet or Spot Fleet request is
-    #     canceled and does not launch additional Spot Instances. Existing
-    #     Spot Instances continue to run until they are interrupted or
-    #     terminated.
+    #     canceled and does not launch additional instances. Its existing
+    #     instances continue to run until they are interrupted or
+    #     terminated. The request remains in this state until all instances
+    #     are interrupted or terminated.
     #
     #   * `cancelled_terminating` - The EC2 Fleet or Spot Fleet request is
-    #     canceled and its Spot Instances are terminating.
+    #     canceled and its instances are terminating. The request remains in
+    #     this state until all instances are terminated.
     #
-    #   * `expired` - The EC2 Fleet or Spot Fleet request has expired. A
-    #     subsequent event indicates that the instances were terminated, if
+    #   * `expired` - The EC2 Fleet or Spot Fleet request has expired. If
     #     the request was created with `TerminateInstancesWithExpiration`
-    #     set.
+    #     set, a subsequent `terminated` event indicates that the instances
+    #     are terminated.
     #
-    #   * `modify_in_progress` - A request to modify the EC2 Fleet or Spot
-    #     Fleet request was accepted and is in progress.
+    #   * `modify_in_progress` - The EC2 Fleet or Spot Fleet request is
+    #     being modified. The request remains in this state until the
+    #     modification is fully processed.
     #
     #   * `modify_succeeded` - The EC2 Fleet or Spot Fleet request was
     #     modified.
     #
     #   * `submitted` - The EC2 Fleet or Spot Fleet request is being
     #     evaluated and Amazon EC2 is preparing to launch the target number
-    #     of Spot Instances.
+    #     of instances.
     #
-    #   The following are the `instanceChange` events:
+    #   * `progress` - The EC2 Fleet or Spot Fleet request is in the process
+    #     of being fulfilled.
     #
-    #   * `launched` - A request was fulfilled and a new instance was
-    #     launched.
+    #   `instanceChange` events:
+    #
+    #   * `launched` - A new instance was launched.
     #
     #   * `terminated` - An instance was terminated by the user.
     #
-    #   The following are the `Information` events:
+    #   * `termination_notified` - An instance termination notification was
+    #     sent when a Spot Instance was terminated by Amazon EC2 during
+    #     scale-down, when the target capacity of the fleet was modified
+    #     down, for example, from a target capacity of 4 to a target
+    #     capacity of 3.
+    #
+    #   `Information` events:
+    #
+    #   * `fleetProgressHalted` - The price in every launch specification is
+    #     not valid because it is below the Spot price (all the launch
+    #     specifications have produced `launchSpecUnusable` events). A
+    #     launch specification might become valid if the Spot price changes.
     #
     #   * `launchSpecTemporarilyBlacklisted` - The configuration is not
     #     valid and several attempts to launch instances have failed. For
     #     more information, see the description of the event.
     #
     #   * `launchSpecUnusable` - The price in a launch specification is not
-    #     valid because it is below the Spot price or the Spot price is
-    #     above the On-Demand price.
+    #     valid because it is below the Spot price.
     #
-    #   * `fleetProgressHalted` - The price in every launch specification is
-    #     not valid. A launch specification might become valid if the Spot
-    #     price changes.
+    #   * `registerWithLoadBalancersFailed` - An attempt to register
+    #     instances with load balancers failed. For more information, see
+    #     the description of the event.
     #   @return [String]
     #
     # @!attribute [rw] instance_id
@@ -29752,6 +30307,26 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes a Capacity Reservation Fleet that could not be cancelled.
+    #
+    # @!attribute [rw] capacity_reservation_fleet_id
+    #   The ID of the Capacity Reservation Fleet that could not be
+    #   cancelled.
+    #   @return [String]
+    #
+    # @!attribute [rw] cancel_capacity_reservation_fleet_error
+    #   Information about the Capacity Reservation Fleet cancellation error.
+    #   @return [Types::CancelCapacityReservationFleetError]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FailedCapacityReservationFleetCancellationResult AWS API Documentation
+    #
+    class FailedCapacityReservationFleetCancellationResult < Struct.new(
+      :capacity_reservation_fleet_id,
+      :cancel_capacity_reservation_fleet_error)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a Reserved Instance whose queued purchase was not deleted.
     #
     # @!attribute [rw] error
@@ -29850,6 +30425,95 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Information about a Capacity Reservation in a Capacity Reservation
+    # Fleet.
+    #
+    # @!attribute [rw] capacity_reservation_id
+    #   The ID of the Capacity Reservation.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone in which the Capacity Reservation
+    #   reserves capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_type
+    #   The instance type for which the Capacity Reservation reserves
+    #   capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_platform
+    #   The type of operating system for which the Capacity Reservation
+    #   reserves capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone
+    #   The Availability Zone in which the Capacity Reservation reserves
+    #   capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_instance_count
+    #   The total number of instances for which the Capacity Reservation
+    #   reserves capacity.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] fulfilled_capacity
+    #   The number of capacity units fulfilled by the Capacity Reservation.
+    #   For more information, see [ Total target capacity][1] in the Amazon
+    #   EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#target-capacity
+    #   @return [Float]
+    #
+    # @!attribute [rw] ebs_optimized
+    #   Indicates whether the Capacity Reservation reserves capacity for
+    #   EBS-optimized instance types.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] create_date
+    #   The date and time at which the Capacity Reservation was created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] weight
+    #   The weight of the instance type in the Capacity Reservation Fleet.
+    #   For more information, see [ Instance type weight][1] in the Amazon
+    #   EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#instance-weight
+    #   @return [Float]
+    #
+    # @!attribute [rw] priority
+    #   The priority of the instance type in the Capacity Reservation Fleet.
+    #   For more information, see [ Instance type priority][1] in the Amazon
+    #   EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#instance-priority
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetCapacityReservation AWS API Documentation
+    #
+    class FleetCapacityReservation < Struct.new(
+      :capacity_reservation_id,
+      :availability_zone_id,
+      :instance_type,
+      :instance_platform,
+      :availability_zone,
+      :total_instance_count,
+      :fulfilled_capacity,
+      :ebs_optimized,
+      :create_date,
+      :weight,
+      :priority)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes an EC2 Fleet.
     #
     # @!attribute [rw] activity_status
@@ -30599,7 +31263,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] shell_version
-    #   The version of the AWS Shell that was used to create the bitstream.
+    #   The version of the Amazon Web Services Shell that was used to create
+    #   the bitstream.
     #   @return [String]
     #
     # @!attribute [rw] pci_id
@@ -30619,7 +31284,7 @@ module Aws::EC2
     #   @return [Time]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID of the AFI owner.
+    #   The ID of the Amazon Web Services account that owns the AFI.
     #   @return [String]
     #
     # @!attribute [rw] owner_alias
@@ -33673,13 +34338,12 @@ module Aws::EC2
     #   @return [Array<Types::TagSpecification>]
     #
     # @!attribute [rw] usage_operation
-    #   The usage operation value. For more information, see [AMI billing
-    #   information fields][1] in the *Amazon Elastic Compute Cloud User
-    #   Guide*.
+    #   The usage operation value. For more information, see [Licensing
+    #   options][1] in the *VM Import/Export User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html
+    #   [1]: https://docs.aws.amazon.com/vm-import/latest/userguide/vmie_prereqs.html#prerequisites
     #   @return [String]
     #
     # @!attribute [rw] boot_mode
@@ -35579,14 +36243,11 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] http_endpoint
-    #   This parameter enables or disables the HTTP metadata endpoint on
-    #   your instances. If the parameter is not specified, the default state
-    #   is `enabled`.
+    #   Enables or disables the HTTP metadata endpoint on your instances. If
+    #   the parameter is not specified, the default state is `enabled`.
     #
-    #   <note markdown="1"> If you specify a value of `disabled`, you will not be able to access
+    #   If you specify a value of `disabled`, you will not be able to access
     #   your instance metadata.
-    #
-    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] http_protocol_ipv_6
@@ -35646,19 +36307,13 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] http_endpoint
-    #   This parameter enables or disables the HTTP metadata endpoint on
-    #   your instances. If the parameter is not specified, the default state
-    #   is `enabled`.
-    #
-    #   <note markdown="1"> If you specify a value of `disabled`, you will not be able to access
-    #   your instance metadata.
-    #
-    #    </note>
+    #   Indicates whether the HTTP metadata endpoint on your instances is
+    #   enabled or disabled.
     #   @return [String]
     #
     # @!attribute [rw] http_protocol_ipv_6
-    #   Whether or not the IPv6 endpoint for the instance metadata service
-    #   is enabled or disabled.
+    #   Indicates whether the IPv6 endpoint for the instance metadata
+    #   service is enabled or disabled.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceMetadataOptionsResponse AWS API Documentation
@@ -35886,7 +36541,7 @@ module Aws::EC2
     #             ipv_6_address: "String",
     #           },
     #         ],
-    #         network_interface_id: "String",
+    #         network_interface_id: "NetworkInterfaceId",
     #         private_ip_address: "String",
     #         private_ip_addresses: [
     #           {
@@ -36359,7 +37014,8 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes the disks that are available for the instance type.
+    # Describes the instance store features that are supported by the
+    # instance type.
     #
     # @!attribute [rw] total_size_in_gb
     #   The total size of the disks, in GB.
@@ -36370,8 +37026,11 @@ module Aws::EC2
     #   @return [Array<Types::DiskInfo>]
     #
     # @!attribute [rw] nvme_support
-    #   Indicates whether non-volatile memory express (NVMe) is supported
-    #   for instance store.
+    #   Indicates whether non-volatile memory express (NVMe) is supported.
+    #   @return [String]
+    #
+    # @!attribute [rw] encryption_support
+    #   Indicates whether data is encrypted at rest.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceStorageInfo AWS API Documentation
@@ -36379,7 +37038,8 @@ module Aws::EC2
     class InstanceStorageInfo < Struct.new(
       :total_size_in_gb,
       :disks,
-      :nvme_support)
+      :nvme_support,
+      :encryption_support)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -37532,7 +38192,7 @@ module Aws::EC2
     #           {
     #             instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
     #             spot_price: "String",
-    #             subnet_id: "String",
+    #             subnet_id: "SubnetId",
     #             availability_zone: "String",
     #             weighted_capacity: 1.0,
     #             priority: 1.0,
@@ -38505,7 +39165,7 @@ module Aws::EC2
     #       {
     #         instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
     #         spot_price: "String",
-    #         subnet_id: "String",
+    #         subnet_id: "SubnetId",
     #         availability_zone: "String",
     #         weighted_capacity: 1.0,
     #         priority: 1.0,
@@ -39034,7 +39694,7 @@ module Aws::EC2
     # Describes a load permission.
     #
     # @!attribute [rw] user_id
-    #   The AWS account ID.
+    #   The Amazon Web Services account ID.
     #   @return [String]
     #
     # @!attribute [rw] group
@@ -39103,7 +39763,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_id
-    #   The AWS account ID.
+    #   The Amazon Web Services account ID.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LoadPermissionRequest AWS API Documentation
@@ -39126,7 +39786,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -39176,7 +39837,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway route.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway route.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LocalGatewayRoute AWS API Documentation
@@ -39212,7 +39874,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway route table.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway route table.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -39262,8 +39925,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway virtual interface
-    #   group association.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway virtual interface group association.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -39314,8 +39977,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway route table for the
-    #   association.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway route table for the association.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -39373,7 +40036,8 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway virtual interface.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway virtual interface.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -39411,8 +40075,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID that owns the local gateway virtual interface
-    #   group.
+    #   The ID of the Amazon Web Services account that owns the local
+    #   gateway virtual interface group.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -39567,8 +40231,8 @@ module Aws::EC2
     # @!attribute [rw] opt_in_status
     #   Indicates whether you are opted in to the Local Zone group or
     #   Wavelength Zone group. The only valid value is `opted-in`. You must
-    #   contact [AWS Support][1] to opt out of a Local Zone group, or
-    #   Wavelength Zone group.
+    #   contact [Amazon Web Services Support][1] to opt out of a Local Zone
+    #   or Wavelength Zone group.
     #
     #
     #
@@ -39604,6 +40268,92 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ModifyCapacityReservationFleetRequest
+    #   data as a hash:
+    #
+    #       {
+    #         capacity_reservation_fleet_id: "CapacityReservationFleetId", # required
+    #         total_target_capacity: 1,
+    #         end_date: Time.now,
+    #         dry_run: false,
+    #         remove_end_date: false,
+    #       }
+    #
+    # @!attribute [rw] capacity_reservation_fleet_id
+    #   The ID of the Capacity Reservation Fleet to modify.
+    #   @return [String]
+    #
+    # @!attribute [rw] total_target_capacity
+    #   The total number of capacity units to be reserved by the Capacity
+    #   Reservation Fleet. This value, together with the instance type
+    #   weights that you assign to each instance type used by the Fleet
+    #   determine the number of instances for which the Fleet reserves
+    #   capacity. Both values are based on units that make sense for your
+    #   workload. For more information, see [Total target capacity][1] in
+    #   the Amazon EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#target-capacity
+    #   @return [Integer]
+    #
+    # @!attribute [rw] end_date
+    #   The date and time at which the Capacity Reservation Fleet expires.
+    #   When the Capacity Reservation Fleet expires, its state changes to
+    #   `expired` and all of the Capacity Reservations in the Fleet expire.
+    #
+    #   The Capacity Reservation Fleet expires within an hour after the
+    #   specified time. For example, if you specify `5/31/2019`, `13:30:55`,
+    #   the Capacity Reservation Fleet is guaranteed to expire between
+    #   `13:30:55` and `14:30:55` on `5/31/2019`.
+    #
+    #   You can't specify **EndDate** and <b> RemoveEndDate</b> in the same
+    #   request.
+    #   @return [Time]
+    #
+    # @!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] remove_end_date
+    #   Indicates whether to remove the end date from the Capacity
+    #   Reservation Fleet. If you remove the end date, the Capacity
+    #   Reservation Fleet does not expire and it remains active until you
+    #   explicitly cancel it using the **CancelCapacityReservationFleet**
+    #   action.
+    #
+    #   You can't specify **RemoveEndDate** and <b> EndDate</b> in the same
+    #   request.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyCapacityReservationFleetRequest AWS API Documentation
+    #
+    class ModifyCapacityReservationFleetRequest < Struct.new(
+      :capacity_reservation_fleet_id,
+      :total_target_capacity,
+      :end_date,
+      :dry_run,
+      :remove_end_date)
+      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/ModifyCapacityReservationFleetResult AWS API Documentation
+    #
+    class ModifyCapacityReservationFleetResult < Struct.new(
+      :return)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ModifyCapacityReservationRequest
     #   data as a hash:
     #
@@ -40091,8 +40841,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_ids
-    #   The AWS account IDs. This parameter is valid only when modifying the
-    #   `loadPermission` attribute.
+    #   The Amazon Web Services account IDs. This parameter is valid only
+    #   when modifying the `loadPermission` attribute.
     #   @return [Array<String>]
     #
     # @!attribute [rw] user_groups
@@ -41476,7 +42226,7 @@ module Aws::EC2
     #               {
     #                 instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
     #                 spot_price: "String",
-    #                 subnet_id: "String",
+    #                 subnet_id: "SubnetId",
     #                 availability_zone: "String",
     #                 weighted_capacity: 1.0,
     #                 priority: 1.0,
@@ -41696,7 +42446,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] traffic_direction
-    #   The type of traffic (`ingress` \| `egress`) to assign to the rule.
+    #   The type of traffic to assign to the rule.
     #   @return [String]
     #
     # @!attribute [rw] rule_number
@@ -46750,22 +47500,14 @@ module Aws::EC2
     #
     # @!attribute [rw] network_border_group
     #   The set of Availability Zones, Local Zones, or Wavelength Zones from
-    #   which AWS advertises IP addresses.
-    #
-    #   If you provide an incorrect network border group, you will receive
-    #   an `InvalidAddress.NotFound` error. For more information, see [Error
-    #   Codes][1].
+    #   which Amazon Web Services advertises IP addresses.
     #
-    #   <note markdown="1"> You cannot use a network border group with EC2 Classic. If you
-    #   attempt this operation on EC2 classic, you will receive an
-    #   `InvalidParameterCombination` error. For more information, see
-    #   [Error Codes][1].
+    #   If you provide an incorrect network border group, you receive an
+    #   `InvalidAddress.NotFound` error.
     #
-    #    </note>
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html
+    #   You cannot use a network border group with EC2 Classic. If you
+    #   attempt this operation on EC2 classic, you receive an
+    #   `InvalidParameterCombination` error.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -47887,7 +48629,7 @@ module Aws::EC2
     #                       ipv_6_address: "String",
     #                     },
     #                   ],
-    #                   network_interface_id: "String",
+    #                   network_interface_id: "NetworkInterfaceId",
     #                   private_ip_address: "String",
     #                   private_ip_addresses: [
     #                     {
@@ -47948,7 +48690,7 @@ module Aws::EC2
     #                 {
     #                   instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
     #                   spot_price: "String",
-    #                   subnet_id: "String",
+    #                   subnet_id: "SubnetId",
     #                   availability_zone: "String",
     #                   weighted_capacity: 1.0,
     #                   priority: 1.0,
@@ -48092,7 +48834,7 @@ module Aws::EC2
     #                   ipv_6_address: "String",
     #                 },
     #               ],
-    #               network_interface_id: "String",
+    #               network_interface_id: "NetworkInterfaceId",
     #               private_ip_address: "String",
     #               private_ip_addresses: [
     #                 {
@@ -48350,7 +49092,7 @@ module Aws::EC2
     #                 ipv_6_address: "String",
     #               },
     #             ],
-    #             network_interface_id: "String",
+    #             network_interface_id: "NetworkInterfaceId",
     #             private_ip_address: "String",
     #             private_ip_addresses: [
     #               {
@@ -48532,6 +49274,94 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Information about an instance type to use in a Capacity Reservation
+    # Fleet.
+    #
+    # @note When making an API call, you may pass ReservationFleetInstanceSpecification
+    #   data as a hash:
+    #
+    #       {
+    #         instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
+    #         instance_platform: "Linux/UNIX", # accepts Linux/UNIX, Red Hat Enterprise Linux, SUSE Linux, Windows, Windows with SQL Server, Windows with SQL Server Enterprise, Windows with SQL Server Standard, Windows with SQL Server Web, Linux with SQL Server Standard, Linux with SQL Server Web, Linux with SQL Server Enterprise
+    #         weight: 1.0,
+    #         availability_zone: "String",
+    #         availability_zone_id: "String",
+    #         ebs_optimized: false,
+    #         priority: 1,
+    #       }
+    #
+    # @!attribute [rw] instance_type
+    #   The instance type for which the Capacity Reservation Fleet reserves
+    #   capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_platform
+    #   The type of operating system for which the Capacity Reservation
+    #   Fleet reserves capacity.
+    #   @return [String]
+    #
+    # @!attribute [rw] weight
+    #   The number of capacity units provided by the specified instance
+    #   type. This value, together with the total target capacity that you
+    #   specify for the Fleet determine the number of instances for which
+    #   the Fleet reserves capacity. Both values are based on units that
+    #   make sense for your workload. For more information, see [Total
+    #   target capacity][1] in the Amazon EC2 User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#target-capacity
+    #   @return [Float]
+    #
+    # @!attribute [rw] availability_zone
+    #   The Availability Zone in which the Capacity Reservation Fleet
+    #   reserves the capacity. A Capacity Reservation Fleet can't span
+    #   Availability Zones. All instance type specifications that you
+    #   specify for the Fleet must use the same Availability Zone.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone in which the Capacity Reservation
+    #   Fleet reserves the capacity. A Capacity Reservation Fleet can't
+    #   span Availability Zones. All instance type specifications that you
+    #   specify for the Fleet must use the same Availability Zone.
+    #   @return [String]
+    #
+    # @!attribute [rw] ebs_optimized
+    #   Indicates whether the Capacity Reservation Fleet supports
+    #   EBS-optimized instances types. This optimization provides dedicated
+    #   throughput to Amazon EBS and an optimized configuration stack to
+    #   provide optimal I/O performance. This optimization isn't available
+    #   with all instance types. Additional usage charges apply when using
+    #   EBS-optimized instance types.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] priority
+    #   The priority to assign to the instance type. This value is used to
+    #   determine which of the instance types specified for the Fleet should
+    #   be prioritized for use. A lower value indicates a high priority. For
+    #   more information, see [Instance type priority][1] in the Amazon EC2
+    #   User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/crfleet-concepts.html#instance-priority
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReservationFleetInstanceSpecification AWS API Documentation
+    #
+    class ReservationFleetInstanceSpecification < Struct.new(
+      :instance_type,
+      :instance_platform,
+      :weight,
+      :availability_zone,
+      :availability_zone_id,
+      :ebs_optimized,
+      :priority)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The cost associated with the Reserved Instance.
     #
     # @!attribute [rw] hourly_price
@@ -50228,7 +51058,7 @@ module Aws::EC2
     #                 ipv_6_address: "String",
     #               },
     #             ],
-    #             network_interface_id: "String",
+    #             network_interface_id: "NetworkInterfaceId",
     #             private_ip_address: "String",
     #             private_ip_addresses: [
     #               {
@@ -51755,21 +52585,25 @@ module Aws::EC2
     #
     #       {
     #         local_gateway_route_table_id: "LocalGatewayRoutetableId", # required
-    #         max_results: 1,
-    #         next_token: "String",
-    #         dry_run: false,
-    #         filters: [ # required
+    #         filters: [
     #           {
     #             name: "String",
     #             values: ["String"],
     #           },
     #         ],
+    #         max_results: 1,
+    #         next_token: "String",
+    #         dry_run: false,
     #       }
     #
     # @!attribute [rw] local_gateway_route_table_id
     #   The ID of the local gateway route table.
     #   @return [String]
     #
+    # @!attribute [rw] filters
+    #   One or more filters.
+    #   @return [Array<Types::Filter>]
+    #
     # @!attribute [rw] max_results
     #   The maximum number of results to return with a single call. To
     #   retrieve the remaining results, make another call with the returned
@@ -51787,18 +52621,14 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
-    # @!attribute [rw] filters
-    #   One or more filters.
-    #   @return [Array<Types::Filter>]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SearchLocalGatewayRoutesRequest AWS API Documentation
     #
     class SearchLocalGatewayRoutesRequest < Struct.new(
       :local_gateway_route_table_id,
+      :filters,
       :max_results,
       :next_token,
-      :dry_run,
-      :filters)
+      :dry_run)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -52399,8 +53229,8 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] acceptance_required
-    #   Indicates whether requests from other AWS accounts to create an
-    #   endpoint to the service must first be accepted.
+    #   Indicates whether requests from other Amazon Web Services accounts
+    #   to create an endpoint to the service must first be accepted.
     #   @return [Boolean]
     #
     # @!attribute [rw] manages_vpc_endpoints
@@ -52475,7 +53305,7 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] owner
-    #   The AWS account ID of the service owner.
+    #   The Amazon Web Services account ID of the service owner.
     #   @return [String]
     #
     # @!attribute [rw] base_endpoint_dns_names
@@ -53100,7 +53930,7 @@ module Aws::EC2
     #                 ipv_6_address: "String",
     #               },
     #             ],
-    #             network_interface_id: "String",
+    #             network_interface_id: "NetworkInterfaceId",
     #             private_ip_address: "String",
     #             private_ip_addresses: [
     #               {
@@ -53426,7 +54256,7 @@ module Aws::EC2
     #                     ipv_6_address: "String",
     #                   },
     #                 ],
-    #                 network_interface_id: "String",
+    #                 network_interface_id: "NetworkInterfaceId",
     #                 private_ip_address: "String",
     #                 private_ip_addresses: [
     #                   {
@@ -53487,7 +54317,7 @@ module Aws::EC2
     #               {
     #                 instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, t3.nano, t3.micro, t3.small, t3.medium, t3.large, t3.xlarge, t3.2xlarge, t3a.nano, t3a.micro, t3a.small, t3a.medium, t3a.large, t3a.xlarge, t3a.2xlarge, t4g.nano, t4g.micro, t4g.small, t4g.medium, t4g.large, t4g.xlarge, t4g.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, r5.large, r5.xlarge, r5.2xlarge, r5.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, r5.metal, r5a.large, r5a.xlarge, r5a.2xlarge, r5a.4xlarge, r5a.8xlarge, r5a.12xlarge, r5a.16xlarge, r5a.24xlarge, r5b.large, r5b.xlarge, r5b.2xlarge, r5b.4xlarge, r5b.8xlarge, r5b.12xlarge, r5b.16xlarge, r5b.24xlarge, r5b.metal, r5d.large, r5d.xlarge, r5d.2xlarge, r5d.4xlarge, r5d.8xlarge, r5d.12xlarge, r5d.16xlarge, r5d.24xlarge, r5d.metal, r5ad.large, r5ad.xlarge, r5ad.2xlarge, r5ad.4xlarge, r5ad.8xlarge, r5ad.12xlarge, r5ad.16xlarge, r5ad.24xlarge, r6g.metal, r6g.medium, r6g.large, r6g.xlarge, r6g.2xlarge, r6g.4xlarge, r6g.8xlarge, r6g.12xlarge, r6g.16xlarge, r6gd.metal, r6gd.medium, r6gd.large, r6gd.xlarge, r6gd.2xlarge, r6gd.4xlarge, r6gd.8xlarge, r6gd.12xlarge, r6gd.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, i3.metal, i3en.large, i3en.xlarge, i3en.2xlarge, i3en.3xlarge, i3en.6xlarge, i3en.12xlarge, i3en.24xlarge, i3en.metal, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.12xlarge, c5.18xlarge, c5.24xlarge, c5.metal, c5a.large, c5a.xlarge, c5a.2xlarge, c5a.4xlarge, c5a.8xlarge, c5a.12xlarge, c5a.16xlarge, c5a.24xlarge, c5ad.large, c5ad.xlarge, c5ad.2xlarge, c5ad.4xlarge, c5ad.8xlarge, c5ad.12xlarge, c5ad.16xlarge, c5ad.24xlarge, c5d.large, c5d.xlarge, c5d.2xlarge, c5d.4xlarge, c5d.9xlarge, c5d.12xlarge, c5d.18xlarge, c5d.24xlarge, c5d.metal, c5n.large, c5n.xlarge, c5n.2xlarge, c5n.4xlarge, c5n.9xlarge, c5n.18xlarge, c5n.metal, c6g.metal, c6g.medium, c6g.large, c6g.xlarge, c6g.2xlarge, c6g.4xlarge, c6g.8xlarge, c6g.12xlarge, c6g.16xlarge, c6gd.metal, c6gd.medium, c6gd.large, c6gd.xlarge, c6gd.2xlarge, c6gd.4xlarge, c6gd.8xlarge, c6gd.12xlarge, c6gd.16xlarge, c6gn.medium, c6gn.large, c6gn.xlarge, c6gn.2xlarge, c6gn.4xlarge, c6gn.8xlarge, c6gn.12xlarge, c6gn.16xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, g3s.xlarge, g4ad.xlarge, g4ad.2xlarge, g4ad.4xlarge, g4ad.8xlarge, g4ad.16xlarge, g4dn.xlarge, g4dn.2xlarge, g4dn.4xlarge, g4dn.8xlarge, g4dn.12xlarge, g4dn.16xlarge, g4dn.metal, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, p3dn.24xlarge, p4d.24xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, d3.xlarge, d3.2xlarge, d3.4xlarge, d3.8xlarge, d3en.xlarge, d3en.2xlarge, d3en.4xlarge, d3en.6xlarge, d3en.8xlarge, d3en.12xlarge, f1.2xlarge, f1.4xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.8xlarge, m5.12xlarge, m5.16xlarge, m5.24xlarge, m5.metal, m5a.large, m5a.xlarge, m5a.2xlarge, m5a.4xlarge, m5a.8xlarge, m5a.12xlarge, m5a.16xlarge, m5a.24xlarge, m5d.large, m5d.xlarge, m5d.2xlarge, m5d.4xlarge, m5d.8xlarge, m5d.12xlarge, m5d.16xlarge, m5d.24xlarge, m5d.metal, m5ad.large, m5ad.xlarge, m5ad.2xlarge, m5ad.4xlarge, m5ad.8xlarge, m5ad.12xlarge, m5ad.16xlarge, m5ad.24xlarge, m5zn.large, m5zn.xlarge, m5zn.2xlarge, m5zn.3xlarge, m5zn.6xlarge, m5zn.12xlarge, m5zn.metal, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge, z1d.large, z1d.xlarge, z1d.2xlarge, z1d.3xlarge, z1d.6xlarge, z1d.12xlarge, z1d.metal, u-6tb1.56xlarge, u-6tb1.112xlarge, u-9tb1.112xlarge, u-12tb1.112xlarge, u-6tb1.metal, u-9tb1.metal, u-12tb1.metal, u-18tb1.metal, u-24tb1.metal, a1.medium, a1.large, a1.xlarge, a1.2xlarge, a1.4xlarge, a1.metal, m5dn.large, m5dn.xlarge, m5dn.2xlarge, m5dn.4xlarge, m5dn.8xlarge, m5dn.12xlarge, m5dn.16xlarge, m5dn.24xlarge, m5dn.metal, m5n.large, m5n.xlarge, m5n.2xlarge, m5n.4xlarge, m5n.8xlarge, m5n.12xlarge, m5n.16xlarge, m5n.24xlarge, m5n.metal, r5dn.large, r5dn.xlarge, r5dn.2xlarge, r5dn.4xlarge, r5dn.8xlarge, r5dn.12xlarge, r5dn.16xlarge, r5dn.24xlarge, r5dn.metal, r5n.large, r5n.xlarge, r5n.2xlarge, r5n.4xlarge, r5n.8xlarge, r5n.12xlarge, r5n.16xlarge, r5n.24xlarge, r5n.metal, inf1.xlarge, inf1.2xlarge, inf1.6xlarge, inf1.24xlarge, m6g.metal, m6g.medium, m6g.large, m6g.xlarge, m6g.2xlarge, m6g.4xlarge, m6g.8xlarge, m6g.12xlarge, m6g.16xlarge, m6gd.metal, m6gd.medium, m6gd.large, m6gd.xlarge, m6gd.2xlarge, m6gd.4xlarge, m6gd.8xlarge, m6gd.12xlarge, m6gd.16xlarge, m6i.large, m6i.xlarge, m6i.2xlarge, m6i.4xlarge, m6i.8xlarge, m6i.12xlarge, m6i.16xlarge, m6i.24xlarge, m6i.32xlarge, mac1.metal, x2gd.medium, x2gd.large, x2gd.xlarge, x2gd.2xlarge, x2gd.4xlarge, x2gd.8xlarge, x2gd.12xlarge, x2gd.16xlarge, x2gd.metal, vt1.3xlarge, vt1.6xlarge, vt1.24xlarge
     #                 spot_price: "String",
-    #                 subnet_id: "String",
+    #                 subnet_id: "SubnetId",
     #                 availability_zone: "String",
     #                 weighted_capacity: 1.0,
     #                 priority: 1.0,
@@ -55182,33 +56012,7 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] resource_type
-    #   The type of resource to tag on creation. The possible values are:
-    #   `capacity-reservation` \| `carrier-gateway` \| `client-vpn-endpoint`
-    #   \| `customer-gateway` \| `dedicated-host` \| `dhcp-options` \|
-    #   `egress-only-internet-gateway` \| `elastic-gpu` \| `elastic-ip` \|
-    #   `export-image-task` \| `export-instance-task` \| `fleet` \|
-    #   `fpga-image` \| `host-reservation` \| `image` \| `import-image-task`
-    #   \| `import-snapshot-task` \| `instance` \| `instance-event-window`
-    #   \| `internet-gateway` \| `ipv4pool-ec2` \| `ipv6pool-ec2` \|
-    #   `key-pair` \| `launch-template` \|
-    #   `local-gateway-route-table-vpc-association` \| `natgateway` \|
-    #   `network-acl` \| `network-insights-analysis` \|
-    #   `network-insights-path` \| `network-interface` \| `placement-group`
-    #   \| `prefix-list` \| `reserved-instances` \| `route-table` \|
-    #   `security-group` \| `security-group-rule` \| `snapshot` \|
-    #   `spot-fleet-request` \| `spot-instances-request` \| `subnet` \|
-    #   `traffic-mirror-filter` \| `traffic-mirror-session` \|
-    #   `traffic-mirror-target` \| `transit-gateway` \|
-    #   `transit-gateway-attachment` \| `transit-gateway-multicast-domain`
-    #   \| `transit-gateway-route-table` \| `volume` \| `vpc` \|
-    #   `vpc-endpoint` \| `vpc-endpoint-service` \| `vpc-flow-log` \|
-    #   `vpc-peering-connection` \| `vpn-connection` \| `vpn-gateway`.
-    #
-    #   To tag a resource after it has been created, see [CreateTags][1].
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
+    #   The type of resource to tag on creation.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -58604,7 +59408,8 @@ module Aws::EC2
     #   @return [Array<Types::Tag>]
     #
     # @!attribute [rw] owner_id
-    #   The ID of the AWS account that owns the VPC endpoint.
+    #   The ID of the Amazon Web Services account that owns the VPC
+    #   endpoint.
     #   @return [String]
     #
     # @!attribute [rw] last_error
@@ -58646,7 +59451,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] vpc_endpoint_owner
-    #   The AWS account ID of the owner of the VPC endpoint.
+    #   The ID of the Amazon Web Services account that owns the VPC
+    #   endpoint.
     #   @return [String]
     #
     # @!attribute [rw] vpc_endpoint_state
@@ -58702,8 +59508,8 @@ module Aws::EC2
     #
     # @!attribute [rw] network_border_group
     #   The name of the unique set of Availability Zones, Local Zones, or
-    #   Wavelength Zones from which AWS advertises IP addresses, for
-    #   example, `us-east-1-wl1-bos-wlz-1`.
+    #   Wavelength Zones from which Amazon Web Services advertises IP
+    #   addresses, for example, `us-east-1-wl1-bos-wlz-1`.
     #   @return [String]
     #
     # @!attribute [rw] ipv_6_pool