aws-sdk-ec2 1.149.0 → 1.151.0

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

@@ -182,6 +182,7 @@ module Aws::EC2
     ClientCertificateRevocationListStatus = Shapes::StructureShape.new(name: 'ClientCertificateRevocationListStatus')
     ClientCertificateRevocationListStatusCode = Shapes::StringShape.new(name: 'ClientCertificateRevocationListStatusCode')
     ClientData = Shapes::StructureShape.new(name: 'ClientData')
+    ClientVpnAssociationId = Shapes::StringShape.new(name: 'ClientVpnAssociationId')
     ClientVpnAuthentication = Shapes::StructureShape.new(name: 'ClientVpnAuthentication')
     ClientVpnAuthenticationList = Shapes::ListShape.new(name: 'ClientVpnAuthenticationList')
     ClientVpnAuthenticationRequest = Shapes::StructureShape.new(name: 'ClientVpnAuthenticationRequest')
@@ -865,6 +866,7 @@ module Aws::EC2
     ExportToS3TaskSpecification = Shapes::StructureShape.new(name: 'ExportToS3TaskSpecification')
     ExportTransitGatewayRoutesRequest = Shapes::StructureShape.new(name: 'ExportTransitGatewayRoutesRequest')
     ExportTransitGatewayRoutesResult = Shapes::StructureShape.new(name: 'ExportTransitGatewayRoutesResult')
+    ExportVmTaskId = Shapes::StringShape.new(name: 'ExportVmTaskId')
     FailedQueuedPurchaseDeletion = Shapes::StructureShape.new(name: 'FailedQueuedPurchaseDeletion')
     FailedQueuedPurchaseDeletionSet = Shapes::ListShape.new(name: 'FailedQueuedPurchaseDeletionSet')
     FastSnapshotRestoreStateCode = Shapes::StringShape.new(name: 'FastSnapshotRestoreStateCode')
@@ -875,8 +877,8 @@ module Aws::EC2
     FleetData = Shapes::StructureShape.new(name: 'FleetData')
     FleetEventType = Shapes::StringShape.new(name: 'FleetEventType')
     FleetExcessCapacityTerminationPolicy = Shapes::StringShape.new(name: 'FleetExcessCapacityTerminationPolicy')
+    FleetId = Shapes::StringShape.new(name: 'FleetId')
     FleetIdSet = Shapes::ListShape.new(name: 'FleetIdSet')
-    FleetIdentifier = Shapes::StringShape.new(name: 'FleetIdentifier')
     FleetLaunchTemplateConfig = Shapes::StructureShape.new(name: 'FleetLaunchTemplateConfig')
     FleetLaunchTemplateConfigList = Shapes::ListShape.new(name: 'FleetLaunchTemplateConfigList')
     FleetLaunchTemplateConfigListRequest = Shapes::ListShape.new(name: 'FleetLaunchTemplateConfigListRequest')
@@ -1810,6 +1812,7 @@ module Aws::EC2
     TrafficMirrorTargetType = Shapes::StringShape.new(name: 'TrafficMirrorTargetType')
     TrafficMirroringMaxResults = Shapes::IntegerShape.new(name: 'TrafficMirroringMaxResults')
     TrafficType = Shapes::StringShape.new(name: 'TrafficType')
+    TransitAssociationGatewayId = Shapes::StringShape.new(name: 'TransitAssociationGatewayId')
     TransitGateway = Shapes::StructureShape.new(name: 'TransitGateway')
     TransitGatewayAssociation = Shapes::StructureShape.new(name: 'TransitGatewayAssociation')
     TransitGatewayAssociationState = Shapes::StringShape.new(name: 'TransitGatewayAssociationState')
@@ -2112,7 +2115,7 @@ module Aws::EC2
     AllocateHostsResult.add_member(:host_ids, Shapes::ShapeRef.new(shape: ResponseHostIdList, location_name: "hostIdSet"))
     AllocateHostsResult.struct_class = Types::AllocateHostsResult
 
-    AllocationIdList.member = Shapes::ShapeRef.new(shape: String, location_name: "AllocationId")
+    AllocationIdList.member = Shapes::ShapeRef.new(shape: AllocationId, location_name: "AllocationId")
 
     AllowedPrincipal.add_member(:principal_type, Shapes::ShapeRef.new(shape: PrincipalType, location_name: "principalType"))
     AllowedPrincipal.add_member(:principal, Shapes::ShapeRef.new(shape: String, location_name: "principal"))
@@ -2430,7 +2433,7 @@ module Aws::EC2
     CancelConversionRequest.add_member(:reason_message, Shapes::ShapeRef.new(shape: String, location_name: "reasonMessage"))
     CancelConversionRequest.struct_class = Types::CancelConversionRequest
 
-    CancelExportTaskRequest.add_member(:export_task_id, Shapes::ShapeRef.new(shape: ExportTaskId, required: true, location_name: "exportTaskId"))
+    CancelExportTaskRequest.add_member(:export_task_id, Shapes::ShapeRef.new(shape: ExportVmTaskId, required: true, location_name: "exportTaskId"))
     CancelExportTaskRequest.struct_class = Types::CancelExportTaskRequest
 
     CancelImportTaskRequest.add_member(:cancel_reason, Shapes::ShapeRef.new(shape: String, location_name: "CancelReason"))
@@ -2508,7 +2511,7 @@ module Aws::EC2
     CapacityReservation.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     CapacityReservation.struct_class = Types::CapacityReservation
 
