aws-sdk-ec2 1.263.0 → 1.267.0

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

@@ -1445,8 +1445,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.
@@ -2171,7 +2171,7 @@ module Aws::EC2
     #
     #       {
     #         dry_run: false,
-    #         groups: ["String"], # required
+    #         groups: ["SecurityGroupId"], # required
     #         instance_id: "InstanceId", # required
     #         vpc_id: "VpcId", # required
     #       }
@@ -2541,8 +2541,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.
@@ -3335,6 +3335,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 +3915,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 +3943,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
@@ -4183,7 +4420,7 @@ module Aws::EC2
     #
     # @!attribute [rw] client_root_certificate_chain_arn
     #   The ARN of the client certificate. The certificate must be signed by
-    #   a certificate authority (CA) and it must be provisioned in AWS
+    #   a certificate authority (CA) and it must be provisioned in
     #   Certificate Manager (ACM).
     #   @return [String]
     #
@@ -4376,7 +4613,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] lambda_function_arn
-    #   The Amazon Resource Name (ARN) of the AWS Lambda function used for
+    #   The Amazon Resource Name (ARN) of the Lambda function used for
     #   connection authorization.
     #   @return [String]
     #
@@ -4397,7 +4634,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] lambda_function_arn
-    #   The Amazon Resource Name (ARN) of the AWS Lambda function used for
+    #   The Amazon Resource Name (ARN) of the Lambda function used for
     #   connection authorization.
     #   @return [String]
     #
@@ -4455,7 +4692,7 @@ module Aws::EC2
     end
 
     # Describes the authentication methods used by a Client VPN endpoint.
-    # For more information, see [Authentication][1] in the *AWS Client VPN
+    # For more information, see [Authentication][1] in the *Client VPN
     # Administrator Guide*.
     #
     #
@@ -4490,8 +4727,8 @@ module Aws::EC2
     end
 
     # Describes the authentication method to be used by a Client VPN
-    # endpoint. For more information, see [Authentication][1] in the *AWS
-    # Client VPN Administrator Guide*.
+    # endpoint. For more information, see [Authentication][1] in the *Client
+    # VPN Administrator Guide*.
     #
     #
     #
@@ -4706,12 +4943,11 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] split_tunnel
-    #   Indicates whether split-tunnel is enabled in the AWS Client VPN
+    #   Indicates whether split-tunnel is enabled in the Client VPN
     #   endpoint.
     #
     #   For information about split-tunnel VPN endpoints, see [Split-Tunnel
-    #   AWS Client VPN Endpoint][1] in the *AWS Client VPN Administrator
-    #   Guide*.
+    #   Client VPN endpoint][1] in the *Client VPN Administrator Guide*.
     #
     #
     #
@@ -5623,6 +5859,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:
     #
@@ -5951,7 +6399,7 @@ module Aws::EC2
     #
     # @!attribute [rw] server_certificate_arn
     #   The ARN of the server certificate. For more information, see the
-    #   [AWS Certificate Manager User Guide][1].
+    #   [Certificate Manager User Guide][1].
     #
     #
     #
@@ -6006,14 +6454,13 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] split_tunnel
-    #   Indicates whether split-tunnel is enabled on the AWS Client VPN
+    #   Indicates whether split-tunnel is enabled on the Client VPN
     #   endpoint.
     #
     #   By default, split-tunnel on a VPN endpoint is disabled.
     #
-    #   For information about split-tunnel VPN endpoints, see [Split-Tunnel
-    #   AWS Client VPN Endpoint][1] in the *AWS Client VPN Administrator
-    #   Guide*.
+    #   For information about split-tunnel VPN endpoints, see [Split-tunnel
+    #   Client VPN endpoint][1] in the *Client VPN Administrator Guide*.
     #
     #
     #
@@ -6029,8 +6476,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.
@@ -6139,8 +6586,8 @@ module Aws::EC2
     #   * To add a route for a peered VPC, enter the peered VPC's IPv4 CIDR
     #     range
     #
-    #   * To add a route for an on-premises network, enter the AWS
-    #     Site-to-Site VPN connection's IPv4 CIDR range
+    #   * To add a route for an on-premises network, enter the Amazon Web
+    #     Services Site-to-Site VPN connection's IPv4 CIDR range
     #
     #   * To add a route for the local network, enter the client CIDR range
     #   @return [String]
