aws-sdk-ec2 1.124.0 → 1.129.0

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

@@ -157,6 +157,8 @@ module Aws::EC2
     CapacityReservationId = Shapes::StringShape.new(name: 'CapacityReservationId')
     CapacityReservationIdSet = Shapes::ListShape.new(name: 'CapacityReservationIdSet')
     CapacityReservationInstancePlatform = Shapes::StringShape.new(name: 'CapacityReservationInstancePlatform')
+    CapacityReservationOptions = Shapes::StructureShape.new(name: 'CapacityReservationOptions')
+    CapacityReservationOptionsRequest = Shapes::StructureShape.new(name: 'CapacityReservationOptionsRequest')
     CapacityReservationPreference = Shapes::StringShape.new(name: 'CapacityReservationPreference')
     CapacityReservationSet = Shapes::ListShape.new(name: 'CapacityReservationSet')
     CapacityReservationSpecification = Shapes::StructureShape.new(name: 'CapacityReservationSpecification')
@@ -351,6 +353,7 @@ module Aws::EC2
     DatafeedSubscriptionState = Shapes::StringShape.new(name: 'DatafeedSubscriptionState')
     DateTime = Shapes::TimestampShape.new(name: 'DateTime')
     DedicatedHostFlag = Shapes::BooleanShape.new(name: 'DedicatedHostFlag')
+    DedicatedHostId = Shapes::StringShape.new(name: 'DedicatedHostId')
     DefaultRouteTableAssociationValue = Shapes::StringShape.new(name: 'DefaultRouteTableAssociationValue')
     DefaultRouteTablePropagationValue = Shapes::StringShape.new(name: 'DefaultRouteTablePropagationValue')
     DefaultTargetCapacityType = Shapes::StringShape.new(name: 'DefaultTargetCapacityType')
@@ -859,6 +862,7 @@ module Aws::EC2
     Filter = Shapes::StructureShape.new(name: 'Filter')
     FilterList = Shapes::ListShape.new(name: 'FilterList')
     FleetActivityStatus = Shapes::StringShape.new(name: 'FleetActivityStatus')
+    FleetCapacityReservationUsageStrategy = Shapes::StringShape.new(name: 'FleetCapacityReservationUsageStrategy')
     FleetData = Shapes::StructureShape.new(name: 'FleetData')
     FleetEventType = Shapes::StringShape.new(name: 'FleetEventType')
     FleetExcessCapacityTerminationPolicy = Shapes::StringShape.new(name: 'FleetExcessCapacityTerminationPolicy')
@@ -953,7 +957,6 @@ module Aws::EC2
     HistoryRecordSet = Shapes::ListShape.new(name: 'HistoryRecordSet')
     HistoryRecords = Shapes::ListShape.new(name: 'HistoryRecords')
     Host = Shapes::StructureShape.new(name: 'Host')
-    HostId = Shapes::StringShape.new(name: 'HostId')
     HostInstance = Shapes::StructureShape.new(name: 'HostInstance')
     HostInstanceList = Shapes::ListShape.new(name: 'HostInstanceList')
     HostList = Shapes::ListShape.new(name: 'HostList')
@@ -1113,6 +1116,7 @@ module Aws::EC2
     Ipv6SupportValue = Shapes::StringShape.new(name: 'Ipv6SupportValue')
     KeyNameStringList = Shapes::ListShape.new(name: 'KeyNameStringList')
     KeyPair = Shapes::StructureShape.new(name: 'KeyPair')
+    KeyPairIdStringList = Shapes::ListShape.new(name: 'KeyPairIdStringList')
     KeyPairInfo = Shapes::StructureShape.new(name: 'KeyPairInfo')
     KeyPairList = Shapes::ListShape.new(name: 'KeyPairList')
     KeyPairName = Shapes::StringShape.new(name: 'KeyPairName')
@@ -1384,6 +1388,7 @@ module Aws::EC2
     Phase2IntegrityAlgorithmsRequestListValue = Shapes::StructureShape.new(name: 'Phase2IntegrityAlgorithmsRequestListValue')
     Placement = Shapes::StructureShape.new(name: 'Placement')
     PlacementGroup = Shapes::StructureShape.new(name: 'PlacementGroup')
+    PlacementGroupIdStringList = Shapes::ListShape.new(name: 'PlacementGroupIdStringList')
     PlacementGroupInfo = Shapes::StructureShape.new(name: 'PlacementGroupInfo')
     PlacementGroupList = Shapes::ListShape.new(name: 'PlacementGroupList')
     PlacementGroupName = Shapes::StringShape.new(name: 'PlacementGroupName')
@@ -2414,6 +2419,12 @@ module Aws::EC2
 
     CapacityReservationIdSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
+    CapacityReservationOptions.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "usageStrategy"))
+    CapacityReservationOptions.struct_class = Types::CapacityReservationOptions
+
+    CapacityReservationOptionsRequest.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "UsageStrategy"))
+    CapacityReservationOptionsRequest.struct_class = Types::CapacityReservationOptionsRequest
+
     CapacityReservationSet.member = Shapes::ShapeRef.new(shape: CapacityReservation, location_name: "item")
 
     CapacityReservationSpecification.add_member(:capacity_reservation_preference, Shapes::ShapeRef.new(shape: CapacityReservationPreference, location_name: "CapacityReservationPreference"))
@@ -3346,7 +3357,7 @@ module Aws::EC2
     DeleteInternetGatewayRequest.add_member(:internet_gateway_id, Shapes::ShapeRef.new(shape: InternetGatewayId, required: true, location_name: "internetGatewayId"))
     DeleteInternetGatewayRequest.struct_class = Types::DeleteInternetGatewayRequest
 
-    DeleteKeyPairRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "KeyName"))
+    DeleteKeyPairRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: KeyPairName, required: true, location_name: "KeyName"))
     DeleteKeyPairRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteKeyPairRequest.struct_class = Types::DeleteKeyPairRequest
 
@@ -3824,6 +3835,7 @@ module Aws::EC2
     DescribeExportImageTasksResult.struct_class = Types::DescribeExportImageTasksResult
 
     DescribeExportTasksRequest.add_member(:export_task_ids, Shapes::ShapeRef.new(shape: ExportTaskIdStringList, location_name: "exportTaskId"))
+    DescribeExportTasksRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeExportTasksRequest.struct_class = Types::DescribeExportTasksRequest
 
     DescribeExportTasksResult.add_member(:export_tasks, Shapes::ShapeRef.new(shape: ExportTaskList, location_name: "exportTaskSet"))
@@ -4106,6 +4118,7 @@ module Aws::EC2
 
     DescribeKeyPairsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeKeyPairsRequest.add_member(:key_names, Shapes::ShapeRef.new(shape: KeyNameStringList, location_name: "KeyName"))