-    CapacityReservationIdSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+    CapacityReservationIdSet.member = Shapes::ShapeRef.new(shape: CapacityReservationId, location_name: "item")
 
     CapacityReservationOptions.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "usageStrategy"))
     CapacityReservationOptions.struct_class = Types::CapacityReservationOptions
@@ -2660,7 +2663,7 @@ module Aws::EC2
     ClientVpnRouteStatus.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     ClientVpnRouteStatus.struct_class = Types::ClientVpnRouteStatus
 
-    ClientVpnSecurityGroupIdSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+    ClientVpnSecurityGroupIdSet.member = Shapes::ShapeRef.new(shape: SecurityGroupId, location_name: "item")
 
     CoipAddressUsage.add_member(:allocation_id, Shapes::ShapeRef.new(shape: String, location_name: "allocationId"))
     CoipAddressUsage.add_member(:aws_account_id, Shapes::ShapeRef.new(shape: String, location_name: "awsAccountId"))
@@ -2676,7 +2679,7 @@ module Aws::EC2
     CoipPool.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     CoipPool.struct_class = Types::CoipPool
 
-    CoipPoolIdSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+    CoipPoolIdSet.member = Shapes::ShapeRef.new(shape: CoipPoolId, location_name: "item")
 
     CoipPoolSet.member = Shapes::ShapeRef.new(shape: CoipPool, location_name: "item")
 
@@ -2893,7 +2896,7 @@ module Aws::EC2
     CreateFleetRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateFleetRequest.struct_class = Types::CreateFleetRequest
 
-    CreateFleetResult.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, location_name: "fleetId"))
+    CreateFleetResult.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
     CreateFleetResult.add_member(:errors, Shapes::ShapeRef.new(shape: CreateFleetErrorsSet, location_name: "errorSet"))
     CreateFleetResult.add_member(:instances, Shapes::ShapeRef.new(shape: CreateFleetInstancesSet, location_name: "fleetInstanceSet"))
     CreateFleetResult.struct_class = Types::CreateFleetResult
@@ -3209,7 +3212,7 @@ module Aws::EC2
     CreateTransitGatewayMulticastDomainResult.struct_class = Types::CreateTransitGatewayMulticastDomainResult
 
     CreateTransitGatewayPeeringAttachmentRequest.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: TransitGatewayId, required: true, location_name: "TransitGatewayId"))
-    CreateTransitGatewayPeeringAttachmentRequest.add_member(:peer_transit_gateway_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "PeerTransitGatewayId"))
+    CreateTransitGatewayPeeringAttachmentRequest.add_member(:peer_transit_gateway_id, Shapes::ShapeRef.new(shape: TransitAssociationGatewayId, required: true, location_name: "PeerTransitGatewayId"))
     CreateTransitGatewayPeeringAttachmentRequest.add_member(:peer_account_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "PeerAccountId"))
     CreateTransitGatewayPeeringAttachmentRequest.add_member(:peer_region, Shapes::ShapeRef.new(shape: String, required: true, location_name: "PeerRegion"))
     CreateTransitGatewayPeeringAttachmentRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
@@ -3427,14 +3430,14 @@ module Aws::EC2
     DeleteFleetError.struct_class = Types::DeleteFleetError
 
     DeleteFleetErrorItem.add_member(:error, Shapes::ShapeRef.new(shape: DeleteFleetError, location_name: "error"))
-    DeleteFleetErrorItem.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, location_name: "fleetId"))
+    DeleteFleetErrorItem.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
     DeleteFleetErrorItem.struct_class = Types::DeleteFleetErrorItem
 
     DeleteFleetErrorSet.member = Shapes::ShapeRef.new(shape: DeleteFleetErrorItem, location_name: "item")
 
     DeleteFleetSuccessItem.add_member(:current_fleet_state, Shapes::ShapeRef.new(shape: FleetStateCode, location_name: "currentFleetState"))
     DeleteFleetSuccessItem.add_member(:previous_fleet_state, Shapes::ShapeRef.new(shape: FleetStateCode, location_name: "previousFleetState"))
-    DeleteFleetSuccessItem.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, location_name: "fleetId"))
+    DeleteFleetSuccessItem.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
     DeleteFleetSuccessItem.struct_class = Types::DeleteFleetSuccessItem
 
     DeleteFleetSuccessSet.member = Shapes::ShapeRef.new(shape: DeleteFleetSuccessItem, location_name: "item")
@@ -3987,27 +3990,27 @@ module Aws::EC2
     DescribeFleetHistoryRequest.add_member(:event_type, Shapes::ShapeRef.new(shape: FleetEventType, location_name: "EventType"))
     DescribeFleetHistoryRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxResults"))
     DescribeFleetHistoryRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
-    DescribeFleetHistoryRequest.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, required: true, location_name: "FleetId"))
+    DescribeFleetHistoryRequest.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, required: true, location_name: "FleetId"))
     DescribeFleetHistoryRequest.add_member(:start_time, Shapes::ShapeRef.new(shape: DateTime, required: true, location_name: "StartTime"))
     DescribeFleetHistoryRequest.struct_class = Types::DescribeFleetHistoryRequest
 
     DescribeFleetHistoryResult.add_member(:history_records, Shapes::ShapeRef.new(shape: HistoryRecordSet, location_name: "historyRecordSet"))
     DescribeFleetHistoryResult.add_member(:last_evaluated_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "lastEvaluatedTime"))
     DescribeFleetHistoryResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