@@ -6160,8 +6607,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.
@@ -6634,7 +7081,7 @@ module Aws::EC2
     #                 placement: {
     #                   availability_zone: "String",
     #                   affinity: "String",
-    #                   group_name: "String",
+    #                   group_name: "PlacementGroupName",
     #                   partition_number: 1,
     #                   host_id: "String",
     #                   tenancy: "default", # accepts default, dedicated, host
@@ -8008,8 +8455,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
@@ -8021,6 +8468,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.
@@ -8028,17 +8479,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
@@ -9822,11 +10269,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
@@ -9857,6 +10304,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.
@@ -9879,24 +10333,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
@@ -15311,6 +15758,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:
     #
@@ -22465,7 +22997,7 @@ module Aws::EC2
     #             values: ["String"],
     #           },
     #         ],
-    #         group_ids: ["String"],
+    #         group_ids: ["SecurityGroupId"],
     #         group_names: ["SecurityGroupName"],
     #         dry_run: false,
     #         next_token: "String",
@@ -29754,6 +30286,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
@@ -29852,6 +30404,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
@@ -30051,7 +30692,7 @@ module Aws::EC2
     #             placement: {
     #               availability_zone: "String",
     #               affinity: "String",
-    #               group_name: "String",
+    #               group_name: "PlacementGroupName",
     #               partition_number: 1,
     #               host_id: "String",
     #               tenancy: "default", # accepts default, dedicated, host
@@ -30159,7 +30800,7 @@ module Aws::EC2
     #         placement: {
     #           availability_zone: "String",
     #           affinity: "String",
-    #           group_name: "String",
+    #           group_name: "PlacementGroupName",
     #           partition_number: 1,
     #           host_id: "String",
     #           tenancy: "default", # accepts default, dedicated, host