+    DescribeKeyPairsRequest.add_member(:key_pair_ids, Shapes::ShapeRef.new(shape: KeyPairIdStringList, location_name: "KeyPairId"))
     DescribeKeyPairsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeKeyPairsRequest.struct_class = Types::DescribeKeyPairsRequest
 
@@ -4273,6 +4286,7 @@ module Aws::EC2
     DescribePlacementGroupsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribePlacementGroupsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribePlacementGroupsRequest.add_member(:group_names, Shapes::ShapeRef.new(shape: PlacementGroupStringList, location_name: "groupName"))
+    DescribePlacementGroupsRequest.add_member(:group_ids, Shapes::ShapeRef.new(shape: PlacementGroupIdStringList, location_name: "GroupId"))
     DescribePlacementGroupsRequest.struct_class = Types::DescribePlacementGroupsRequest
 
     DescribePlacementGroupsResult.add_member(:placement_groups, Shapes::ShapeRef.new(shape: PlacementGroupList, location_name: "placementGroupSet"))
@@ -5100,6 +5114,7 @@ module Aws::EC2
     ElasticGpus.add_member(:elastic_gpu_health, Shapes::ShapeRef.new(shape: ElasticGpuHealth, location_name: "elasticGpuHealth"))
     ElasticGpus.add_member(:elastic_gpu_state, Shapes::ShapeRef.new(shape: ElasticGpuState, location_name: "elasticGpuState"))
     ElasticGpus.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
+    ElasticGpus.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ElasticGpus.struct_class = Types::ElasticGpus
 
     ElasticInferenceAccelerator.add_member(:type, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Type"))
@@ -5254,6 +5269,7 @@ module Aws::EC2
     ExportTask.add_member(:instance_export_details, Shapes::ShapeRef.new(shape: InstanceExportDetails, location_name: "instanceExport"))
     ExportTask.add_member(:state, Shapes::ShapeRef.new(shape: ExportTaskState, location_name: "state"))
     ExportTask.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
+    ExportTask.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ExportTask.struct_class = Types::ExportTask
 
     ExportTaskIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "ExportTaskId")
@@ -5850,6 +5866,7 @@ module Aws::EC2
     ImportImageTask.add_member(:snapshot_details, Shapes::ShapeRef.new(shape: SnapshotDetailList, location_name: "snapshotDetailSet"))
     ImportImageTask.add_member(:status, Shapes::ShapeRef.new(shape: String, location_name: "status"))
     ImportImageTask.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
+    ImportImageTask.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ImportImageTask.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListResponse, location_name: "licenseSpecifications"))
     ImportImageTask.struct_class = Types::ImportImageTask
 
@@ -5896,7 +5913,7 @@ module Aws::EC2
     ImportInstanceVolumeDetailSet.member = Shapes::ShapeRef.new(shape: ImportInstanceVolumeDetailItem, location_name: "item")
 
     ImportKeyPairRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
-    ImportKeyPairRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "keyName"))
+    ImportKeyPairRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: KeyPairName, required: true, location_name: "keyName"))
     ImportKeyPairRequest.add_member(:public_key_material, Shapes::ShapeRef.new(shape: Blob, required: true, location_name: "publicKeyMaterial"))
     ImportKeyPairRequest.struct_class = Types::ImportKeyPairRequest
 
@@ -5922,6 +5939,7 @@ module Aws::EC2
     ImportSnapshotTask.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     ImportSnapshotTask.add_member(:import_task_id, Shapes::ShapeRef.new(shape: String, location_name: "importTaskId"))
     ImportSnapshotTask.add_member(:snapshot_task_detail, Shapes::ShapeRef.new(shape: SnapshotTaskDetail, location_name: "snapshotTaskDetail"))
+    ImportSnapshotTask.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ImportSnapshotTask.struct_class = Types::ImportSnapshotTask
 
     ImportSnapshotTaskList.member = Shapes::ShapeRef.new(shape: ImportSnapshotTask, location_name: "item")
@@ -6217,7 +6235,7 @@ module Aws::EC2
     InstanceTypeInfo.add_member(:current_generation, Shapes::ShapeRef.new(shape: CurrentGenerationFlag, location_name: "currentGeneration"))
     InstanceTypeInfo.add_member(:free_tier_eligible, Shapes::ShapeRef.new(shape: FreeTierEligibleFlag, location_name: "freeTierEligible"))
     InstanceTypeInfo.add_member(:supported_usage_classes, Shapes::ShapeRef.new(shape: UsageClassTypeList, location_name: "supportedUsageClasses"))
-    InstanceTypeInfo.add_member(:supported_root_devices, Shapes::ShapeRef.new(shape: RootDeviceTypeList, location_name: "supportedRootDevices"))
+    InstanceTypeInfo.add_member(:supported_root_device_types, Shapes::ShapeRef.new(shape: RootDeviceTypeList, location_name: "supportedRootDeviceTypes"))
     InstanceTypeInfo.add_member(:bare_metal, Shapes::ShapeRef.new(shape: BareMetalFlag, location_name: "bareMetal"))
     InstanceTypeInfo.add_member(:hypervisor, Shapes::ShapeRef.new(shape: InstanceTypeHypervisor, location_name: "hypervisor"))
     InstanceTypeInfo.add_member(:processor_info, Shapes::ShapeRef.new(shape: ProcessorInfo, location_name: "processorInfo"))
@@ -6305,10 +6323,15 @@ module Aws::EC2
     KeyPair.add_member(:key_fingerprint, Shapes::ShapeRef.new(shape: String, location_name: "keyFingerprint"))
     KeyPair.add_member(:key_material, Shapes::ShapeRef.new(shape: SensitiveUserData, location_name: "keyMaterial"))
     KeyPair.add_member(:key_name, Shapes::ShapeRef.new(shape: String, location_name: "keyName"))
+    KeyPair.add_member(:key_pair_id, Shapes::ShapeRef.new(shape: String, location_name: "keyPairId"))
     KeyPair.struct_class = Types::KeyPair
 
+    KeyPairIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "KeyPairId")
+
+    KeyPairInfo.add_member(:key_pair_id, Shapes::ShapeRef.new(shape: String, location_name: "keyPairId"))
     KeyPairInfo.add_member(:key_fingerprint, Shapes::ShapeRef.new(shape: String, location_name: "keyFingerprint"))
     KeyPairInfo.add_member(:key_name, Shapes::ShapeRef.new(shape: String, location_name: "keyName"))
+    KeyPairInfo.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     KeyPairInfo.struct_class = Types::KeyPairInfo
 
     KeyPairList.member = Shapes::ShapeRef.new(shape: KeyPairInfo, location_name: "item")
@@ -6826,7 +6849,7 @@ module Aws::EC2
 
     ModifyInstancePlacementRequest.add_member(:affinity, Shapes::ShapeRef.new(shape: Affinity, location_name: "affinity"))
     ModifyInstancePlacementRequest.add_member(:group_name, Shapes::ShapeRef.new(shape: PlacementGroupName, location_name: "GroupName"))