-    DescribeFleetHistoryResult.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, location_name: "fleetId"))
+    DescribeFleetHistoryResult.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
     DescribeFleetHistoryResult.add_member(:start_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "startTime"))
     DescribeFleetHistoryResult.struct_class = Types::DescribeFleetHistoryResult
 
     DescribeFleetInstancesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DescribeFleetInstancesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxResults"))
     DescribeFleetInstancesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
-    DescribeFleetInstancesRequest.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, required: true, location_name: "FleetId"))
+    DescribeFleetInstancesRequest.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, required: true, location_name: "FleetId"))
     DescribeFleetInstancesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeFleetInstancesRequest.struct_class = Types::DescribeFleetInstancesRequest
 
     DescribeFleetInstancesResult.add_member(:active_instances, Shapes::ShapeRef.new(shape: ActiveInstanceSet, location_name: "activeInstanceSet"))
     DescribeFleetInstancesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
-    DescribeFleetInstancesResult.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, location_name: "fleetId"))
+    DescribeFleetInstancesResult.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
     DescribeFleetInstancesResult.struct_class = Types::DescribeFleetInstancesResult
 
     DescribeFleetsErrorSet.member = Shapes::ShapeRef.new(shape: DescribeFleetError, location_name: "item")
@@ -4824,7 +4827,7 @@ module Aws::EC2
     DescribeVolumesResult.struct_class = Types::DescribeVolumesResult
 
     DescribeVpcAttributeRequest.add_member(:attribute, Shapes::ShapeRef.new(shape: VpcAttributeName, required: true, location_name: "Attribute"))
-    DescribeVpcAttributeRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "VpcId"))
+    DescribeVpcAttributeRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "VpcId"))
     DescribeVpcAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeVpcAttributeRequest.struct_class = Types::DescribeVpcAttributeRequest
 
@@ -5086,7 +5089,7 @@ module Aws::EC2
     DisassociateAddressRequest.struct_class = Types::DisassociateAddressRequest
 
     DisassociateClientVpnTargetNetworkRequest.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: ClientVpnEndpointId, required: true, location_name: "ClientVpnEndpointId"))
-    DisassociateClientVpnTargetNetworkRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "AssociationId"))
+    DisassociateClientVpnTargetNetworkRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: ClientVpnAssociationId, required: true, location_name: "AssociationId"))
     DisassociateClientVpnTargetNetworkRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DisassociateClientVpnTargetNetworkRequest.struct_class = Types::DisassociateClientVpnTargetNetworkRequest
 
@@ -5399,7 +5402,7 @@ module Aws::EC2
     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")
+    ExportTaskIdStringList.member = Shapes::ShapeRef.new(shape: ExportTaskId, location_name: "ExportTaskId")
 
     ExportTaskList.member = Shapes::ShapeRef.new(shape: ExportTask, location_name: "item")
 
@@ -5446,7 +5449,7 @@ module Aws::EC2
 
     FleetData.add_member(:activity_status, Shapes::ShapeRef.new(shape: FleetActivityStatus, location_name: "activityStatus"))
     FleetData.add_member(:create_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "createTime"))
-    FleetData.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, location_name: "fleetId"))
+    FleetData.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
     FleetData.add_member(:fleet_state, Shapes::ShapeRef.new(shape: FleetStateCode, location_name: "fleetState"))
     FleetData.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
     FleetData.add_member(:excess_capacity_termination_policy, Shapes::ShapeRef.new(shape: FleetExcessCapacityTerminationPolicy, location_name: "excessCapacityTerminationPolicy"))
@@ -5466,7 +5469,7 @@ module Aws::EC2
     FleetData.add_member(:instances, Shapes::ShapeRef.new(shape: DescribeFleetsInstancesSet, location_name: "fleetInstanceSet"))
     FleetData.struct_class = Types::FleetData
 
-    FleetIdSet.member = Shapes::ShapeRef.new(shape: FleetIdentifier)
+    FleetIdSet.member = Shapes::ShapeRef.new(shape: FleetId)
 
     FleetLaunchTemplateConfig.add_member(:launch_template_specification, Shapes::ShapeRef.new(shape: FleetLaunchTemplateSpecification, location_name: "launchTemplateSpecification"))
     FleetLaunchTemplateConfig.add_member(:overrides, Shapes::ShapeRef.new(shape: FleetLaunchTemplateOverridesList, location_name: "overrides"))
@@ -6026,7 +6029,7 @@ module Aws::EC2
     ImportInstanceLaunchSpecification.add_member(:monitoring, Shapes::ShapeRef.new(shape: Boolean, location_name: "monitoring"))
     ImportInstanceLaunchSpecification.add_member(:placement, Shapes::ShapeRef.new(shape: Placement, location_name: "placement"))
     ImportInstanceLaunchSpecification.add_member(:private_ip_address, Shapes::ShapeRef.new(shape: String, location_name: "privateIpAddress"))
-    ImportInstanceLaunchSpecification.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
+    ImportInstanceLaunchSpecification.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, location_name: "subnetId"))
     ImportInstanceLaunchSpecification.add_member(:user_data, Shapes::ShapeRef.new(shape: UserData, location_name: "userData"))
     ImportInstanceLaunchSpecification.struct_class = Types::ImportInstanceLaunchSpecification
 
@@ -6597,7 +6600,7 @@ module Aws::EC2
     LaunchTemplateEbsBlockDeviceRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "Encrypted"))
     LaunchTemplateEbsBlockDeviceRequest.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "DeleteOnTermination"))
     LaunchTemplateEbsBlockDeviceRequest.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "Iops"))
-    LaunchTemplateEbsBlockDeviceRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "KmsKeyId"))
+    LaunchTemplateEbsBlockDeviceRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "KmsKeyId"))
     LaunchTemplateEbsBlockDeviceRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "SnapshotId"))
     LaunchTemplateEbsBlockDeviceRequest.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "VolumeSize"))
     LaunchTemplateEbsBlockDeviceRequest.add_member(:volume_type, Shapes::ShapeRef.new(shape: VolumeType, location_name: "VolumeType"))
@@ -6939,7 +6942,7 @@ module Aws::EC2
 
     ModifyFleetRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyFleetRequest.add_member(:excess_capacity_termination_policy, Shapes::ShapeRef.new(shape: FleetExcessCapacityTerminationPolicy, location_name: "ExcessCapacityTerminationPolicy"))
-    ModifyFleetRequest.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetIdentifier, required: true, location_name: "FleetId"))
+    ModifyFleetRequest.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, required: true, location_name: "FleetId"))
     ModifyFleetRequest.add_member(:target_capacity_specification, Shapes::ShapeRef.new(shape: TargetCapacitySpecificationRequest, required: true, location_name: "TargetCapacitySpecification"))
     ModifyFleetRequest.struct_class = Types::ModifyFleetRequest
 
@@ -8321,16 +8324,16 @@ module Aws::EC2
     RunInstancesRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "InstanceType"))
     RunInstancesRequest.add_member(:ipv_6_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "Ipv6AddressCount"))
     RunInstancesRequest.add_member(:ipv_6_addresses, Shapes::ShapeRef.new(shape: InstanceIpv6AddressList, location_name: "Ipv6Address"))
-    RunInstancesRequest.add_member(:kernel_id, Shapes::ShapeRef.new(shape: String, location_name: "KernelId"))
+    RunInstancesRequest.add_member(:kernel_id, Shapes::ShapeRef.new(shape: KernelId, location_name: "KernelId"))
     RunInstancesRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: KeyPairName, location_name: "KeyName"))
     RunInstancesRequest.add_member(:max_count, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "MaxCount"))
     RunInstancesRequest.add_member(:min_count, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "MinCount"))
     RunInstancesRequest.add_member(:monitoring, Shapes::ShapeRef.new(shape: RunInstancesMonitoringEnabled, location_name: "Monitoring"))
     RunInstancesRequest.add_member(:placement, Shapes::ShapeRef.new(shape: Placement, location_name: "Placement"))
-    RunInstancesRequest.add_member(:ramdisk_id, Shapes::ShapeRef.new(shape: String, location_name: "RamdiskId"))
+    RunInstancesRequest.add_member(:ramdisk_id, Shapes::ShapeRef.new(shape: RamdiskId, location_name: "RamdiskId"))
     RunInstancesRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdStringList, location_name: "SecurityGroupId"))
     RunInstancesRequest.add_member(:security_groups, Shapes::ShapeRef.new(shape: SecurityGroupStringList, location_name: "SecurityGroup"))
-    RunInstancesRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "SubnetId"))
+    RunInstancesRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, location_name: "SubnetId"))
     RunInstancesRequest.add_member(:user_data, Shapes::ShapeRef.new(shape: String, location_name: "UserData"))
     RunInstancesRequest.add_member(:additional_info, Shapes::ShapeRef.new(shape: String, location_name: "additionalInfo"))
     RunInstancesRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
@@ -8984,7 +8987,7 @@ module Aws::EC2
     TargetReservationValueSet.member = Shapes::ShapeRef.new(shape: TargetReservationValue, location_name: "item")
 
     TerminateClientVpnConnectionsRequest.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: ClientVpnEndpointId, required: true, location_name: "ClientVpnEndpointId"))
-    TerminateClientVpnConnectionsRequest.add_member(:connection_id, Shapes::ShapeRef.new(shape: String, location_name: "ConnectionId"))
+    TerminateClientVpnConnectionsRequest.add_member(:connection_id, Shapes::ShapeRef.new(shape: VpnConnectionId, location_name: "ConnectionId"))
     TerminateClientVpnConnectionsRequest.add_member(:username, Shapes::ShapeRef.new(shape: String, location_name: "Username"))
     TerminateClientVpnConnectionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     TerminateClientVpnConnectionsRequest.struct_class = Types::TerminateClientVpnConnectionsRequest
@@ -9159,7 +9162,7 @@ module Aws::EC2
     TransitGatewayMulticastDomainAssociations.add_member(:subnets, Shapes::ShapeRef.new(shape: SubnetAssociationList, location_name: "subnets"))
     TransitGatewayMulticastDomainAssociations.struct_class = Types::TransitGatewayMulticastDomainAssociations
 
-    TransitGatewayMulticastDomainIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+    TransitGatewayMulticastDomainIdStringList.member = Shapes::ShapeRef.new(shape: TransitGatewayMulticastDomainId, location_name: "item")
 
     TransitGatewayMulticastDomainList.member = Shapes::ShapeRef.new(shape: TransitGatewayMulticastDomain, location_name: "item")
 
@@ -9259,7 +9262,7 @@ module Aws::EC2
 
     TransitGatewayRouteTableAssociationList.member = Shapes::ShapeRef.new(shape: TransitGatewayRouteTableAssociation, location_name: "item")
 
-    TransitGatewayRouteTableIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+    TransitGatewayRouteTableIdStringList.member = Shapes::ShapeRef.new(shape: TransitGatewayRouteTableId, location_name: "item")
 
     TransitGatewayRouteTableList.member = Shapes::ShapeRef.new(shape: TransitGatewayRouteTable, location_name: "item")
 

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