@@ -32304,6 +32945,130 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetVpnConnectionDeviceSampleConfigurationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         vpn_connection_id: "VpnConnectionId", # required
+    #         vpn_connection_device_type_id: "VpnConnectionDeviceTypeId", # required
+    #         internet_key_exchange_version: "String",
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] vpn_connection_id
+    #   The `VpnConnectionId` specifies the Site-to-Site VPN connection used
+    #   for the sample configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] vpn_connection_device_type_id
+    #   Device identifier provided by the `GetVpnConnectionDeviceTypes` API.
+    #   @return [String]
+    #
+    # @!attribute [rw] internet_key_exchange_version
+    #   The IKE version to be used in the sample configuration file for your
+    #   customer gateway device. You can specify one of the following
+    #   versions: `ikev1` or `ikev2`.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetVpnConnectionDeviceSampleConfigurationRequest AWS API Documentation
+    #
+    class GetVpnConnectionDeviceSampleConfigurationRequest < Struct.new(
+      :vpn_connection_id,
+      :vpn_connection_device_type_id,
+      :internet_key_exchange_version,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] vpn_connection_device_sample_configuration
+    #   Sample configuration file for the specified customer gateway device.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetVpnConnectionDeviceSampleConfigurationResult AWS API Documentation
+    #
+    class GetVpnConnectionDeviceSampleConfigurationResult < Struct.new(
+      :vpn_connection_device_sample_configuration)
+      SENSITIVE = [:vpn_connection_device_sample_configuration]
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass GetVpnConnectionDeviceTypesRequest
+    #   data as a hash:
+    #
+    #       {
+    #         max_results: 1,
+    #         next_token: "NextToken",
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results returned by
+    #   `GetVpnConnectionDeviceTypes` in paginated output. When this
+    #   parameter is used, `GetVpnConnectionDeviceTypes` only returns
+    #   `MaxResults` results in a single page along with a `NextToken`
+    #   response element. The remaining results of the initial request can
+    #   be seen by sending another `GetVpnConnectionDeviceTypes` request
+    #   with the returned `NextToken` value. This value can be between 200
+    #   and 1000. If this parameter is not used, then
+    #   `GetVpnConnectionDeviceTypes` returns all results.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   The `NextToken` value returned from a previous paginated
+    #   `GetVpnConnectionDeviceTypes` request where `MaxResults` was used
+    #   and the results exceeded the value of that parameter. Pagination
+    #   continues from the end of the previous results that returned the
+    #   `NextToken` value. This value is null when there are no more results
+    #   to return.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetVpnConnectionDeviceTypesRequest AWS API Documentation
+    #
+    class GetVpnConnectionDeviceTypesRequest < Struct.new(
+      :max_results,
+      :next_token,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] vpn_connection_device_types
+    #   List of customer gateway devices that have a sample configuration
+    #   file available for use.
+    #   @return [Array<Types::VpnConnectionDeviceType>]
+    #
+    # @!attribute [rw] next_token
+    #   The `NextToken` value to include in a future
+    #   `GetVpnConnectionDeviceTypes` request. When the results of a
+    #   `GetVpnConnectionDeviceTypes` request exceed `MaxResults`, this
+    #   value can be used 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/GetVpnConnectionDeviceTypesResult AWS API Documentation
+    #
+    class GetVpnConnectionDeviceTypesResult < Struct.new(
+      :vpn_connection_device_types,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the GPU accelerators for the instance type.
     #
     # @!attribute [rw] name
@@ -33298,8 +34063,8 @@ module Aws::EC2
     #
     # @!attribute [rw] certificate_revocation_list
     #   The client certificate revocation list file. For more information,
-    #   see [Generate a Client Certificate Revocation List][1] in the *AWS
-    #   Client VPN Administrator Guide*.
+    #   see [Generate a Client Certificate Revocation List][1] in the
+    #   *Client VPN Administrator Guide*.
     #
     #
     #
@@ -33792,7 +34557,7 @@ module Aws::EC2
     #         placement: {
     #           availability_zone: "String",
     #           affinity: "String",
-    #           group_name: "String",
+    #           group_name: "PlacementGroupName",
     #           partition_number: 1,
     #           host_id: "String",
     #           tenancy: "default", # accepts default, dedicated, host
@@ -33907,7 +34672,7 @@ module Aws::EC2
     #           placement: {
     #             availability_zone: "String",
     #             affinity: "String",
-    #             group_name: "String",
+    #             group_name: "PlacementGroupName",
     #             partition_number: 1,
     #             host_id: "String",
     #             tenancy: "default", # accepts default, dedicated, host
@@ -34664,7 +35429,7 @@ module Aws::EC2
     #   @return [Types::HibernationOptions]
     #
     # @!attribute [rw] licenses
-    #   The license configurations.
+    #   The license configurations for the instance.
     #   @return [Array<Types::LicenseConfiguration>]
     #
     # @!attribute [rw] metadata_options
@@ -34685,6 +35450,30 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html
     #   @return [String]
     #
+    # @!attribute [rw] platform_details
+    #   The platform details value for the instance. For more information,
+    #   see [AMI billing information fields][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html
+    #   @return [String]
+    #
+    # @!attribute [rw] usage_operation
+    #   The usage operation value for the instance. For more information,
+    #   see [AMI billing information fields][1] in the *Amazon EC2 User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html
+    #   @return [String]
+    #
+    # @!attribute [rw] usage_operation_update_time
+    #   The time that the usage operation was last updated.
+    #   @return [Time]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Instance AWS API Documentation
     #
     class Instance < Struct.new(
@@ -34736,7 +35525,10 @@ module Aws::EC2
       :licenses,
       :metadata_options,
       :enclave_options,
-      :boot_mode)
+      :boot_mode,
+      :platform_details,
+      :usage_operation,
+      :usage_operation_update_time)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -35737,7 +36529,7 @@ module Aws::EC2
     #             ipv_6_address: "String",
     #           },
     #         ],
-    #         network_interface_id: "String",
+    #         network_interface_id: "NetworkInterfaceId",
     #         private_ip_address: "String",
     #         private_ip_addresses: [
     #           {
@@ -37383,7 +38175,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,
@@ -38356,7 +39148,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,
@@ -39455,6 +40247,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:
     #
@@ -39578,7 +40456,7 @@ module Aws::EC2
     #
     # @!attribute [rw] server_certificate_arn
     #   The ARN of the server certificate to be used. The server certificate