-    ModifyInstancePlacementRequest.add_member(:host_id, Shapes::ShapeRef.new(shape: HostId, location_name: "hostId"))
+    ModifyInstancePlacementRequest.add_member(:host_id, Shapes::ShapeRef.new(shape: DedicatedHostId, location_name: "hostId"))
     ModifyInstancePlacementRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "instanceId"))
     ModifyInstancePlacementRequest.add_member(:tenancy, Shapes::ShapeRef.new(shape: HostTenancy, location_name: "tenancy"))
     ModifyInstancePlacementRequest.add_member(:partition_number, Shapes::ShapeRef.new(shape: Integer, location_name: "PartitionNumber"))
@@ -7237,6 +7260,7 @@ module Aws::EC2
     OccurrenceDaySet.member = Shapes::ShapeRef.new(shape: Integer, location_name: "item")
 
     OnDemandOptions.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: FleetOnDemandAllocationStrategy, location_name: "allocationStrategy"))
+    OnDemandOptions.add_member(:capacity_reservation_options, Shapes::ShapeRef.new(shape: CapacityReservationOptions, location_name: "capacityReservationOptions"))
     OnDemandOptions.add_member(:single_instance_type, Shapes::ShapeRef.new(shape: Boolean, location_name: "singleInstanceType"))
     OnDemandOptions.add_member(:single_availability_zone, Shapes::ShapeRef.new(shape: Boolean, location_name: "singleAvailabilityZone"))
     OnDemandOptions.add_member(:min_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "minTargetCapacity"))
@@ -7244,6 +7268,7 @@ module Aws::EC2
     OnDemandOptions.struct_class = Types::OnDemandOptions
 
     OnDemandOptionsRequest.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: FleetOnDemandAllocationStrategy, location_name: "AllocationStrategy"))
+    OnDemandOptionsRequest.add_member(:capacity_reservation_options, Shapes::ShapeRef.new(shape: CapacityReservationOptionsRequest, location_name: "CapacityReservationOptions"))
     OnDemandOptionsRequest.add_member(:single_instance_type, Shapes::ShapeRef.new(shape: Boolean, location_name: "SingleInstanceType"))
     OnDemandOptionsRequest.add_member(:single_availability_zone, Shapes::ShapeRef.new(shape: Boolean, location_name: "SingleAvailabilityZone"))
     OnDemandOptionsRequest.add_member(:min_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "MinTargetCapacity"))
@@ -7351,8 +7376,12 @@ module Aws::EC2
     PlacementGroup.add_member(:state, Shapes::ShapeRef.new(shape: PlacementGroupState, location_name: "state"))
     PlacementGroup.add_member(:strategy, Shapes::ShapeRef.new(shape: PlacementStrategy, location_name: "strategy"))
     PlacementGroup.add_member(:partition_count, Shapes::ShapeRef.new(shape: Integer, location_name: "partitionCount"))
+    PlacementGroup.add_member(:group_id, Shapes::ShapeRef.new(shape: String, location_name: "groupId"))
+    PlacementGroup.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     PlacementGroup.struct_class = Types::PlacementGroup
 
+    PlacementGroupIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "GroupId")
+
     PlacementGroupInfo.add_member(:supported_strategies, Shapes::ShapeRef.new(shape: PlacementGroupStrategyList, location_name: "supportedStrategies"))
     PlacementGroupInfo.struct_class = Types::PlacementGroupInfo
 
@@ -7698,7 +7727,7 @@ module Aws::EC2
 
     RequestHostIdList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
-    RequestHostIdSet.member = Shapes::ShapeRef.new(shape: HostId, location_name: "item")
+    RequestHostIdSet.member = Shapes::ShapeRef.new(shape: DedicatedHostId, location_name: "item")
 
     RequestInstanceTypeList.member = Shapes::ShapeRef.new(shape: InstanceType)
 

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

@@ -1436,6 +1436,9 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
+    #   * `network-border-group` - The location from where the IP address is
+    #     advertised.
+    #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
     #     that the address is associated with, if any.
     #

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

@@ -44,6 +44,12 @@ module Aws::EC2
       data[:key_material]
     end
 
+    # The ID of the key pair.
+    # @return [String]
+    def key_pair_id
+      data[:key_pair_id]
+    end
+
     # @!endgroup
 
     # @return [Client]

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

@@ -32,6 +32,12 @@ module Aws::EC2
     end
     alias :key_name :name
 
+    # The ID of the key pair.
+    # @return [String]
+    def key_pair_id
+      data[:key_pair_id]
+    end
+
     # If you used CreateKeyPair to create the key pair, this is the SHA-1
     # digest of the DER encoded private key. If you used ImportKeyPair to
     # provide AWS the public key, this is the MD5 public key fingerprint as
@@ -41,6 +47,12 @@ module Aws::EC2
       data[:key_fingerprint]
     end
 
+    # Any tags applied to the key pair.
+    # @return [Array<Types::Tag>]
+    def tags
+      data[:tags]
+    end
+
     # @!endgroup
 
     # @return [Client]

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

@@ -51,6 +51,18 @@ module Aws::EC2
       data[:partition_count]
     end
 
+    # The ID of the placement group.
+    # @return [String]
+    def group_id
+      data[:group_id]
+    end
+
+    # Any tags applied to the placement group.
+    # @return [Array<Types::Tag>]
+    def tags
+      data[:tags]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -263,8 +275,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #

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

@@ -149,7 +149,7 @@ module Aws::EC2
     #     ],
     #     tag_specifications: [
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -789,7 +789,7 @@ module Aws::EC2
     #     volume_id: "VolumeId", # required
     #     tag_specifications: [
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -923,7 +923,7 @@ module Aws::EC2
     #     dry_run: false,
     #     tag_specifications: [
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -1147,7 +1147,7 @@ module Aws::EC2
     #
     #   keypairinfo = ec2.import_key_pair({
     #     dry_run: false,
-    #     key_name: "String", # required
+    #     key_name: "KeyPairName", # required
     #     public_key_material: "data", # required
     #   })
     # @param [Hash] options ({})
@@ -1299,6 +1299,9 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
+    #   * `network-border-group` - The location from where the IP address is
+    #     advertised.
+    #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
     #     that the address is associated with, if any.
     #
@@ -1640,8 +1643,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #
@@ -1987,6 +1991,7 @@ module Aws::EC2
     #       },
     #     ],
     #     key_names: ["String"],
+    #     key_pair_ids: ["String"],
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
@@ -2000,6 +2005,8 @@ module Aws::EC2
     #   The key pair names.
     #
     #   Default: Describes all your key pairs.
+    # @option options [Array<String>] :key_pair_ids
+    #   The IDs of the key pairs.
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -2370,6 +2377,7 @@ module Aws::EC2
     #     ],
     #     dry_run: false,
     #     group_names: ["String"],