@@ -196,7 +196,8 @@ module Aws::EC2
       data[:ena_support]
     end
 
-    # The hypervisor type of the instance.
+    # The hypervisor type of the instance. The value `xen` is used for both
+    # Xen and Nitro hypervisors.
     # @return [String]
     def hypervisor
       data[:hypervisor]
@@ -1470,7 +1471,7 @@ module Aws::EC2
     #       },
     #     ],
     #     public_ips: ["String"],
-    #     allocation_ids: ["String"],
+    #     allocation_ids: ["AllocationId"],
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})

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

@@ -274,6 +274,7 @@ module Aws::EC2
     #     running, if applicable.
     #
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
+    #     The value `xen` is used for both Xen and Nitro hypervisors.
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
     #     the instance. Specified as an ARN.

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

@@ -84,7 +84,7 @@ module Aws::EC2
     #         ipv_6_address: "String",
     #       },
     #     ],
-    #     kernel_id: "String",
+    #     kernel_id: "KernelId",
     #     key_name: "KeyPairName",
     #     max_count: 1, # required
     #     min_count: 1, # required
@@ -101,10 +101,10 @@ module Aws::EC2
     #       spread_domain: "String",
     #       host_resource_group_arn: "String",
     #     },
-    #     ramdisk_id: "String",
+    #     ramdisk_id: "RamdiskId",
     #     security_group_ids: ["SecurityGroupId"],
     #     security_groups: ["SecurityGroupName"],
-    #     subnet_id: "String",
+    #     subnet_id: "SubnetId",
     #     user_data: "String",
     #     additional_info: "String",
     #     client_token: "String",
@@ -346,8 +346,11 @@ module Aws::EC2
     #   Reserved.
     # @option options [String] :client_token
     #   Unique, case-sensitive identifier you provide to ensure the
-    #   idempotency of the request. For more information, see [Ensuring
-    #   Idempotency][1].
+    #   idempotency of the request. If you do not specify a client token, a
+    #   randomly generated token is used for the request to ensure
+    #   idempotency.
+    #
+    #   For more information, see [Ensuring Idempotency][1].
     #
     #   Constraints: Maximum 64 ASCII characters
     #
@@ -1363,7 +1366,7 @@ module Aws::EC2
     #       },
     #     ],
     #     public_ips: ["String"],
-    #     allocation_ids: ["String"],
+    #     allocation_ids: ["AllocationId"],
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
@@ -1722,6 +1725,7 @@ module Aws::EC2
     #     running, if applicable.
     #
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
+    #     The value `xen` is used for both Xen and Nitro hypervisors.
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
     #     the instance. Specified as an ARN.
@@ -3091,7 +3095,7 @@ module Aws::EC2
     #       },
     #     ],
     #     public_ips: ["String"],
-    #     allocation_ids: ["String"],
+    #     allocation_ids: ["AllocationId"],
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})

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

@@ -281,7 +281,7 @@ module Aws::EC2
     #         ipv_6_address: "String",
     #       },
     #     ],
-    #     kernel_id: "String",
+    #     kernel_id: "KernelId",
     #     key_name: "KeyPairName",
     #     max_count: 1, # required
     #     min_count: 1, # required
@@ -298,7 +298,7 @@ module Aws::EC2
     #       spread_domain: "String",
     #       host_resource_group_arn: "String",
     #     },
-    #     ramdisk_id: "String",
+    #     ramdisk_id: "RamdiskId",
     #     security_group_ids: ["SecurityGroupId"],
     #     security_groups: ["SecurityGroupName"],
     #     user_data: "String",
@@ -537,8 +537,11 @@ module Aws::EC2
     #   Reserved.
     # @option options [String] :client_token
     #   Unique, case-sensitive identifier you provide to ensure the
-    #   idempotency of the request. For more information, see [Ensuring
-    #   Idempotency][1].
+    #   idempotency of the request. If you do not specify a client token, a
+    #   randomly generated token is used for the request to ensure
+    #   idempotency.
+    #
+    #   For more information, see [Ensuring Idempotency][1].
     #
     #   Constraints: Maximum 64 ASCII characters
     #
@@ -932,6 +935,7 @@ module Aws::EC2
     #     running, if applicable.
     #
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
+    #     The value `xen` is used for both Xen and Nitro hypervisors.
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
     #     the instance. Specified as an ARN.

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

@@ -436,7 +436,13 @@ module Aws::EC2
     #   The location from which the IP address is advertised. Use this
     #   parameter to limit the address to this location.
     #
-    #   Use [DescribeVpcs][1] to view the network border groups.
+    #   A network border group is a unique set of Availability Zones or
+    #   Local Zones from where AWS advertises IP addresses and limits the
+    #   addresses to the group. IP addresses cannot move between network
+    #   border groups.
+    #
+    #   Use [DescribeAvailabilityZones][1] to view the network border
+    #   groups.
     #
     #   <note markdown="1"> You cannot use a network border group with EC2 Classic. If you
     #   attempt this operation on EC2 classic, you will receive an
@@ -447,7 +453,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpcs.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html
     #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html
     #   @return [String]
     #
@@ -667,7 +673,7 @@ module Aws::EC2
     #       {
     #         client_vpn_endpoint_id: "ClientVpnEndpointId", # required
     #         vpc_id: "VpcId", # required
-    #         security_group_ids: ["String"], # required
+    #         security_group_ids: ["SecurityGroupId"], # required
     #         dry_run: false,
     #       }
     #
@@ -2481,7 +2487,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         export_task_id: "ExportTaskId", # required
+    #         export_task_id: "ExportVmTaskId", # required
     #       }
     #
     # @!attribute [rw] export_task_id