-    #   must be provisioned in AWS Certificate Manager (ACM).
+    #   must be provisioned in Certificate Manager (ACM).
     #   @return [String]
     #
     # @!attribute [rw] connection_log_options
@@ -39618,9 +40496,8 @@ module Aws::EC2
     # @!attribute [rw] split_tunnel
     #   Indicates whether the VPN is split-tunnel.
     #
-    #   For information about split-tunnel VPN endpoints, see [Split-Tunnel
-    #   AWS Client VPN Endpoint][1] in the *AWS Client VPN Administrator
-    #   Guide*.
+    #   For information about split-tunnel VPN endpoints, see [Split-tunnel
+    #   Client VPN endpoint][1] in the *Client VPN Administrator Guide*.
     #
     #
     #
@@ -39819,7 +40696,7 @@ module Aws::EC2
     #                 placement: {
     #                   availability_zone: "String",
     #                   affinity: "String",
-    #                   group_name: "String",
+    #                   group_name: "PlacementGroupName",
     #                   partition_number: 1,
     #                   host_id: "String",
     #                   tenancy: "default", # accepts default, dedicated, host
@@ -40289,7 +41166,7 @@ module Aws::EC2
     #         ena_support: {
     #           value: false,
     #         },
-    #         groups: ["String"],
+    #         groups: ["SecurityGroupId"],
     #         instance_id: "InstanceId", # required
     #         instance_initiated_shutdown_behavior: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #         instance_type: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
@@ -40850,10 +41727,12 @@ module Aws::EC2
     # @!attribute [rw] tenancy
     #   The tenancy for the instance.
     #
-    #   For T3 instances, you can't change the tenancy from `dedicated` to
+    #   <note markdown="1"> For T3 instances, you can't change the tenancy from `dedicated` to
     #   `host`, or from `host` to `dedicated`. Attempting to make one of
     #   these unsupported tenancy changes results in the `InvalidTenancy`
     #   error code.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] partition_number
@@ -41326,7 +42205,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,
@@ -42670,7 +43549,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] remote_ipv_4_network_cidr
-    #   The IPv4 CIDR on the AWS side of the VPN connection.
+    #   The IPv4 CIDR on the Amazon Web Services side of the VPN connection.
     #
     #   Default: `0.0.0.0/0`
     #   @return [String]
@@ -42683,7 +43562,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] remote_ipv_6_network_cidr
-    #   The IPv6 CIDR on the AWS side of the VPN connection.
+    #   The IPv6 CIDR on the Amazon Web Services side of the VPN connection.
     #
     #   Default: `::/0`
     #   @return [String]
@@ -42744,8 +43623,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] vpn_gateway_id
-    #   The ID of the virtual private gateway at the AWS side of the VPN
-    #   connection.
+    #   The ID of the virtual private gateway at the Amazon Web Services
+    #   side of the VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -42789,7 +43668,7 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] vpn_connection_id
-    #   The ID of the AWS Site-to-Site VPN connection.
+    #   The ID of the Amazon Web Services Site-to-Site VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] vpn_tunnel_outside_ip_address
@@ -42883,7 +43762,7 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] vpn_connection_id
-    #   The ID of the AWS Site-to-Site VPN connection.
+    #   The ID of the Amazon Web Services Site-to-Site VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] vpn_tunnel_outside_ip_address
@@ -42924,7 +43803,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # The AWS Site-to-Site VPN tunnel options to modify.
+    # The Amazon Web Services Site-to-Site VPN tunnel options to modify.
     #
     # @note When making an API call, you may pass ModifyVpnTunnelOptionsSpecification
     #   data as a hash:
@@ -43037,9 +43916,9 @@ module Aws::EC2
     #
     # @!attribute [rw] rekey_margin_time_seconds
     #   The margin time, in seconds, before the phase 2 lifetime expires,
-    #   during which the AWS side of the VPN connection performs an IKE
-    #   rekey. The exact time of the rekey is randomly selected based on the
-    #   value for `RekeyFuzzPercentage`.
+    #   during which the Amazon Web Services side of the VPN connection
+    #   performs an IKE rekey. The exact time of the rekey is randomly
+    #   selected based on the value for `RekeyFuzzPercentage`.
     #
     #   Constraints: A value between 60 and half of `Phase2LifetimeSeconds`.
     #