+    #     group_ids: ["String"],
     #   })
     # @param [Hash] options ({})
     # @option options [Array<Types::Filter>] :filters
@@ -2392,6 +2400,8 @@ module Aws::EC2
     #
     #   Default: Describes all your placement groups, or only those otherwise
     #   specified.
+    # @option options [Array<String>] :group_ids
+    #   The IDs of the placement groups.
     # @return [PlacementGroup::Collection]
     def placement_groups(options = {})
       batches = Enumerator.new do |y|
@@ -3004,6 +3014,9 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
+    #   * `network-border-group` - The location from where the IP address is
+    #     advertised.
+    #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
     #     that the address is associated with, if any.
     #

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

@@ -288,7 +288,7 @@ module Aws::EC2
     #     source_region: "String", # required
     #     tag_specifications: [
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",

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

@@ -351,7 +351,7 @@ module Aws::EC2
     #     ],
     #     tag_specifications: [
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -890,8 +890,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #

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

@@ -531,7 +531,7 @@ module Aws::EC2
     #         quantity: 1, # required
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -2899,6 +2899,99 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes the strategy for using unused Capacity Reservations for
+    # fulfilling On-Demand capacity.
+    #
+    # <note markdown="1"> This strategy can only be used if the EC2 Fleet is of type `instant`.
+    #
+    #  </note>
+    #
+    # For more information about Capacity Reservations, see [On-Demand
+    # Capacity Reservations][1] in the *Amazon Elastic Compute Cloud User
+    # Guide*. For examples of using Capacity Reservations in an EC2 Fleet,
+    # see [EC2 Fleet Example Configurations][2] in the *Amazon Elastic
+    # Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-examples.html
+    #
+    # @!attribute [rw] usage_strategy
+    #   Indicates whether to use unused Capacity Reservations for fulfilling
+    #   On-Demand capacity.
+    #
+    #   If you specify `use-capacity-reservations-first`, the fleet uses
+    #   unused Capacity Reservations to fulfill On-Demand capacity up to the
+    #   target On-Demand capacity. If multiple instance pools have unused
+    #   Capacity Reservations, the On-Demand allocation strategy
+    #   (`lowest-price` or `prioritized`) is applied. If the number of
+    #   unused Capacity Reservations is less than the On-Demand target
+    #   capacity, the remaining On-Demand target capacity is launched
+    #   according to the On-Demand allocation strategy (`lowest-price` or
+    #   `prioritized`).
+    #
+    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   capacity according to the chosen On-Demand allocation strategy.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationOptions AWS API Documentation
+    #
+    class CapacityReservationOptions < Struct.new(
+      :usage_strategy)
+      include Aws::Structure
+    end
+
+    # Describes the strategy for using unused Capacity Reservations for
+    # fulfilling On-Demand capacity.
+    #
+    # <note markdown="1"> This strategy can only be used if the EC2 Fleet is of type `instant`.
+    #
+    #  </note>
+    #
+    # For more information about Capacity Reservations, see [On-Demand
+    # Capacity Reservations][1] in the *Amazon Elastic Compute Cloud User
+    # Guide*. For examples of using Capacity Reservations in an EC2 Fleet,
+    # see [EC2 Fleet Example Configurations][2] in the *Amazon Elastic
+    # Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-examples.html
+    #
+    # @note When making an API call, you may pass CapacityReservationOptionsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #       }
+    #
+    # @!attribute [rw] usage_strategy
+    #   Indicates whether to use unused Capacity Reservations for fulfilling
+    #   On-Demand capacity.
+    #
+    #   If you specify `use-capacity-reservations-first`, the fleet uses
+    #   unused Capacity Reservations to fulfill On-Demand capacity up to the
+    #   target On-Demand capacity. If multiple instance pools have unused
+    #   Capacity Reservations, the On-Demand allocation strategy
+    #   (`lowest-price` or `prioritized`) is applied. If the number of
+    #   unused Capacity Reservations is less than the On-Demand target
+    #   capacity, the remaining On-Demand target capacity is launched
+    #   according to the On-Demand allocation strategy (`lowest-price` or
+    #   `prioritized`).
+    #
+    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   capacity according to the chosen On-Demand allocation strategy.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationOptionsRequest AWS API Documentation
+    #
+    class CapacityReservationOptionsRequest < Struct.new(
+      :usage_strategy)
+      include Aws::Structure
+    end
+
     # Describes an instance's Capacity Reservation targeting option. You
     # can specify only one parameter at a time. If you specify
     # `CapacityReservationPreference` and `CapacityReservationTarget`, the
@@ -4008,11 +4101,12 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] kms_key_id
-    #   An identifier for the AWS Key Management Service (AWS KMS) customer
-    #   master key (CMK) to use when creating the encrypted volume. This
-    #   parameter is only required if you want to use a non-default CMK; if
-    #   this parameter is not specified, the default CMK for EBS is used. If
-    #   a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
+    #   customer master key (CMK) to use when creating the encrypted volume.
+    #   This parameter is only required if you want to use a non-default
+    #   CMK; if this parameter is not specified, the default CMK for EBS is
+    #   used. If a `KmsKeyId` is specified, the `Encrypted` flag must also
+    #   be set.
     #
     #   To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias
     #   name, or alias ARN. When using an alias name, prefix it with
@@ -4033,6 +4127,8 @@ module Aws::EC2
     #
     #   The specified CMK must exist in the Region that the snapshot is
     #   being copied to.
+    #
+    #   Amazon EBS does not support asymmetric CMKs.
     #   @return [String]
     #
     # @!attribute [rw] name
@@ -4094,7 +4190,7 @@ module Aws::EC2
     #         source_snapshot_id: "String", # required
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -4298,7 +4394,7 @@ module Aws::EC2
     #         instance_match_criteria: "open", # accepts open, targeted
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -4494,7 +4590,7 @@ module Aws::EC2
     #         client_token: "String",
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -4970,8 +5066,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -4991,7 +5087,7 @@ module Aws::EC2
     #
     # @!attribute [rw] error_message
     #   The error message that describes why the instance could not be
-    #   launched. For more information about error messages, see ee [Error
+    #   launched. For more information about error messages, see [Error
     #   Codes][1].
     #
     #
@@ -5013,8 +5109,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -5031,7 +5127,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] platform
-    #   The value is `Windows` for Windows instances; otherwise blank.
+    #   The value is `Windows` for Windows instances. Otherwise, the value
+    #   is blank.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFleetInstance AWS API Documentation
@@ -5062,6 +5159,9 @@ module Aws::EC2
     #         },
     #         on_demand_options: {
     #           allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
+    #           capacity_reservation_options: {
+    #             usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #           },
     #           single_instance_type: false,
     #           single_availability_zone: false,
     #           min_target_capacity: 1,
@@ -5110,7 +5210,7 @@ module Aws::EC2
     #         replace_unhealthy_instances: false,
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -5129,7 +5229,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] client_token
-    #   Unique, case-sensitive identifier you provide to ensure the
+    #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [Ensuring
     #   Idempotency][1].
     #