@@ -4632,7 +4638,7 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
-    #         security_group_ids: ["String"],
+    #         security_group_ids: ["SecurityGroupId"],
     #         vpc_id: "VpcId",
     #       }
     #
@@ -5925,7 +5931,7 @@ module Aws::EC2
     #                 encrypted: false,
     #                 delete_on_termination: false,
     #                 iops: 1,
-    #                 kms_key_id: "String",
+    #                 kms_key_id: "KmsKeyId",
     #                 snapshot_id: "SnapshotId",
     #                 volume_size: 1,
     #                 volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
@@ -6136,7 +6142,7 @@ module Aws::EC2
     #                 encrypted: false,
     #                 delete_on_termination: false,
     #                 iops: 1,
-    #                 kms_key_id: "String",
+    #                 kms_key_id: "KmsKeyId",
     #                 snapshot_id: "SnapshotId",
     #                 volume_size: 1,
     #                 volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
@@ -7941,7 +7947,7 @@ module Aws::EC2
     #
     #       {
     #         transit_gateway_id: "TransitGatewayId", # required
-    #         peer_transit_gateway_id: "String", # required
+    #         peer_transit_gateway_id: "TransitAssociationGatewayId", # required
     #         peer_account_id: "String", # required
     #         peer_region: "String", # required
     #         tag_specifications: [
@@ -9511,7 +9517,7 @@ module Aws::EC2
     #
     #       {
     #         dry_run: false,
-    #         fleet_ids: ["FleetIdentifier"], # required
+    #         fleet_ids: ["FleetId"], # required
     #         terminate_instances: false, # required
     #       }
     #
@@ -11332,7 +11338,7 @@ module Aws::EC2
     #           },
     #         ],
     #         public_ips: ["String"],
-    #         allocation_ids: ["String"],
+    #         allocation_ids: ["AllocationId"],
     #         dry_run: false,
     #       }
     #
@@ -11668,7 +11674,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         capacity_reservation_ids: ["String"],
+    #         capacity_reservation_ids: ["CapacityReservationId"],
     #         next_token: "String",
     #         max_results: 1,
     #         filters: [
@@ -11696,6 +11702,85 @@ module Aws::EC2
     #
     # @!attribute [rw] filters
     #   One or more filters.
+    #
+    #   * `instance-type` - The type of instance for which the Capacity
+    #     Reservation reserves capacity.
+    #
+    #   * `owner-id` - The ID of the AWS account that owns the Capacity
+    #     Reservation.
+    #
+    #   * `availability-zone-id` - The Availability Zone ID of the Capacity
+    #     Reservation.
+    #
+    #   * `instance-platform` - The type of operating system for which the
+    #     Capacity Reservation reserves capacity.
+    #
+    #   * `availability-zone` - The Availability Zone ID of the Capacity
+    #     Reservation.
+    #
+    #   * `tenancy` - Indicates the tenancy of the Capacity Reservation. A
+    #     Capacity Reservation can have one of the following tenancy
+    #     settings:
+    #
+    #     * `default` - The Capacity Reservation is created on hardware that
+    #       is shared with other AWS accounts.
+    #
+    #     * `dedicated` - The Capacity Reservation is created on
+    #       single-tenant hardware that is dedicated to a single AWS
+    #       account.
+    #
+    #   * `state` - The current state of the Capacity Reservation. A
+    #     Capacity Reservation can be in one of the following states:
+    #
+    #     * `active`- The Capacity Reservation is active and the capacity is
+    #       available for your use.
+    #
+    #     * `expired` - The Capacity Reservation expired automatically at
+    #       the date and time specified in your request. The reserved
+    #       capacity is no longer available for your use.
+    #
+    #     * `cancelled` - The Capacity Reservation was manually cancelled.
+    #       The reserved capacity is no longer available for your use.
+    #
+    #     * `pending` - The Capacity Reservation request was successful but
+    #       the capacity provisioning is still pending.
+    #
+    #     * `failed` - The Capacity Reservation request has failed. A
+    #       request might fail due to invalid request parameters, capacity
+    #       constraints, or instance limit constraints. Failed requests are
+    #       retained for 60 minutes.
+    #
+    #   * `end-date` - The date and time at which the Capacity Reservation
+    #     expires. When a Capacity Reservation expires, the reserved
+    #     capacity is released and you can no longer launch instances into
+    #     it. The Capacity Reservation's state changes to expired when it
+    #     reaches its end date and time.
+    #
+    #   * `end-date-type` - Indicates the way in which the Capacity
+    #     Reservation ends. A Capacity Reservation can have one of the
+    #     following end types:
+    #
+    #     * `unlimited` - The Capacity Reservation remains active until you
+    #       explicitly cancel it.
+    #
+    #     * `limited` - The Capacity Reservation expires automatically at a
+    #       specified date and time.
+    #
+    #   * `instance-match-criteria` - Indicates the type of instance
+    #     launches that the Capacity Reservation accepts. The options
+    #     include:
+    #
+    #     * `open` - The Capacity Reservation accepts all instances that
+    #       have matching attributes (instance type, platform, and
+    #       Availability Zone). Instances that have matching attributes
+    #       launch into the Capacity Reservation automatically without
+    #       specifying any additional parameters.
+    #
+    #     * `targeted` - The Capacity Reservation only accepts instances
+    #       that have matching attributes (instance type, platform, and
+    #       Availability Zone), and explicitly target the Capacity
+    #       Reservation. This ensures that only permitted instances can use
+    #       the reserved capacity.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] dry_run
@@ -12213,7 +12298,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         pool_ids: ["String"],
+    #         pool_ids: ["CoipPoolId"],
     #         filters: [
     #           {
     #             name: "String",