@@ -43136,8 +44015,8 @@ module Aws::EC2
     # @!attribute [rw] startup_action
     #   The action to take when the establishing the tunnel for the VPN
     #   connection. By default, your customer gateway device must initiate
-    #   the IKE negotiation and bring up the tunnel. Specify `start` for AWS
-    #   to initiate the IKE negotiation.
+    #   the IKE negotiation and bring up the tunnel. Specify `start` for
+    #   Amazon Web Services to initiate the IKE negotiation.
     #
     #   Valid Values: `add` \| `start`
     #
@@ -44728,7 +45607,7 @@ module Aws::EC2
     #       {
     #         availability_zone: "String",
     #         affinity: "String",
-    #         group_name: "String",
+    #         group_name: "PlacementGroupName",
     #         partition_number: 1,
     #         host_id: "String",
     #         tenancy: "default", # accepts default, dedicated, host
@@ -47737,7 +48616,7 @@ module Aws::EC2
     #                       ipv_6_address: "String",
     #                     },
     #                   ],
-    #                   network_interface_id: "String",
+    #                   network_interface_id: "NetworkInterfaceId",
     #                   private_ip_address: "String",
     #                   private_ip_addresses: [
     #                     {
@@ -47798,7 +48677,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,
@@ -47942,7 +48821,7 @@ module Aws::EC2
     #                   ipv_6_address: "String",
     #                 },
     #               ],
-    #               network_interface_id: "String",
+    #               network_interface_id: "NetworkInterfaceId",
     #               private_ip_address: "String",
     #               private_ip_addresses: [
     #                 {
@@ -48200,7 +49079,7 @@ module Aws::EC2
     #                 ipv_6_address: "String",
     #               },
     #             ],
-    #             network_interface_id: "String",
+    #             network_interface_id: "NetworkInterfaceId",
     #             private_ip_address: "String",
     #             private_ip_addresses: [
     #               {
@@ -48382,6 +49261,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
@@ -50043,7 +51010,7 @@ module Aws::EC2
     #         placement: {
     #           availability_zone: "String",
     #           affinity: "String",
-    #           group_name: "String",
+    #           group_name: "PlacementGroupName",
     #           partition_number: 1,
     #           host_id: "String",
     #           tenancy: "default", # accepts default, dedicated, host
@@ -50078,7 +51045,7 @@ module Aws::EC2
     #                 ipv_6_address: "String",
     #               },
     #             ],
-    #             network_interface_id: "String",
+    #             network_interface_id: "NetworkInterfaceId",
     #             private_ip_address: "String",
     #             private_ip_addresses: [
     #               {
@@ -51605,7 +52572,7 @@ module Aws::EC2
     #
     #       {
     #         local_gateway_route_table_id: "LocalGatewayRoutetableId", # required
-    #         filters: [ # required
+    #         filters: [
     #           {
     #             name: "String",
     #             values: ["String"],
@@ -52950,7 +53917,7 @@ module Aws::EC2
     #                 ipv_6_address: "String",
     #               },
     #             ],
-    #             network_interface_id: "String",
+    #             network_interface_id: "NetworkInterfaceId",
     #             private_ip_address: "String",
     #             private_ip_addresses: [
     #               {
@@ -53276,7 +54243,7 @@ module Aws::EC2
     #                     ipv_6_address: "String",
     #                   },
     #                 ],
-    #                 network_interface_id: "String",
+    #                 network_interface_id: "NetworkInterfaceId",
     #                 private_ip_address: "String",
     #                 private_ip_addresses: [
     #                   {
@@ -53337,7 +54304,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,
@@ -57044,8 +58011,8 @@ module Aws::EC2
     #
     # @!attribute [rw] rekey_margin_time_seconds
     #   The margin time, in seconds, before the phase 2 lifetime expires,
-    #   during which the AWS side of the VPN connection performs an IKE
-    #   rekey.
+    #   during which the Amazon Web Services side of the VPN connection
+    #   performs an IKE rekey.
     #   @return [Integer]
     #
     # @!attribute [rw] rekey_fuzz_percentage