@@ -5430,7 +5530,7 @@ module Aws::EC2
     #         client_token: "String",
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -5787,7 +5887,7 @@ module Aws::EC2
     #           user_data: "String",
     #           tag_specifications: [
     #             {
-    #               resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #               resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #               tags: [
     #                 {
     #                   key: "String",
@@ -5843,7 +5943,7 @@ module Aws::EC2
     #         },
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -5992,7 +6092,7 @@ module Aws::EC2
     #           user_data: "String",
     #           tag_specifications: [
     #             {
-    #               resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #               resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #               tags: [
     #                 {
     #                   key: "String",
@@ -6922,7 +7022,7 @@ module Aws::EC2
     #         volume_id: "VolumeId", # required
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -6974,7 +7074,7 @@ module Aws::EC2
     #         },
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7215,7 +7315,7 @@ module Aws::EC2
     #         description: "String",
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7434,7 +7534,7 @@ module Aws::EC2
     #         description: "String",
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7565,7 +7665,7 @@ module Aws::EC2
     #         description: "String",
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7656,7 +7756,7 @@ module Aws::EC2
     #         transit_gateway_id: "String", # required
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7713,7 +7813,7 @@ module Aws::EC2
     #         peer_region: "String", # required
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7792,7 +7892,7 @@ module Aws::EC2
     #         },
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7908,7 +8008,7 @@ module Aws::EC2
     #         transit_gateway_id: "String", # required
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -7968,7 +8068,7 @@ module Aws::EC2
     #         },
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -8138,7 +8238,7 @@ module Aws::EC2
     #         dry_run: false,
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -9369,7 +9469,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         key_name: "String", # required
+    #         key_name: "KeyPairName", # required
     #         dry_run: false,
     #       }
     #
@@ -11044,6 +11144,9 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
+    #   * `network-border-group` - The location from where the IP address is
+    #     advertised.
+    #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network
     #     interface that the address is associated with, if any.
     #
@@ -12377,16 +12480,26 @@ module Aws::EC2
     #
     #       {
     #         export_task_ids: ["String"],
+    #         filters: [
+    #           {
+    #             name: "String",
+    #             values: ["String"],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] export_task_ids
     #   The export task IDs.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] filters
+    #   @return [Array<Types::Filter>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeExportTasksRequest AWS API Documentation
     #
     class DescribeExportTasksRequest < Struct.new(
-      :export_task_ids)
+      :export_task_ids,
+      :filters)
       include Aws::Structure
     end
 
@@ -12554,8 +12667,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -12575,7 +12688,7 @@ module Aws::EC2
     #
     # @!attribute [rw] error_message
     #   The error message that describes why the instance could not be
-    #   launched. For more information about error messages, see ee [Error
+    #   launched. For more information about error messages, see [Error
     #   Codes][1].
     #
     #
@@ -12769,8 +12882,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -12787,7 +12900,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] platform
-    #   The value is `Windows` for Windows instances; otherwise blank.
+    #   The value is `Windows` for Windows instances. Otherwise, the value
+    #   is blank.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeFleetsInstances AWS API Documentation
@@ -14406,8 +14520,9 @@ module Aws::EC2
     #     `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the
-    #     image used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #
@@ -14793,6 +14908,7 @@ module Aws::EC2
     #           },
     #         ],
     #         key_names: ["String"],
+    #         key_pair_ids: ["String"],
     #         dry_run: false,
     #       }
     #
@@ -14810,6 +14926,10 @@ module Aws::EC2
     #   Default: Describes all your key pairs.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] key_pair_ids
+    #   The IDs of the key pairs.
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -14822,6 +14942,7 @@ module Aws::EC2
     class DescribeKeyPairsRequest < Struct.new(
       :filters,
       :key_names,
+      :key_pair_ids,
       :dry_run)
       include Aws::Structure
     end
@@ -16032,7 +16153,8 @@ module Aws::EC2
     # @!attribute [rw] max_results
     #   The maximum number of items to return for this request. The request
     #   returns a token that you can specify in a subsequent call to get the
-    #   next set of results.
+    #   next set of results. You cannot specify this parameter and the
+    #   network interface IDs parameter in the same request.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeNetworkInterfacesRequest AWS API Documentation
@@ -16077,6 +16199,7 @@ module Aws::EC2
     #         ],
     #         dry_run: false,
     #         group_names: ["String"],
+    #         group_ids: ["String"],
     #       }
     #
     # @!attribute [rw] filters
@@ -16105,12 +16228,17 @@ module Aws::EC2
     #   otherwise specified.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] group_ids
+    #   The IDs of the placement groups.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribePlacementGroupsRequest AWS API Documentation
     #
     class DescribePlacementGroupsRequest < Struct.new(
       :filters,
       :dry_run,
-      :group_names)
+      :group_names,
+      :group_ids)
       include Aws::Structure
     end
 
@@ -21763,7 +21891,7 @@ module Aws::EC2
     # Describes the disk.
     #
     # @!attribute [rw] size_in_gb
-    #   The size of the disk in GiB.
+    #   The size of the disk in GB.
     #   @return [Integer]
     #
     # @!attribute [rw] count
@@ -21901,7 +22029,8 @@ module Aws::EC2
     #
     # @!attribute [rw] volume_type
     #   The volume type. If you set the type to `io1`, you must also specify
-    #   the IOPS that the volume supports.
+    #   the **Iops** parameter. If you set the type to `gp2`, `st1`, `sc1`,
+    #   or `standard`, you must omit the **Iops** parameter.
     #
     #   Default: `gp2`
     #   @return [String]
@@ -22107,7 +22236,14 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] type
-    #   The type of Elastic Graphics accelerator.
+    #   The type of Elastic Graphics accelerator. For more information about
+    #   the values to specify for `Type`, see [Elastic Graphics Basics][1],
+    #   specifically the Elastic Graphics accelerator column, in the *Amazon
+    #   Elastic Compute Cloud User Guide for Windows Instances*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/elastic-graphics.html#elastic-graphics-basics
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ElasticGpuSpecification AWS API Documentation
@@ -22158,6 +22294,10 @@ module Aws::EC2
     #   attached.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The tags assigned to the Elastic Graphics accelerator.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ElasticGpus AWS API Documentation
     #
     class ElasticGpus < Struct.new(
@@ -22166,7 +22306,8 @@ module Aws::EC2
       :elastic_gpu_type,
       :elastic_gpu_health,
       :elastic_gpu_state,
-      :instance_id)
+      :instance_id,
+      :tags)
       include Aws::Structure
     end
 