@@ -12738,7 +12823,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         export_task_ids: ["String"],
+    #         export_task_ids: ["ExportTaskId"],
     #         filters: [
     #           {
     #             name: "String",
@@ -12974,7 +13059,7 @@ module Aws::EC2
     #         event_type: "instance-change", # accepts instance-change, fleet-change, service-error
     #         max_results: 1,
     #         next_token: "String",
-    #         fleet_id: "FleetIdentifier", # required
+    #         fleet_id: "FleetId", # required
     #         start_time: Time.now, # required
     #       }
     #
@@ -13066,7 +13151,7 @@ module Aws::EC2
     #         dry_run: false,
     #         max_results: 1,
     #         next_token: "String",
-    #         fleet_id: "FleetIdentifier", # required
+    #         fleet_id: "FleetId", # required
     #         filters: [
     #           {
     #             name: "String",
@@ -13182,7 +13267,7 @@ module Aws::EC2
     #         dry_run: false,
     #         max_results: 1,
     #         next_token: "String",
-    #         fleet_ids: ["FleetIdentifier"],
+    #         fleet_ids: ["FleetId"],
     #         filters: [
     #           {
     #             name: "String",
@@ -14620,10 +14705,10 @@ module Aws::EC2
     #     `false`)
     #
     #   * `ebs-info.ebs-optimized-support` - Indicates whether the instance
-    #     type is EBS-optimized. (`true` \| `false`)
+    #     type is EBS-optimized. (`supported` \| `unsupported` \| `default`)
     #
     #   * `ebs-info.encryption-support` - Indicates whether EBS encryption
-    #     is supported. (`true` \| `false`)
+    #     is supported. (`supported` \| `unsupported`)
     #
     #   * `free-tier-eligible` - Indicates whether the instance type is
     #     eligible to use in the free tier. (`true` \| `false`)
@@ -14787,7 +14872,8 @@ module Aws::EC2
     #     running, if applicable.
     #
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \|
-    #     `xen`).
+    #     `xen`). The value `xen` is used for both Xen and Nitro
+    #     hypervisors.
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
     #     the instance. Specified as an ARN.
@@ -19295,7 +19381,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         transit_gateway_multicast_domain_ids: ["String"],
+    #         transit_gateway_multicast_domain_ids: ["TransitGatewayMulticastDomainId"],
     #         filters: [
     #           {
     #             name: "String",
@@ -19389,7 +19475,22 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] filters
-    #   One or more filters.
+    #   One or more filters. The possible values are:
+    #
+    #   * `transit-gateway-attachment-id` - The ID of the transit gateway
+    #     attachment.
+    #
+    #   * `local-owner-id` - The ID of your AWS account.
+    #
+    #   * `remote-owner-id` - The ID of the AWS account in the remote Region
+    #     that owns the transit gateway.
+    #
+    #   * `state` - The state of the peering attachment (`available` \|
+    #     `deleted` \| `deleting` \| `failed` \| `modifying` \|
+    #     `pendingAcceptance` \| `pending` \| `rollingBack` \| `rejected` \|
+    #     `rejecting`).
+    #
+    #   * `transit-gateway-id` - The ID of the transit gateway.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -19441,7 +19542,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         transit_gateway_route_table_ids: ["String"],
+    #         transit_gateway_route_table_ids: ["TransitGatewayRouteTableId"],
     #         filters: [
     #           {
     #             name: "String",
@@ -20089,7 +20190,7 @@ module Aws::EC2
     #
     #       {
     #         attribute: "enableDnsSupport", # required, accepts enableDnsSupport, enableDnsHostnames
-    #         vpc_id: "String", # required
+    #         vpc_id: "VpcId", # required
     #         dry_run: false,
     #       }
     #
@@ -21880,7 +21981,7 @@ module Aws::EC2
     #
     #       {
     #         client_vpn_endpoint_id: "ClientVpnEndpointId", # required
-    #         association_id: "String", # required
+    #         association_id: "ClientVpnAssociationId", # required
     #         dry_run: false,
     #       }
     #
@@ -26935,7 +27036,7 @@ module Aws::EC2
     #           host_resource_group_arn: "String",
     #         },
     #         private_ip_address: "String",
-    #         subnet_id: "String",
+    #         subnet_id: "SubnetId",
     #         user_data: {
     #           data: "String",
     #         },
@@ -27049,7 +27150,7 @@ module Aws::EC2
     #             host_resource_group_arn: "String",
     #           },
     #           private_ip_address: "String",
-    #           subnet_id: "String",
+    #           subnet_id: "SubnetId",
     #           user_data: {
     #             data: "String",
     #           },
@@ -27646,7 +27747,8 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] hypervisor
-    #   The hypervisor type of the instance.
+    #   The hypervisor type of the instance. The value `xen` is used for
+    #   both Xen and Nitro hypervisors.
     #   @return [String]
     #
     # @!attribute [rw] iam_instance_profile
@@ -29662,7 +29764,7 @@ module Aws::EC2
     #           encrypted: false,
     #           delete_on_termination: false,
     #           iops: 1,
-    #           kms_key_id: "String",
+    #           kms_key_id: "KmsKeyId",
     #           snapshot_id: "SnapshotId",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
@@ -29912,7 +30014,7 @@ module Aws::EC2
     #         encrypted: false,
     #         delete_on_termination: false,
     #         iops: 1,