@@ -58722,8 +59689,8 @@ module Aws::EC2
     #
     # @!attribute [rw] category
     #   The category of the VPN connection. A value of `VPN` indicates an
-    #   AWS VPN connection. A value of `VPN-Classic` indicates an AWS
-    #   Classic VPN connection.
+    #   Amazon Web Services VPN connection. A value of `VPN-Classic`
+    #   indicates an Amazon Web Services Classic VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -58739,8 +59706,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] vpn_gateway_id
-    #   The ID of the virtual private gateway at the AWS side of the VPN
-    #   connection.
+    #   The ID of the virtual private gateway at the Amazon Web Services
+    #   side of the VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] transit_gateway_id
@@ -58782,6 +59749,42 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # List of customer gateway devices that have a sample configuration file
+    # available for use. You can also see the list of device types with
+    # sample configuration files available under [Your customer gateway
+    # device][1] in the *Amazon Web Services Site-to-Site VPN User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/vpn/latest/s2svpn/your-cgw.html
+    #
+    # @!attribute [rw] vpn_connection_device_type_id
+    #   Customer gateway device identifier.
+    #   @return [String]
+    #
+    # @!attribute [rw] vendor
+    #   Customer gateway device vendor.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform
+    #   Customer gateway device platform.
+    #   @return [String]
+    #
+    # @!attribute [rw] software
+    #   Customer gateway device software version.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VpnConnectionDeviceType AWS API Documentation
+    #
+    class VpnConnectionDeviceType < Struct.new(
+      :vpn_connection_device_type_id,
+      :vendor,
+      :platform,
+      :software)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes VPN connection options.
     #
     # @!attribute [rw] enable_acceleration
@@ -58799,7 +59802,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] remote_ipv_4_network_cidr
-    #   The IPv4 CIDR on the AWS side of the VPN connection.
+    #   The IPv4 CIDR on the Amazon Web Services side of the VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] local_ipv_6_network_cidr
@@ -58808,7 +59811,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] remote_ipv_6_network_cidr
-    #   The IPv6 CIDR on the AWS side of the VPN connection.
+    #   The IPv6 CIDR on the Amazon Web Services side of the VPN connection.
     #   @return [String]
     #
     # @!attribute [rw] tunnel_inside_ip_version
@@ -58932,7 +59935,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] remote_ipv_4_network_cidr
-    #   The IPv4 CIDR on the AWS side of the VPN connection.
+    #   The IPv4 CIDR on the Amazon Web Services side of the VPN connection.
     #
     #   Default: `0.0.0.0/0`
     #   @return [String]
@@ -58945,7 +59948,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] remote_ipv_6_network_cidr
-    #   The IPv6 CIDR on the AWS side of the VPN connection.
+    #   The IPv6 CIDR on the Amazon Web Services side of the VPN connection.
     #
     #   Default: `::/0`
     #   @return [String]
@@ -59149,9 +60152,9 @@ module Aws::EC2
     #
     # @!attribute [rw] rekey_margin_time_seconds
     #   The margin time, in seconds, before the phase 2 lifetime expires,
-    #   during which the AWS side of the VPN connection performs an IKE
-    #   rekey. The exact time of the rekey is randomly selected based on the
-    #   value for `RekeyFuzzPercentage`.
+    #   during which the Amazon Web Services side of the VPN connection
+    #   performs an IKE rekey. The exact time of the rekey is randomly
+    #   selected based on the value for `RekeyFuzzPercentage`.
     #
     #   Constraints: A value between 60 and half of `Phase2LifetimeSeconds`.
     #
@@ -59248,8 +60251,8 @@ module Aws::EC2
     # @!attribute [rw] startup_action
     #   The action to take when the establishing the tunnel for the VPN
     #   connection. By default, your customer gateway device must initiate
-    #   the IKE negotiation and bring up the tunnel. Specify `start` for AWS
-    #   to initiate the IKE negotiation.
+    #   the IKE negotiation and bring up the tunnel. Specify `start` for
+    #   Amazon Web Services to initiate the IKE negotiation.
     #
     #   Valid Values: `add` \| `start`
     #