@@ -22186,9 +22327,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] count
-    #   The number of elastic inference accelerators of given type to be
-    #   attached to the instance. Only positive values allowed. If not
-    #   specified defaults to 1.
+    #   The number of elastic inference accelerators to attach to the
+    #   instance.
+    #
+    #   Default: 1
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ElasticInferenceAccelerator AWS API Documentation
@@ -22980,6 +23122,9 @@ module Aws::EC2
     #   The status message related to the export task.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ExportTask AWS API Documentation
     #
     class ExportTask < Struct.new(
@@ -22988,7 +23133,8 @@ module Aws::EC2
       :export_to_s3_task,
       :instance_export_details,
       :state,
-      :status_message)
+      :status_message,
+      :tags)
       include Aws::Structure
     end
 
@@ -23286,7 +23432,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] client_token
-    #   Unique, case-sensitive identifier you provide to ensure the
+    #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [Ensuring
     #   Idempotency][1].
     #
@@ -23335,11 +23481,11 @@ module Aws::EC2
     #   the target capacity, or also attempts to `maintain` it. If you
     #   request a certain target capacity, EC2 Fleet only places the
     #   required requests; it does not attempt to replenish instances if
-    #   capacity is diminished, and does not submit requests in alternative
-    #   capacity pools if capacity is unavailable. To maintain a certain
-    #   target capacity, EC2 Fleet places the required requests to meet this
-    #   target capacity. It also automatically replenishes any interrupted
-    #   Spot Instances. Default: `maintain`.
+    #   capacity is diminished, and it does not submit requests in
+    #   alternative capacity pools if capacity is unavailable. To maintain a
+    #   certain target capacity, EC2 Fleet places the required requests to
+    #   meet this target capacity. It also automatically replenishes any
+    #   interrupted Spot Instances. Default: `maintain`.
     #   @return [String]
     #
     # @!attribute [rw] valid_from
@@ -24366,7 +24512,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         host_id_set: ["HostId"], # required
+    #         host_id_set: ["DedicatedHostId"], # required
     #         offering_id: "OfferingId", # required
     #       }
     #
@@ -25878,7 +26024,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # The response information of license configurations.
+    # The response information for license configurations.
     #
     # @!attribute [rw] license_configuration_arn
     #   The ARN of a license configuration.
@@ -25979,11 +26125,12 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   An identifier for the AWS Key Management Service (AWS KMS) customer
-    #   master key (CMK) to use when creating the encrypted AMI. This
-    #   parameter is only required if you want to use a non-default CMK; if
-    #   this parameter is not specified, the default CMK for EBS is used. If
-    #   a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
+    #   customer master key (CMK) to use when creating the encrypted AMI.
+    #   This parameter is only required if you want to use a non-default
+    #   CMK; if this parameter is not specified, the default CMK for EBS is
+    #   used. If a `KmsKeyId` is specified, the `Encrypted` flag must also
+    #   be set.
     #
     #   The CMK identifier may be provided in any of the following formats:
     #
@@ -26011,6 +26158,8 @@ module Aws::EC2
     #
     #   The specified CMK must exist in the Region that the AMI is being
     #   copied to.
+    #
+    #   Amazon EBS does not support asymmetric CMKs.
     #   @return [String]
     #
     # @!attribute [rw] license_type
@@ -26091,8 +26240,9 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   The identifier for the AWS Key Management Service (AWS KMS) customer
-    #   master key (CMK) that was used to create the encrypted AMI.
+    #   The identifier for the symmetric AWS Key Management Service (AWS
+    #   KMS) customer master key (CMK) that was used to create the encrypted
+    #   AMI.
     #   @return [String]
     #
     # @!attribute [rw] license_type
@@ -26203,9 +26353,13 @@ module Aws::EC2
     #   A descriptive status message for the import image task.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   Any tags applied to the import image task.
+    #   @return [Array<Types::Tag>]
+    #
     # @!attribute [rw] license_specifications
-    #   The ARNs of the license configurations associated to the import
-    #   image task.
+    #   The ARNs of the license configurations that are associated with the
+    #   import image task.
     #   @return [Array<Types::ImportImageLicenseConfigurationResponse>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageTask AWS API Documentation
@@ -26224,6 +26378,7 @@ module Aws::EC2
       :snapshot_details,
       :status,
       :status_message,
+      :tags,
       :license_specifications)
       include Aws::Structure
     end
@@ -26495,7 +26650,7 @@ module Aws::EC2
     #
     #       {
     #         dry_run: false,
-    #         key_name: "String", # required
+    #         key_name: "KeyPairName", # required
     #         public_key_material: "data", # required
     #       }
     #
@@ -26604,11 +26759,12 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] kms_key_id
-    #   An identifier for the AWS Key Management Service (AWS KMS) customer
-    #   master key (CMK) to use when creating the encrypted snapshot. This
-    #   parameter is only required if you want to use a non-default CMK; if
-    #   this parameter is not specified, the default CMK for EBS is used. If
-    #   a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
+    #   customer master key (CMK) to use when creating the encrypted
+    #   snapshot. This parameter is only required if you want to use a
+    #   non-default CMK; if this parameter is not specified, the default CMK
+    #   for EBS is used. If a `KmsKeyId` is specified, the `Encrypted` flag
+    #   must also be set.
     #
     #   The CMK identifier may be provided in any of the following formats:
     #
@@ -26636,6 +26792,8 @@ module Aws::EC2
     #
     #   The specified CMK must exist in the Region that the snapshot is
     #   being copied to.
+    #
+    #   Amazon EBS does not support asymmetric CMKs.
     #   @return [String]
     #
     # @!attribute [rw] role_name
@@ -26692,12 +26850,17 @@ module Aws::EC2
     #   Describes an import snapshot task.
     #   @return [Types::SnapshotTaskDetail]
     #
+    # @!attribute [rw] tags
+    #   Any tags applied to the import snapshot task.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportSnapshotTask AWS API Documentation
     #
     class ImportSnapshotTask < Struct.new(
       :description,
       :import_task_id,
-      :snapshot_task_detail)
+      :snapshot_task_detail,
+      :tags)
       include Aws::Structure
     end
 
@@ -28165,7 +28328,7 @@ module Aws::EC2
     # Describes the disks that are available for the instance type.
     #
     # @!attribute [rw] total_size_in_gb
-    #   The total size of the disks, in GiB.
+    #   The total size of the disks, in GB.
     #   @return [Integer]
     #
     # @!attribute [rw] disks
@@ -28204,8 +28367,8 @@ module Aws::EC2
     #   On-Demand.
     #   @return [Array<String>]
     #
-    # @!attribute [rw] supported_root_devices
-    #   Indicates the supported root devices.
+    # @!attribute [rw] supported_root_device_types
+    #   Indicates the supported root device types.
     #   @return [Array<String>]
     #
     # @!attribute [rw] bare_metal
@@ -28285,7 +28448,7 @@ module Aws::EC2
       :current_generation,
       :free_tier_eligible,
       :supported_usage_classes,
-      :supported_root_devices,
+      :supported_root_device_types,
       :bare_metal,
       :hypervisor,
       :processor_info,