-    #         kms_key_id: "String",
+    #         kms_key_id: "KmsKeyId",
     #         snapshot_id: "SnapshotId",
     #         volume_size: 1,
     #         volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
@@ -31400,12 +31502,17 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] group_name
-    #   The names of the Zone Group.
+    #   The name of the Availability Zone Group.
     #   @return [String]
     #
     # @!attribute [rw] opt_in_status
-    #   Indicates whether to enable or disable Zone Group membership. The
-    #   valid values are `opted-in`.
+    #   Indicates whether to enable or disable membership. The valid values
+    #   are `opted-in`. You must contact [AWS Support][1] to disable an
+    #   Availability Zone group.
+    #
+    #
+    #
+    #   [1]: https://console.aws.amazon.com/support/home#/case/create%3FissueType=customer-service%26serviceCode=general-info%26getting-started%26categoryCode=using-aws%26services
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -31532,7 +31639,7 @@ module Aws::EC2
     #         description: "String",
     #         split_tunnel: false,
     #         dry_run: false,
-    #         security_group_ids: ["String"],
+    #         security_group_ids: ["SecurityGroupId"],
     #         vpc_id: "VpcId",
     #       }
     #
@@ -31747,7 +31854,7 @@ module Aws::EC2
     #       {
     #         dry_run: false,
     #         excess_capacity_termination_policy: "no-termination", # accepts no-termination, termination
-    #         fleet_id: "FleetIdentifier", # required
+    #         fleet_id: "FleetId", # required
     #         target_capacity_specification: { # required
     #           total_target_capacity: 1, # required
     #           on_demand_target_capacity: 1,
@@ -37583,7 +37690,7 @@ module Aws::EC2
     #               encrypted: false,
     #               delete_on_termination: false,
     #               iops: 1,
-    #               kms_key_id: "String",
+    #               kms_key_id: "KmsKeyId",
     #               snapshot_id: "SnapshotId",
     #               volume_size: 1,
     #               volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
@@ -40030,7 +40137,7 @@ module Aws::EC2
     #             ipv_6_address: "String",
     #           },
     #         ],
-    #         kernel_id: "String",
+    #         kernel_id: "KernelId",
     #         key_name: "KeyPairName",
     #         max_count: 1, # required
     #         min_count: 1, # required
@@ -40047,10 +40154,10 @@ module Aws::EC2
     #           spread_domain: "String",
     #           host_resource_group_arn: "String",
     #         },
-    #         ramdisk_id: "String",
+    #         ramdisk_id: "RamdiskId",
     #         security_group_ids: ["SecurityGroupId"],
     #         security_groups: ["SecurityGroupName"],
-    #         subnet_id: "String",
+    #         subnet_id: "SubnetId",
     #         user_data: "String",
     #         additional_info: "String",
     #         client_token: "String",
@@ -40327,8 +40434,11 @@ module Aws::EC2
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier you provide to ensure the
-    #   idempotency of the request. For more information, see [Ensuring
-    #   Idempotency][1].
+    #   idempotency of the request. If you do not specify a client token, a
+    #   randomly generated token is used for the request to ensure
+    #   idempotency.
+    #
+    #   For more information, see [Ensuring Idempotency][1].
     #
     #   Constraints: Maximum 64 ASCII characters
     #
@@ -43078,13 +43188,16 @@ module Aws::EC2
     #   The key-value pair for tagging the Spot Fleet request on creation.
     #   The value for `ResourceType` must be `spot-fleet-request`, otherwise
     #   the Spot Fleet request fails. To tag instances at launch, specify
-    #   the tags in the [launch template][1]. For information about tagging
-    #   after launch, see [Tagging Your Resources][2].
+    #   the tags in the [launch template][1] (valid only if you use
+    #   `LaunchTemplateConfigs`) or in the [ `SpotFleetTagSpecification`
+    #   ][2] (valid only if you use `LaunchSpecifications`). For information
+    #   about tagging after launch, see [Tagging Your Resources][3].
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#tag-resources
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetTagSpecification.html
+    #   [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#tag-resources
     #   @return [Array<Types::TagSpecification>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotFleetRequestConfigData AWS API Documentation
@@ -43132,8 +43245,14 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] resource_type
-    #   The type of resource. Currently, the only resource types that are
-    #   supported are `spot-fleet-request` and `instance`.
+    #   The type of resource. Currently, the only resource type that is
+    #   supported is `instance`. To tag the Spot Fleet request on creation,
+    #   use the `TagSpecifications` parameter in [
+    #   `SpotFleetRequestConfigData` ][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetRequestConfigData.html
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -44192,8 +44311,8 @@ 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` \| `key-pair` \| `launch-template` \|
-    #   `spot-fleet-request` \| `placement-group` \| `snapshot` \|
+    #   \| `instance` \| `key-pair` \| `launch-template` \| \| `natgateway`
+    #   \| `spot-fleet-request` \| `placement-group` \| `snapshot` \|
     #   `traffic-mirror-filter` \| `traffic-mirror-session` \|
     #   `traffic-mirror-target` \| `transit-gateway` \|
     #   `transit-gateway-attachment` \| `transit-gateway-route-table` \|
@@ -44481,7 +44600,7 @@ module Aws::EC2
     #
     #       {
     #         client_vpn_endpoint_id: "ClientVpnEndpointId", # required
-    #         connection_id: "String",
+    #         connection_id: "VpnConnectionId",
     #         username: "String",
     #         dry_run: false,
     #       }