@@ -28527,7 +28690,7 @@ module Aws::EC2
     #   address range.
     #
     #   Constraints: Up to 255 characters in length. Allowed characters are
-    #   a-z, A-Z, 0-9, spaces, and .\_-:/()#,@\[\]+=;\\\{\\}!$*
+    #   a-z, A-Z, 0-9, spaces, and .\_-:/()#,@\[\]+=&amp;;\\\{\\}!$*
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/IpRange AWS API Documentation
@@ -28572,7 +28735,7 @@ module Aws::EC2
     #   address range.
     #
     #   Constraints: Up to 255 characters in length. Allowed characters are
-    #   a-z, A-Z, 0-9, spaces, and .\_-:/()#,@\[\]+=;\\\{\\}!$*
+    #   a-z, A-Z, 0-9, spaces, and .\_-:/()#,@\[\]+=&amp;;\\\{\\}!$*
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv6Range AWS API Documentation
@@ -28597,17 +28760,26 @@ module Aws::EC2
     #   The name of the key pair.
     #   @return [String]
     #
+    # @!attribute [rw] key_pair_id
+    #   The ID of the key pair.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/KeyPair AWS API Documentation
     #
     class KeyPair < Struct.new(
       :key_fingerprint,
       :key_material,
-      :key_name)
+      :key_name,
+      :key_pair_id)
       include Aws::Structure
     end
 
     # Describes a key pair.
     #
+    # @!attribute [rw] key_pair_id
+    #   The ID of the key pair.
+    #   @return [String]
+    #
     # @!attribute [rw] key_fingerprint
     #   If you used CreateKeyPair to create the key pair, this is the SHA-1
     #   digest of the DER encoded private key. If you used ImportKeyPair to
@@ -28619,11 +28791,17 @@ module Aws::EC2
     #   The name of the key pair.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   Any tags applied to the key pair.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/KeyPairInfo AWS API Documentation
     #
     class KeyPairInfo < Struct.new(
+      :key_pair_id,
       :key_fingerprint,
-      :key_name)
+      :key_name,
+      :tags)
       include Aws::Structure
     end
 
@@ -29176,8 +29354,8 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] kms_key_id
-    #   The ARN of the AWS Key Management Service (AWS KMS) CMK used for
-    #   encryption.
+    #   The ARN of the symmetric AWS Key Management Service (AWS KMS) CMK
+    #   used for encryption.
     #   @return [String]
     #
     # @!attribute [rw] snapshot_id
@@ -29224,9 +29402,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] count
-    #   The number of elastic inference accelerators of given type to be
-    #   attached to the instance. Only positive values allowed. If not
-    #   specified defaults to 1.
+    #   The number of elastic inference accelerators to attach to the
+    #   instance.
+    #
+    #   Default: 1
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateElasticInferenceAccelerator AWS API Documentation
@@ -29245,9 +29424,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] count
-    #   The number of elastic inference accelerators of given type to be
-    #   attached to the instance. Only positive values allowed. If not
-    #   specified defaults to 1.
+    #   The number of elastic inference accelerators to attach to the
+    #   instance.
+    #
+    #   Default: 1
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateElasticInferenceAcceleratorResponse AWS API Documentation
@@ -29936,7 +30116,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -30691,6 +30871,8 @@ module Aws::EC2
     #   AWS authenticates the CMK asynchronously. Therefore, if you specify
     #   an ID, alias, or ARN that is not valid, the action can appear to
     #   complete, but eventually fails.
+    #
+    #   Amazon EBS does not support asymmetric CMKs.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -31585,7 +31767,7 @@ module Aws::EC2
     #       {
     #         affinity: "default", # accepts default, host
     #         group_name: "PlacementGroupName",
-    #         host_id: "HostId",
+    #         host_id: "DedicatedHostId",
     #         instance_id: "InstanceId", # required
     #         tenancy: "dedicated", # accepts dedicated, host
     #         partition_number: 1,
@@ -32301,6 +32483,10 @@ module Aws::EC2
     #
     # @!attribute [rw] options
     #   The new VPC attachment options.
+    #
+    #   <note markdown="1"> You cannot modify the IPv6 options.
+    #
+    #    </note>
     #   @return [Types::ModifyTransitGatewayVpcAttachmentRequestOptions]
     #
     # @!attribute [rw] dry_run
@@ -34066,14 +34252,21 @@ module Aws::EC2
     #   `lowest-price`.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_reservation_options
+    #   The strategy for using unused Capacity Reservations for fulfilling
+    #   On-Demand capacity. Supported only for fleets of type `instant`.
+    #   @return [Types::CapacityReservationOptions]
+    #
     # @!attribute [rw] single_instance_type
     #   Indicates that the fleet uses a single instance type to launch all
-    #   On-Demand Instances in the fleet.
+    #   On-Demand Instances in the fleet. Supported only for fleets of type
+    #   `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] single_availability_zone
     #   Indicates that the fleet launches all On-Demand Instances into a
-    #   single Availability Zone.
+    #   single Availability Zone. Supported only for fleets of type
+    #   `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] min_target_capacity
@@ -34091,6 +34284,7 @@ module Aws::EC2
     #
     class OnDemandOptions < Struct.new(
       :allocation_strategy,
+      :capacity_reservation_options,
       :single_instance_type,
       :single_availability_zone,
       :min_target_capacity,
@@ -34105,6 +34299,9 @@ module Aws::EC2
     #
     #       {
     #         allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
+    #         capacity_reservation_options: {
+    #           usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #         },
     #         single_instance_type: false,
     #         single_availability_zone: false,
     #         min_target_capacity: 1,
@@ -34121,14 +34318,21 @@ module Aws::EC2
     #   `lowest-price`.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_reservation_options
+    #   The strategy for using unused Capacity Reservations for fulfilling
+    #   On-Demand capacity. Supported only for fleets of type `instant`.
+    #   @return [Types::CapacityReservationOptionsRequest]
+    #
     # @!attribute [rw] single_instance_type
     #   Indicates that the fleet uses a single instance type to launch all
-    #   On-Demand Instances in the fleet.
+    #   On-Demand Instances in the fleet. Supported only for fleets of type
+    #   `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] single_availability_zone
     #   Indicates that the fleet launches all On-Demand Instances into a
-    #   single Availability Zone.
+    #   single Availability Zone. Supported only for fleets of type
+    #   `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] min_target_capacity
@@ -34146,6 +34350,7 @@ module Aws::EC2
     #
     class OnDemandOptionsRequest < Struct.new(
       :allocation_strategy,
+      :capacity_reservation_options,
       :single_instance_type,
       :single_availability_zone,
       :min_target_capacity,
@@ -34585,13 +34790,23 @@ module Aws::EC2
     #   `partition`.
     #   @return [Integer]
     #
+    # @!attribute [rw] group_id
+    #   The ID of the placement group.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   Any tags applied to the placement group.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PlacementGroup AWS API Documentation
     #
     class PlacementGroup < Struct.new(
       :group_name,
       :state,
       :strategy,
-      :partition_count)
+      :partition_count,
+      :group_id,
+      :tags)
       include Aws::Structure
     end
 
@@ -34611,7 +34826,7 @@ module Aws::EC2
     # Describes the placement of an instance.
     #
     # @!attribute [rw] group_name
-    #   The name of the placement group the instance is in.
+    #   The name of the placement group that the instance is in.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PlacementResponse AWS API Documentation
@@ -35131,7 +35346,7 @@ module Aws::EC2
     #       {
     #         client_token: "String",
     #         currency_code: "USD", # accepts USD
-    #         host_id_set: ["HostId"], # required
+    #         host_id_set: ["DedicatedHostId"], # required
     #         limit_price: "String",
     #         offering_id: "OfferingId", # required
     #       }
@@ -36490,7 +36705,7 @@ module Aws::EC2
     #         user_data: "String",
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -36867,7 +37082,7 @@ module Aws::EC2
     #               weighted_capacity: 1.0,
     #               tag_specifications: [
     #                 {
-    #                   resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #                   resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #                   tags: [
     #                     {
     #                       key: "String",
@@ -38922,7 +39137,7 @@ module Aws::EC2
     #         ],
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -41332,7 +41547,7 @@ module Aws::EC2
     #         weighted_capacity: 1.0,
     #         tag_specifications: [
     #           {
-    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #             tags: [
     #               {
     #                 key: "String",
@@ -41618,7 +41833,7 @@ module Aws::EC2
     #             weighted_capacity: 1.0,
     #             tag_specifications: [
     #               {
-    #                 resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #                 resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #                 tags: [
     #                   {
     #                     key: "String",
@@ -41898,7 +42113,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -42162,7 +42377,7 @@ module Aws::EC2
     #   is the default allocation strategy.
     #
     #   If the allocation strategy is `diversified`, EC2 Fleet launches
-    #   instances from all the Spot Instance pools that you specify.
+    #   instances from all of the Spot Instance pools that you specify.
     #
     #   If the allocation strategy is `capacity-optimized`, EC2 Fleet
     #   launches instances from Spot Instance pools with optimal capacity
@@ -42184,12 +42399,13 @@ module Aws::EC2
     #
     # @!attribute [rw] single_instance_type
     #   Indicates that the fleet uses a single instance type to launch all
-    #   Spot Instances in the fleet.
+    #   Spot Instances in the fleet. Supported only for fleets of type
+    #   `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] single_availability_zone
     #   Indicates that the fleet launches all Spot Instances into a single
-    #   Availability Zone.
+    #   Availability Zone. Supported only for fleets of type `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] min_target_capacity
@@ -42240,7 +42456,7 @@ module Aws::EC2
     #   is the default allocation strategy.
     #
     #   If the allocation strategy is `diversified`, EC2 Fleet launches
-    #   instances from all the Spot Instance pools that you specify.
+    #   instances from all of the Spot Instance pools that you specify.
     #
     #   If the allocation strategy is `capacity-optimized`, EC2 Fleet
     #   launches instances from Spot Instance pools with optimal capacity
@@ -42262,12 +42478,13 @@ module Aws::EC2
     #
     # @!attribute [rw] single_instance_type
     #   Indicates that the fleet uses a single instance type to launch all
-    #   Spot Instances in the fleet.
+    #   Spot Instances in the fleet. Supported only for fleets of type
+    #   `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] single_availability_zone
     #   Indicates that the fleet launches all Spot Instances into a single
-    #   Availability Zone.
+    #   Availability Zone. Supported only for fleets of type `instant`.
     #   @return [Boolean]
     #
     # @!attribute [rw] min_target_capacity
@@ -42914,7 +43131,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, launch-template, natgateway, network-acl, network-interface, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
     #         tags: [
     #           {
     #             key: "String",
@@ -42927,11 +43144,11 @@ module Aws::EC2
     #   The type of resource to tag. Currently, the resource types that
     #   support tagging on creation are: `capacity-reservation` \|
     #   `client-vpn-endpoint` \| `dedicated-host` \| `fleet` \| `fpga-image`
-    #   \| `instance` \| `launch-template` \| `snapshot` \|
-    #   `traffic-mirror-filter` \| `traffic-mirror-session` \|
-    #   `traffic-mirror-target` \| `transit-gateway` \|
-    #   `transit-gateway-attachment` \| `transit-gateway-route-table` \|
-    #   `volume`.
+    #   \| `instance` \| `key-pair` \| `launch-template` \|
+    #   `placement-group` \| `snapshot` \| `traffic-mirror-filter` \|
+    #   `traffic-mirror-session` \| `traffic-mirror-target` \|
+    #   `transit-gateway` \| `transit-gateway-attachment` \|
+    #   `transit-gateway-route-table` \| `volume`.
     #
     #   To tag a resource after it has been created, see [CreateTags][1].
     #
@@ -42959,13 +43176,13 @@ module Aws::EC2
     # of 0 and add capacity later.
     #
     # You can use the On-Demand Instance `MaxTotalPrice` parameter, the Spot
-    # Instance `MaxTotalPrice`, or both to ensure your fleet cost does not
-    # exceed your budget. If you set a maximum price per hour for the
+    # Instance `MaxTotalPrice`, or both to ensure that your fleet cost does
+    # not exceed your budget. If you set a maximum price per hour for the
     # On-Demand Instances and Spot Instances in your request, EC2 Fleet will
-    # launch instances until it reaches the maximum amount you're willing
-    # to pay. When the maximum amount you're willing to pay is reached, the
-    # fleet stops launching instances even if it hasn’t met the target
-    # capacity. The `MaxTotalPrice` parameters are located in and
+    # launch instances until it reaches the maximum amount that you're
+    # willing to pay. When the maximum amount you're willing to pay is
+    # reached, the fleet stops launching instances even if it hasn’t met the
+    # target capacity. The `MaxTotalPrice` parameters are located in and
     #
     # @!attribute [rw] total_target_capacity
     #   The number of units to request, filled using
@@ -43011,9 +43228,9 @@ module Aws::EC2
     # your fleet cost does not exceed your budget. If you set a maximum
     # price per hour for the On-Demand Instances and Spot Instances in your
     # request, EC2 Fleet will launch instances until it reaches the maximum
-    # amount you're willing to pay. When the maximum amount you're willing
-    # to pay is reached, the fleet stops launching instances even if it
-    # hasn’t met the target capacity. The `MaxTotalPrice` parameters are
+    # amount that you're willing to pay. When the maximum amount you're
+    # willing to pay is reached, the fleet stops launching instances even if
+    # it hasn’t met the target capacity. The `MaxTotalPrice` parameters are
     # located in and .
     #
     # @note When making an API call, you may pass TargetCapacitySpecificationRequest