aws-sdk-ec2 1.205.0 → 1.210.0

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

@@ -201,6 +201,8 @@ module Aws::EC2
     ClassicLoadBalancersConfig = Shapes::StructureShape.new(name: 'ClassicLoadBalancersConfig')
     ClientCertificateRevocationListStatus = Shapes::StructureShape.new(name: 'ClientCertificateRevocationListStatus')
     ClientCertificateRevocationListStatusCode = Shapes::StringShape.new(name: 'ClientCertificateRevocationListStatusCode')
+    ClientConnectOptions = Shapes::StructureShape.new(name: 'ClientConnectOptions')
+    ClientConnectResponseOptions = Shapes::StructureShape.new(name: 'ClientConnectResponseOptions')
     ClientData = Shapes::StructureShape.new(name: 'ClientData')
     ClientVpnAssociationId = Shapes::StringShape.new(name: 'ClientVpnAssociationId')
     ClientVpnAuthentication = Shapes::StructureShape.new(name: 'ClientVpnAuthentication')
@@ -215,6 +217,8 @@ module Aws::EC2
     ClientVpnConnectionStatus = Shapes::StructureShape.new(name: 'ClientVpnConnectionStatus')
     ClientVpnConnectionStatusCode = Shapes::StringShape.new(name: 'ClientVpnConnectionStatusCode')
     ClientVpnEndpoint = Shapes::StructureShape.new(name: 'ClientVpnEndpoint')
+    ClientVpnEndpointAttributeStatus = Shapes::StructureShape.new(name: 'ClientVpnEndpointAttributeStatus')
+    ClientVpnEndpointAttributeStatusCode = Shapes::StringShape.new(name: 'ClientVpnEndpointAttributeStatusCode')
     ClientVpnEndpointId = Shapes::StringShape.new(name: 'ClientVpnEndpointId')
     ClientVpnEndpointIdList = Shapes::ListShape.new(name: 'ClientVpnEndpointIdList')
     ClientVpnEndpointStatus = Shapes::StructureShape.new(name: 'ClientVpnEndpointStatus')
@@ -385,6 +389,7 @@ module Aws::EC2
     DateTime = Shapes::TimestampShape.new(name: 'DateTime')
     DedicatedHostFlag = Shapes::BooleanShape.new(name: 'DedicatedHostFlag')
     DedicatedHostId = Shapes::StringShape.new(name: 'DedicatedHostId')
+    DefaultNetworkCardIndex = Shapes::IntegerShape.new(name: 'DefaultNetworkCardIndex')
     DefaultRouteTableAssociationValue = Shapes::StringShape.new(name: 'DefaultRouteTableAssociationValue')
     DefaultRouteTablePropagationValue = Shapes::StringShape.new(name: 'DefaultRouteTablePropagationValue')
     DefaultTargetCapacityType = Shapes::StringShape.new(name: 'DefaultTargetCapacityType')
@@ -944,7 +949,12 @@ module Aws::EC2
     FleetLaunchTemplateSpecification = Shapes::StructureShape.new(name: 'FleetLaunchTemplateSpecification')
     FleetLaunchTemplateSpecificationRequest = Shapes::StructureShape.new(name: 'FleetLaunchTemplateSpecificationRequest')
     FleetOnDemandAllocationStrategy = Shapes::StringShape.new(name: 'FleetOnDemandAllocationStrategy')
+    FleetReplacementStrategy = Shapes::StringShape.new(name: 'FleetReplacementStrategy')
     FleetSet = Shapes::ListShape.new(name: 'FleetSet')
+    FleetSpotCapacityRebalance = Shapes::StructureShape.new(name: 'FleetSpotCapacityRebalance')
+    FleetSpotCapacityRebalanceRequest = Shapes::StructureShape.new(name: 'FleetSpotCapacityRebalanceRequest')
+    FleetSpotMaintenanceStrategies = Shapes::StructureShape.new(name: 'FleetSpotMaintenanceStrategies')
+    FleetSpotMaintenanceStrategiesRequest = Shapes::StructureShape.new(name: 'FleetSpotMaintenanceStrategiesRequest')
     FleetStateCode = Shapes::StringShape.new(name: 'FleetStateCode')
     FleetType = Shapes::StringShape.new(name: 'FleetType')
     Float = Shapes::FloatShape.new(name: 'Float')
@@ -1342,6 +1352,7 @@ module Aws::EC2
     MaxResults = Shapes::IntegerShape.new(name: 'MaxResults')
     MaximumBandwidthInMbps = Shapes::IntegerShape.new(name: 'MaximumBandwidthInMbps')
     MaximumIops = Shapes::IntegerShape.new(name: 'MaximumIops')
+    MaximumNetworkCards = Shapes::IntegerShape.new(name: 'MaximumNetworkCards')
     MaximumThroughputInMBps = Shapes::FloatShape.new(name: 'MaximumThroughputInMBps')
     MembershipType = Shapes::StringShape.new(name: 'MembershipType')
     MemoryInfo = Shapes::StructureShape.new(name: 'MemoryInfo')
@@ -1454,6 +1465,9 @@ module Aws::EC2
     NetworkAclId = Shapes::StringShape.new(name: 'NetworkAclId')
     NetworkAclIdStringList = Shapes::ListShape.new(name: 'NetworkAclIdStringList')
     NetworkAclList = Shapes::ListShape.new(name: 'NetworkAclList')
+    NetworkCardIndex = Shapes::IntegerShape.new(name: 'NetworkCardIndex')
+    NetworkCardInfo = Shapes::StructureShape.new(name: 'NetworkCardInfo')
+    NetworkCardInfoList = Shapes::ListShape.new(name: 'NetworkCardInfoList')
     NetworkInfo = Shapes::StructureShape.new(name: 'NetworkInfo')
     NetworkInterface = Shapes::StructureShape.new(name: 'NetworkInterface')
     NetworkInterfaceAssociation = Shapes::StructureShape.new(name: 'NetworkInterfaceAssociation')
@@ -1639,6 +1653,7 @@ module Aws::EC2
     ReplaceRouteTableAssociationResult = Shapes::StructureShape.new(name: 'ReplaceRouteTableAssociationResult')
     ReplaceTransitGatewayRouteRequest = Shapes::StructureShape.new(name: 'ReplaceTransitGatewayRouteRequest')
     ReplaceTransitGatewayRouteResult = Shapes::StructureShape.new(name: 'ReplaceTransitGatewayRouteResult')
+    ReplacementStrategy = Shapes::StringShape.new(name: 'ReplacementStrategy')
     ReportInstanceReasonCodes = Shapes::StringShape.new(name: 'ReportInstanceReasonCodes')
     ReportInstanceStatusRequest = Shapes::StructureShape.new(name: 'ReportInstanceStatusRequest')
     ReportStatusType = Shapes::StringShape.new(name: 'ReportStatusType')
@@ -1797,6 +1812,7 @@ module Aws::EC2
     SnapshotState = Shapes::StringShape.new(name: 'SnapshotState')
     SnapshotTaskDetail = Shapes::StructureShape.new(name: 'SnapshotTaskDetail')
     SpotAllocationStrategy = Shapes::StringShape.new(name: 'SpotAllocationStrategy')
+    SpotCapacityRebalance = Shapes::StructureShape.new(name: 'SpotCapacityRebalance')
     SpotDatafeedSubscription = Shapes::StructureShape.new(name: 'SpotDatafeedSubscription')
     SpotFleetLaunchSpecification = Shapes::StructureShape.new(name: 'SpotFleetLaunchSpecification')
     SpotFleetMonitoring = Shapes::StructureShape.new(name: 'SpotFleetMonitoring')
@@ -1816,6 +1832,7 @@ module Aws::EC2
     SpotInstanceStateFault = Shapes::StructureShape.new(name: 'SpotInstanceStateFault')
     SpotInstanceStatus = Shapes::StructureShape.new(name: 'SpotInstanceStatus')
     SpotInstanceType = Shapes::StringShape.new(name: 'SpotInstanceType')
+    SpotMaintenanceStrategies = Shapes::StructureShape.new(name: 'SpotMaintenanceStrategies')
     SpotMarketOptions = Shapes::StructureShape.new(name: 'SpotMarketOptions')
     SpotOptions = Shapes::StructureShape.new(name: 'SpotOptions')
     SpotOptionsRequest = Shapes::StructureShape.new(name: 'SpotOptionsRequest')
@@ -2204,7 +2221,7 @@ module Aws::EC2
 
     AllocateAddressRequest.add_member(:domain, Shapes::ShapeRef.new(shape: DomainType, location_name: "Domain"))
     AllocateAddressRequest.add_member(:address, Shapes::ShapeRef.new(shape: PublicIpAddress, location_name: "Address"))
-    AllocateAddressRequest.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "PublicIpv4Pool"))
+    AllocateAddressRequest.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, location_name: "PublicIpv4Pool"))
     AllocateAddressRequest.add_member(:network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "NetworkBorderGroup"))
     AllocateAddressRequest.add_member(:customer_owned_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "CustomerOwnedIpv4Pool"))
     AllocateAddressRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -2736,6 +2753,15 @@ module Aws::EC2
     ClientCertificateRevocationListStatus.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     ClientCertificateRevocationListStatus.struct_class = Types::ClientCertificateRevocationListStatus
 
+    ClientConnectOptions.add_member(:enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "Enabled"))
+    ClientConnectOptions.add_member(:lambda_function_arn, Shapes::ShapeRef.new(shape: String, location_name: "LambdaFunctionArn"))
+    ClientConnectOptions.struct_class = Types::ClientConnectOptions
+
+    ClientConnectResponseOptions.add_member(:enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "enabled"))
+    ClientConnectResponseOptions.add_member(:lambda_function_arn, Shapes::ShapeRef.new(shape: String, location_name: "lambdaFunctionArn"))
+    ClientConnectResponseOptions.add_member(:status, Shapes::ShapeRef.new(shape: ClientVpnEndpointAttributeStatus, location_name: "status"))
+    ClientConnectResponseOptions.struct_class = Types::ClientConnectResponseOptions
+
     ClientData.add_member(:comment, Shapes::ShapeRef.new(shape: String, location_name: "Comment"))
     ClientData.add_member(:upload_end, Shapes::ShapeRef.new(shape: DateTime, location_name: "UploadEnd"))
     ClientData.add_member(:upload_size, Shapes::ShapeRef.new(shape: Double, location_name: "UploadSize"))
@@ -2775,6 +2801,7 @@ module Aws::EC2
     ClientVpnConnection.add_member(:common_name, Shapes::ShapeRef.new(shape: String, location_name: "commonName"))
     ClientVpnConnection.add_member(:status, Shapes::ShapeRef.new(shape: ClientVpnConnectionStatus, location_name: "status"))
     ClientVpnConnection.add_member(:connection_end_time, Shapes::ShapeRef.new(shape: String, location_name: "connectionEndTime"))
+    ClientVpnConnection.add_member(:posture_compliance_statuses, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "postureComplianceStatusSet"))
     ClientVpnConnection.struct_class = Types::ClientVpnConnection
 
     ClientVpnConnectionSet.member = Shapes::ShapeRef.new(shape: ClientVpnConnection, location_name: "item")
@@ -2803,8 +2830,13 @@ module Aws::EC2
     ClientVpnEndpoint.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: ClientVpnSecurityGroupIdSet, location_name: "securityGroupIdSet"))
     ClientVpnEndpoint.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "vpcId"))
     ClientVpnEndpoint.add_member(:self_service_portal_url, Shapes::ShapeRef.new(shape: String, location_name: "selfServicePortalUrl"))
+    ClientVpnEndpoint.add_member(:client_connect_options, Shapes::ShapeRef.new(shape: ClientConnectResponseOptions, location_name: "clientConnectOptions"))
     ClientVpnEndpoint.struct_class = Types::ClientVpnEndpoint
 
+    ClientVpnEndpointAttributeStatus.add_member(:code, Shapes::ShapeRef.new(shape: ClientVpnEndpointAttributeStatusCode, location_name: "code"))
+    ClientVpnEndpointAttributeStatus.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
+    ClientVpnEndpointAttributeStatus.struct_class = Types::ClientVpnEndpointAttributeStatus
+
     ClientVpnEndpointIdList.member = Shapes::ShapeRef.new(shape: ClientVpnEndpointId, location_name: "item")
 
     ClientVpnEndpointStatus.add_member(:code, Shapes::ShapeRef.new(shape: ClientVpnEndpointStatusCode, location_name: "code"))
@@ -2982,6 +3014,7 @@ module Aws::EC2
     CreateClientVpnEndpointRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: ClientVpnSecurityGroupIdSet, location_name: "SecurityGroupId"))
     CreateClientVpnEndpointRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "VpcId"))
     CreateClientVpnEndpointRequest.add_member(:self_service_portal, Shapes::ShapeRef.new(shape: SelfServicePortal, location_name: "SelfServicePortal"))
+    CreateClientVpnEndpointRequest.add_member(:client_connect_options, Shapes::ShapeRef.new(shape: ClientConnectOptions, location_name: "ClientConnectOptions"))
     CreateClientVpnEndpointRequest.struct_class = Types::CreateClientVpnEndpointRequest
 
     CreateClientVpnEndpointResult.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: String, location_name: "clientVpnEndpointId"))
@@ -3124,9 +3157,9 @@ module Aws::EC2
     CreateImageResult.struct_class = Types::CreateImageResult
 
     CreateInstanceExportTaskRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
-    CreateInstanceExportTaskRequest.add_member(:export_to_s3_task, Shapes::ShapeRef.new(shape: ExportToS3TaskSpecification, location_name: "exportToS3"))
+    CreateInstanceExportTaskRequest.add_member(:export_to_s3_task, Shapes::ShapeRef.new(shape: ExportToS3TaskSpecification, required: true, location_name: "exportToS3"))
     CreateInstanceExportTaskRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "instanceId"))
-    CreateInstanceExportTaskRequest.add_member(:target_environment, Shapes::ShapeRef.new(shape: ExportEnvironment, location_name: "targetEnvironment"))
+    CreateInstanceExportTaskRequest.add_member(:target_environment, Shapes::ShapeRef.new(shape: ExportEnvironment, required: true, location_name: "targetEnvironment"))
     CreateInstanceExportTaskRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateInstanceExportTaskRequest.struct_class = Types::CreateInstanceExportTaskRequest
 
@@ -3280,6 +3313,7 @@ module Aws::EC2
     CreateRouteRequest.add_member(:destination_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationIpv6CidrBlock"))
     CreateRouteRequest.add_member(:destination_prefix_list_id, Shapes::ShapeRef.new(shape: PrefixListResourceId, location_name: "DestinationPrefixListId"))
     CreateRouteRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
+    CreateRouteRequest.add_member(:vpc_endpoint_id, Shapes::ShapeRef.new(shape: VpcEndpointId, location_name: "VpcEndpointId"))
     CreateRouteRequest.add_member(:egress_only_internet_gateway_id, Shapes::ShapeRef.new(shape: EgressOnlyInternetGatewayId, location_name: "egressOnlyInternetGatewayId"))
     CreateRouteRequest.add_member(:gateway_id, Shapes::ShapeRef.new(shape: RouteGatewayId, location_name: "gatewayId"))
     CreateRouteRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, location_name: "instanceId"))
@@ -3539,7 +3573,8 @@ module Aws::EC2
     CreateVpcEndpointServiceConfigurationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     CreateVpcEndpointServiceConfigurationRequest.add_member(:acceptance_required, Shapes::ShapeRef.new(shape: Boolean, location_name: "AcceptanceRequired"))
     CreateVpcEndpointServiceConfigurationRequest.add_member(:private_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "PrivateDnsName"))
-    CreateVpcEndpointServiceConfigurationRequest.add_member(:network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, required: true, location_name: "NetworkLoadBalancerArn"))
+    CreateVpcEndpointServiceConfigurationRequest.add_member(:network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "NetworkLoadBalancerArn"))
+    CreateVpcEndpointServiceConfigurationRequest.add_member(:gateway_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "GatewayLoadBalancerArn"))
     CreateVpcEndpointServiceConfigurationRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
     CreateVpcEndpointServiceConfigurationRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateVpcEndpointServiceConfigurationRequest.struct_class = Types::CreateVpcEndpointServiceConfigurationRequest
@@ -5841,6 +5876,18 @@ module Aws::EC2
 
     FleetSet.member = Shapes::ShapeRef.new(shape: FleetData, location_name: "item")
 
+    FleetSpotCapacityRebalance.add_member(:replacement_strategy, Shapes::ShapeRef.new(shape: FleetReplacementStrategy, location_name: "replacementStrategy"))
+    FleetSpotCapacityRebalance.struct_class = Types::FleetSpotCapacityRebalance
+
+    FleetSpotCapacityRebalanceRequest.add_member(:replacement_strategy, Shapes::ShapeRef.new(shape: FleetReplacementStrategy, location_name: "ReplacementStrategy"))
+    FleetSpotCapacityRebalanceRequest.struct_class = Types::FleetSpotCapacityRebalanceRequest
+
+    FleetSpotMaintenanceStrategies.add_member(:capacity_rebalance, Shapes::ShapeRef.new(shape: FleetSpotCapacityRebalance, location_name: "capacityRebalance"))
+    FleetSpotMaintenanceStrategies.struct_class = Types::FleetSpotMaintenanceStrategies
+
+    FleetSpotMaintenanceStrategiesRequest.add_member(:capacity_rebalance, Shapes::ShapeRef.new(shape: FleetSpotCapacityRebalanceRequest, location_name: "CapacityRebalance"))
+    FleetSpotMaintenanceStrategiesRequest.struct_class = Types::FleetSpotMaintenanceStrategiesRequest
+
     FlowLog.add_member(:creation_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "creationTime"))
     FlowLog.add_member(:deliver_logs_error_message, Shapes::ShapeRef.new(shape: String, location_name: "deliverLogsErrorMessage"))
     FlowLog.add_member(:deliver_logs_permission_arn, Shapes::ShapeRef.new(shape: String, location_name: "deliverLogsPermissionArn"))
@@ -7350,6 +7397,7 @@ module Aws::EC2
     ModifyClientVpnEndpointRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: ClientVpnSecurityGroupIdSet, location_name: "SecurityGroupId"))
     ModifyClientVpnEndpointRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "VpcId"))
     ModifyClientVpnEndpointRequest.add_member(:self_service_portal, Shapes::ShapeRef.new(shape: SelfServicePortal, location_name: "SelfServicePortal"))
+    ModifyClientVpnEndpointRequest.add_member(:client_connect_options, Shapes::ShapeRef.new(shape: ClientConnectOptions, location_name: "ClientConnectOptions"))
     ModifyClientVpnEndpointRequest.struct_class = Types::ModifyClientVpnEndpointRequest
 
     ModifyClientVpnEndpointResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -7374,7 +7422,7 @@ module Aws::EC2
     ModifyFleetRequest.add_member(:excess_capacity_termination_policy, Shapes::ShapeRef.new(shape: FleetExcessCapacityTerminationPolicy, location_name: "ExcessCapacityTerminationPolicy"))
     ModifyFleetRequest.add_member(:launch_template_configs, Shapes::ShapeRef.new(shape: FleetLaunchTemplateConfigListRequest, location_name: "LaunchTemplateConfig"))
     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.add_member(:target_capacity_specification, Shapes::ShapeRef.new(shape: TargetCapacitySpecificationRequest, location_name: "TargetCapacitySpecification"))
     ModifyFleetRequest.struct_class = Types::ModifyFleetRequest
 
     ModifyFleetResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -7692,6 +7740,8 @@ module Aws::EC2
     ModifyVpcEndpointServiceConfigurationRequest.add_member(:acceptance_required, Shapes::ShapeRef.new(shape: Boolean, location_name: "AcceptanceRequired"))
     ModifyVpcEndpointServiceConfigurationRequest.add_member(:add_network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "AddNetworkLoadBalancerArn"))
     ModifyVpcEndpointServiceConfigurationRequest.add_member(:remove_network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "RemoveNetworkLoadBalancerArn"))
+    ModifyVpcEndpointServiceConfigurationRequest.add_member(:add_gateway_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "AddGatewayLoadBalancerArn"))
+    ModifyVpcEndpointServiceConfigurationRequest.add_member(:remove_gateway_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "RemoveGatewayLoadBalancerArn"))
     ModifyVpcEndpointServiceConfigurationRequest.struct_class = Types::ModifyVpcEndpointServiceConfigurationRequest
 
     ModifyVpcEndpointServiceConfigurationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -7863,8 +7913,18 @@ module Aws::EC2
 
     NetworkAclList.member = Shapes::ShapeRef.new(shape: NetworkAcl, location_name: "item")
 
+    NetworkCardInfo.add_member(:network_card_index, Shapes::ShapeRef.new(shape: NetworkCardIndex, location_name: "networkCardIndex"))
+    NetworkCardInfo.add_member(:network_performance, Shapes::ShapeRef.new(shape: NetworkPerformance, location_name: "networkPerformance"))
+    NetworkCardInfo.add_member(:maximum_network_interfaces, Shapes::ShapeRef.new(shape: MaxNetworkInterfaces, location_name: "maximumNetworkInterfaces"))
+    NetworkCardInfo.struct_class = Types::NetworkCardInfo
+
+    NetworkCardInfoList.member = Shapes::ShapeRef.new(shape: NetworkCardInfo, location_name: "item")
+
     NetworkInfo.add_member(:network_performance, Shapes::ShapeRef.new(shape: NetworkPerformance, location_name: "networkPerformance"))
     NetworkInfo.add_member(:maximum_network_interfaces, Shapes::ShapeRef.new(shape: MaxNetworkInterfaces, location_name: "maximumNetworkInterfaces"))
+    NetworkInfo.add_member(:maximum_network_cards, Shapes::ShapeRef.new(shape: MaximumNetworkCards, location_name: "maximumNetworkCards"))
+    NetworkInfo.add_member(:default_network_card_index, Shapes::ShapeRef.new(shape: DefaultNetworkCardIndex, location_name: "defaultNetworkCardIndex"))
+    NetworkInfo.add_member(:network_cards, Shapes::ShapeRef.new(shape: NetworkCardInfoList, location_name: "networkCards"))
     NetworkInfo.add_member(:ipv_4_addresses_per_interface, Shapes::ShapeRef.new(shape: MaxIpv4AddrPerInterface, location_name: "ipv4AddressesPerInterface"))
     NetworkInfo.add_member(:ipv_6_addresses_per_interface, Shapes::ShapeRef.new(shape: MaxIpv6AddrPerInterface, location_name: "ipv6AddressesPerInterface"))
     NetworkInfo.add_member(:ipv_6_supported, Shapes::ShapeRef.new(shape: Ipv6Flag, location_name: "ipv6Supported"))
@@ -8436,6 +8496,7 @@ module Aws::EC2
     ReplaceRouteRequest.add_member(:destination_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationIpv6CidrBlock"))
     ReplaceRouteRequest.add_member(:destination_prefix_list_id, Shapes::ShapeRef.new(shape: PrefixListResourceId, location_name: "DestinationPrefixListId"))
     ReplaceRouteRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
+    ReplaceRouteRequest.add_member(:vpc_endpoint_id, Shapes::ShapeRef.new(shape: VpcEndpointId, location_name: "VpcEndpointId"))
     ReplaceRouteRequest.add_member(:egress_only_internet_gateway_id, Shapes::ShapeRef.new(shape: EgressOnlyInternetGatewayId, location_name: "egressOnlyInternetGatewayId"))
     ReplaceRouteRequest.add_member(:gateway_id, Shapes::ShapeRef.new(shape: RouteGatewayId, location_name: "gatewayId"))
     ReplaceRouteRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, location_name: "instanceId"))
@@ -9114,6 +9175,7 @@ module Aws::EC2
     ServiceConfiguration.add_member(:acceptance_required, Shapes::ShapeRef.new(shape: Boolean, location_name: "acceptanceRequired"))
     ServiceConfiguration.add_member(:manages_vpc_endpoints, Shapes::ShapeRef.new(shape: Boolean, location_name: "managesVpcEndpoints"))
     ServiceConfiguration.add_member(:network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "networkLoadBalancerArnSet"))
+    ServiceConfiguration.add_member(:gateway_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "gatewayLoadBalancerArnSet"))
     ServiceConfiguration.add_member(:base_endpoint_dns_names, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "baseEndpointDnsNameSet"))
     ServiceConfiguration.add_member(:private_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "privateDnsName"))
     ServiceConfiguration.add_member(:private_dns_name_configuration, Shapes::ShapeRef.new(shape: PrivateDnsNameConfiguration, location_name: "privateDnsNameConfiguration"))
@@ -9218,6 +9280,9 @@ module Aws::EC2
     SnapshotTaskDetail.add_member(:user_bucket, Shapes::ShapeRef.new(shape: UserBucketDetails, location_name: "userBucket"))
     SnapshotTaskDetail.struct_class = Types::SnapshotTaskDetail
 
+    SpotCapacityRebalance.add_member(:replacement_strategy, Shapes::ShapeRef.new(shape: ReplacementStrategy, location_name: "replacementStrategy"))
+    SpotCapacityRebalance.struct_class = Types::SpotCapacityRebalance
+
     SpotDatafeedSubscription.add_member(:bucket, Shapes::ShapeRef.new(shape: String, location_name: "bucket"))
     SpotDatafeedSubscription.add_member(:fault, Shapes::ShapeRef.new(shape: SpotInstanceStateFault, location_name: "fault"))
     SpotDatafeedSubscription.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
@@ -9258,6 +9323,7 @@ module Aws::EC2
 
     SpotFleetRequestConfigData.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: AllocationStrategy, location_name: "allocationStrategy"))
     SpotFleetRequestConfigData.add_member(:on_demand_allocation_strategy, Shapes::ShapeRef.new(shape: OnDemandAllocationStrategy, location_name: "onDemandAllocationStrategy"))
+    SpotFleetRequestConfigData.add_member(:spot_maintenance_strategies, Shapes::ShapeRef.new(shape: SpotMaintenanceStrategies, location_name: "spotMaintenanceStrategies"))
     SpotFleetRequestConfigData.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
     SpotFleetRequestConfigData.add_member(:excess_capacity_termination_policy, Shapes::ShapeRef.new(shape: ExcessCapacityTerminationPolicy, location_name: "excessCapacityTerminationPolicy"))
     SpotFleetRequestConfigData.add_member(:fulfilled_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "fulfilledCapacity"))
@@ -9325,6 +9391,9 @@ module Aws::EC2
     SpotInstanceStatus.add_member(:update_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "updateTime"))
     SpotInstanceStatus.struct_class = Types::SpotInstanceStatus
 
+    SpotMaintenanceStrategies.add_member(:capacity_rebalance, Shapes::ShapeRef.new(shape: SpotCapacityRebalance, location_name: "capacityRebalance"))
+    SpotMaintenanceStrategies.struct_class = Types::SpotMaintenanceStrategies
+
     SpotMarketOptions.add_member(:max_price, Shapes::ShapeRef.new(shape: String, location_name: "MaxPrice"))
     SpotMarketOptions.add_member(:spot_instance_type, Shapes::ShapeRef.new(shape: SpotInstanceType, location_name: "SpotInstanceType"))
     SpotMarketOptions.add_member(:block_duration_minutes, Shapes::ShapeRef.new(shape: Integer, location_name: "BlockDurationMinutes"))
@@ -9333,6 +9402,7 @@ module Aws::EC2
     SpotMarketOptions.struct_class = Types::SpotMarketOptions
 
     SpotOptions.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: SpotAllocationStrategy, location_name: "allocationStrategy"))
+    SpotOptions.add_member(:maintenance_strategies, Shapes::ShapeRef.new(shape: FleetSpotMaintenanceStrategies, location_name: "maintenanceStrategies"))
     SpotOptions.add_member(:instance_interruption_behavior, Shapes::ShapeRef.new(shape: SpotInstanceInterruptionBehavior, location_name: "instanceInterruptionBehavior"))
     SpotOptions.add_member(:instance_pools_to_use_count, Shapes::ShapeRef.new(shape: Integer, location_name: "instancePoolsToUseCount"))
     SpotOptions.add_member(:single_instance_type, Shapes::ShapeRef.new(shape: Boolean, location_name: "singleInstanceType"))
@@ -9342,6 +9412,7 @@ module Aws::EC2
     SpotOptions.struct_class = Types::SpotOptions
 
     SpotOptionsRequest.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: SpotAllocationStrategy, location_name: "AllocationStrategy"))
+    SpotOptionsRequest.add_member(:maintenance_strategies, Shapes::ShapeRef.new(shape: FleetSpotMaintenanceStrategiesRequest, location_name: "MaintenanceStrategies"))
     SpotOptionsRequest.add_member(:instance_interruption_behavior, Shapes::ShapeRef.new(shape: SpotInstanceInterruptionBehavior, location_name: "InstanceInterruptionBehavior"))
     SpotOptionsRequest.add_member(:instance_pools_to_use_count, Shapes::ShapeRef.new(shape: Integer, location_name: "InstancePoolsToUseCount"))
     SpotOptionsRequest.add_member(:single_instance_type, Shapes::ShapeRef.new(shape: Boolean, location_name: "SingleInstanceType"))
@@ -10160,6 +10231,7 @@ module Aws::EC2
     VpcEndpointConnection.add_member(:creation_timestamp, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "creationTimestamp"))
     VpcEndpointConnection.add_member(:dns_entries, Shapes::ShapeRef.new(shape: DnsEntrySet, location_name: "dnsEntrySet"))
     VpcEndpointConnection.add_member(:network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "networkLoadBalancerArnSet"))
+    VpcEndpointConnection.add_member(:gateway_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "gatewayLoadBalancerArnSet"))
     VpcEndpointConnection.struct_class = Types::VpcEndpointConnection
 
     VpcEndpointConnectionSet.member = Shapes::ShapeRef.new(shape: VpcEndpointConnection, location_name: "item")

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

@@ -521,18 +521,15 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
     # @option options [Types::EnclaveOptionsRequest] :enclave_options
     #   Indicates whether the instance is enabled for AWS Nitro Enclaves. For
-    #   more information, see [ AWS Nitro Enclaves][1] in the *Amazon Elastic
-    #   Compute Cloud User Guide*.
+    #   more information, see [ What is AWS Nitro Enclaves?][1] in the *AWS
+    #   Nitro Enclaves User Guide*.
     #
     #   You can't enable AWS Nitro Enclaves and hibernation on the same
-    #   instance. For more information about AWS Nitro Enclaves requirements,
-    #   see [ AWS Nitro Enclaves][2] in the *Amazon Elastic Compute Cloud User
-    #   Guide*.
+    #   instance.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html#nitro-enclave-reqs
+    #   [1]: https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html
     # @return [Instance::Collection]
     def create_instances(options = {})
       batch = []
@@ -1202,15 +1199,15 @@ module Aws::EC2
     #
     #   You can specify the CMK using any of the following:
     #
-    #   * Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
+    #   * Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Key alias. For example, alias/ExampleAlias.
     #
     #   * Key ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
+    #     arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Alias ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
+    #     arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
     #
     #   AWS authenticates the CMK asynchronously. Therefore, if you specify an
     #   ID, alias, or ARN that is not valid, the action can appear to

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

@@ -300,6 +300,7 @@ module Aws::EC2
     #     destination_ipv_6_cidr_block: "String",
     #     destination_prefix_list_id: "PrefixListResourceId",
     #     dry_run: false,
+    #     vpc_endpoint_id: "VpcEndpointId",
     #     egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
     #     gateway_id: "RouteGatewayId",
     #     instance_id: "InstanceId",
@@ -323,6 +324,9 @@ module Aws::EC2
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [String] :vpc_endpoint_id
+    #   The ID of a VPC endpoint. Supported for Gateway Load Balancer
+    #   endpoints only.
     # @option options [String] :egress_only_internet_gateway_id
     #   \[IPv6 traffic only\] The ID of an egress-only internet gateway.
     # @option options [String] :gateway_id

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

@@ -227,6 +227,7 @@ module Aws::EC2
     #     destination_ipv_6_cidr_block: "String",
     #     destination_prefix_list_id: "PrefixListResourceId",
     #     dry_run: false,
+    #     vpc_endpoint_id: "VpcEndpointId",
     #     egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
     #     gateway_id: "RouteGatewayId",
     #     instance_id: "InstanceId",
@@ -253,6 +254,9 @@ module Aws::EC2
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [String] :vpc_endpoint_id
+    #   The ID of a VPC endpoint. Supported for Gateway Load Balancer
+    #   endpoints only.
     # @option options [String] :egress_only_internet_gateway_id
     #   \[IPv6 traffic only\] The ID of an egress-only internet gateway.
     # @option options [String] :gateway_id

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

@@ -115,10 +115,9 @@ module Aws::EC2
       data[:volume_size]
     end
 
-    # The AWS owner alias, as maintained by Amazon. The possible values are:
-    # `amazon` \| `self` \| `all` \| `aws-marketplace` \| `microsoft`. This
-    # AWS owner alias is not to be confused with the user-configured AWS
-    # account alias, which is set from the IAM console.
+    # The AWS owner alias, from an Amazon-maintained list (`amazon`). This
+    # is not the user-configured AWS account alias set using the IAM
+    # console.
     # @return [String]
     def owner_alias
       data[:owner_alias]
@@ -336,15 +335,15 @@ module Aws::EC2
     #
     #   You can specify the CMK using any of the following:
     #
-    #   * Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
+    #   * Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Key alias. For example, alias/ExampleAlias.
     #
     #   * Key ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
+    #     arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Alias ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
+    #     arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
     #
     #   AWS authenticates the CMK asynchronously. Therefore, if you specify an
     #   ID, alias, or ARN that is not valid, the action can appear to

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

@@ -710,18 +710,15 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
     # @option options [Types::EnclaveOptionsRequest] :enclave_options
     #   Indicates whether the instance is enabled for AWS Nitro Enclaves. For
-    #   more information, see [ AWS Nitro Enclaves][1] in the *Amazon Elastic
-    #   Compute Cloud User Guide*.
+    #   more information, see [ What is AWS Nitro Enclaves?][1] in the *AWS
+    #   Nitro Enclaves User Guide*.
     #
     #   You can't enable AWS Nitro Enclaves and hibernation on the same
-    #   instance. For more information about AWS Nitro Enclaves requirements,
-    #   see [ AWS Nitro Enclaves][2] in the *Amazon Elastic Compute Cloud User
-    #   Guide*.
+    #   instance.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html#nitro-enclave-reqs
+    #   [1]: https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html
     # @return [Instance::Collection]
     def create_instances(options = {})
       batch = []

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

@@ -462,7 +462,7 @@ module Aws::EC2
     #       {
     #         domain: "vpc", # accepts vpc, standard
     #         address: "PublicIpAddress",
-    #         public_ipv_4_pool: "String",
+    #         public_ipv_4_pool: "Ipv4PoolEc2Id",
     #         network_border_group: "String",
     #         customer_owned_ipv_4_pool: "String",
     #         dry_run: false,
@@ -1156,8 +1156,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] encryption_kms_key_id
-    #   The ID of the AWS Key Management Service (KMS) key used to encrypt
-    #   the private key of the certificate.
+    #   The ID of the AWS KMS CMK used to encrypt the private key of the
+    #   certificate.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociateEnclaveCertificateIamRoleResult AWS API Documentation
@@ -1514,7 +1514,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] encryption_kms_key_id
-    #   The ID of the KMS key used to encrypt the private key.
+    #   The ID of the KMS customer master key (CMK) used to encrypt the
+    #   private key.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociatedRole AWS API Documentation
@@ -3221,7 +3222,7 @@ module Aws::EC2
     # 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
+    # see [EC2 Fleet example configurations][2] in the *Amazon Elastic
     # Compute Cloud User Guide*.
     #
     #
@@ -3265,7 +3266,7 @@ module Aws::EC2
     # 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
+    # see [EC2 Fleet example configurations][2] in the *Amazon Elastic
     # Compute Cloud User Guide*.
     #
     #
@@ -3674,6 +3675,62 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The options for managing connection authorization for new client
+    # connections.
+    #
+    # @note When making an API call, you may pass ClientConnectOptions
+    #   data as a hash:
+    #
+    #       {
+    #         enabled: false,
+    #         lambda_function_arn: "String",
+    #       }
+    #
+    # @!attribute [rw] enabled
+    #   Indicates whether client connect options are enabled. The default is
+    #   `false` (not enabled).
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] lambda_function_arn
+    #   The Amazon Resource Name (ARN) of the AWS Lambda function used for
+    #   connection authorization.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ClientConnectOptions AWS API Documentation
+    #
+    class ClientConnectOptions < Struct.new(
+      :enabled,
+      :lambda_function_arn)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The options for managing connection authorization for new client
+    # connections.
+    #
+    # @!attribute [rw] enabled
+    #   Indicates whether client connect options are enabled.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] lambda_function_arn
+    #   The Amazon Resource Name (ARN) of the AWS Lambda function used for
+    #   connection authorization.
+    #   @return [String]
+    #
+    # @!attribute [rw] status
+    #   The status of any updates to the client connect options.
+    #   @return [Types::ClientVpnEndpointAttributeStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ClientConnectResponseOptions AWS API Documentation
+    #
+    class ClientConnectResponseOptions < Struct.new(
+      :enabled,
+      :lambda_function_arn,
+      :status)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the client-specific data.
     #
     # @note When making an API call, you may pass ClientData
@@ -3882,6 +3939,11 @@ module Aws::EC2
     #   The date and time the client connection was terminated.
     #   @return [String]
     #
+    # @!attribute [rw] posture_compliance_statuses
+    #   The statuses returned by the client connect handler for posture
+    #   compliance, if applicable.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ClientVpnConnection AWS API Documentation
     #
     class ClientVpnConnection < Struct.new(
@@ -3897,7 +3959,8 @@ module Aws::EC2
       :client_ip,
       :common_name,
       :status,
-      :connection_end_time)
+      :connection_end_time,
+      :posture_compliance_statuses)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4018,6 +4081,11 @@ module Aws::EC2
     #   The URL of the self-service portal.
     #   @return [String]
     #
+    # @!attribute [rw] client_connect_options
+    #   The options for managing connection authorization for new client
+    #   connections.
+    #   @return [Types::ClientConnectResponseOptions]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ClientVpnEndpoint AWS API Documentation
     #
     class ClientVpnEndpoint < Struct.new(
@@ -4040,7 +4108,27 @@ module Aws::EC2
       :tags,
       :security_group_ids,
       :vpc_id,
-      :self_service_portal_url)
+      :self_service_portal_url,
+      :client_connect_options)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Describes the status of the Client VPN endpoint attribute.
+    #
+    # @!attribute [rw] code
+    #   The status code.
+    #   @return [String]
+    #
+    # @!attribute [rw] message
+    #   The status message.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ClientVpnEndpointAttributeStatus AWS API Documentation
+    #
+    class ClientVpnEndpointAttributeStatus < Struct.new(
+      :code,
+      :message)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4536,32 +4624,29 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] kms_key_id
-    #   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.
+    #   The identifier of the symmetric AWS Key Management Service (AWS KMS)
+    #   customer master key (CMK) to use when creating encrypted volumes. If
+    #   this parameter is not specified, your AWS managed CMK for EBS is
+    #   used. If you specify a CMK, you must also set the encrypted state to
+    #   `true`.
     #
-    #   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
-    #   "alias/". For example:
+    #   You can specify a CMK using any of the following:
     #
-    #   * Key ID: `1234abcd-12ab-34cd-56ef-1234567890ab`
+    #   * Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
     #
-    #   * Key ARN:
-    #     `arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
+    #   * Key alias. For example, alias/ExampleAlias.
     #
-    #   * Alias name: `alias/ExampleAlias`
+    #   * Key ARN. For example,
+    #     arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
     #
-    #   * Alias ARN: `arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias`
+    #   * Alias ARN. For example,
+    #     arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
     #
-    #   AWS parses `KmsKeyId` asynchronously, meaning that the action you
-    #   call may appear to complete even though you provided an invalid
-    #   identifier. This action will eventually report failure.
+    #   AWS authenticates the CMK asynchronously. Therefore, if you specify
+    #   an identifier that is not valid, the action can appear to complete,
+    #   but eventually fails.
     #
-    #   The specified CMK must exist in the Region that the snapshot is
-    #   being copied to.
+    #   The specified CMK must exist in the destination Region.
     #
     #   Amazon EBS does not support asymmetric CMKs.
     #   @return [String]
@@ -4677,15 +4762,15 @@ module Aws::EC2
     #
     #   You can specify the CMK using any of the following:
     #
-    #   * Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
+    #   * Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Key alias. For example, alias/ExampleAlias.
     #
     #   * Key ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
+    #     arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Alias ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
+    #     arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
     #
     #   AWS authenticates the CMK asynchronously. Therefore, if you specify
     #   an ID, alias, or ARN that is not valid, the action can appear to
@@ -5119,6 +5204,10 @@ module Aws::EC2
     #         security_group_ids: ["SecurityGroupId"],
     #         vpc_id: "VpcId",
     #         self_service_portal: "enabled", # accepts enabled, disabled
+    #         client_connect_options: {
+    #           enabled: false,
+    #           lambda_function_arn: "String",
+    #         },
     #       }
     #
     # @!attribute [rw] client_cidr_block
@@ -5244,6 +5333,11 @@ module Aws::EC2
     #   Default Value: `enabled`
     #   @return [String]
     #
+    # @!attribute [rw] client_connect_options
+    #   The options for managing connection authorization for new client
+    #   connections.
+    #   @return [Types::ClientConnectOptions]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateClientVpnEndpointRequest AWS API Documentation
     #
     class CreateClientVpnEndpointRequest < Struct.new(
@@ -5261,7 +5355,8 @@ module Aws::EC2
       :tag_specifications,
       :security_group_ids,
       :vpc_id,
-      :self_service_portal)
+      :self_service_portal,
+      :client_connect_options)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5768,6 +5863,11 @@ module Aws::EC2
     #         client_token: "String",
     #         spot_options: {
     #           allocation_strategy: "lowest-price", # accepts lowest-price, diversified, capacity-optimized
+    #           maintenance_strategies: {
+    #             capacity_rebalance: {
+    #               replacement_strategy: "launch", # accepts launch
+    #             },
+    #           },
     #           instance_interruption_behavior: "hibernate", # accepts hibernate, stop, terminate
     #           instance_pools_to_use_count: 1,
     #           single_instance_type: false,
@@ -5884,15 +5984,23 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] type
-    #   The type of the request. By default, the EC2 Fleet places an
-    #   asynchronous request for your desired capacity, and maintains it by
-    #   replenishing interrupted Spot Instances (`maintain`). A value of
-    #   `instant` places a synchronous one-time request, and returns errors
-    #   for any instances that could not be launched. A value of `request`
-    #   places an asynchronous one-time request without maintaining capacity
-    #   or submitting requests in alternative capacity pools if capacity is
-    #   unavailable. For more information, see [EC2 Fleet Request Types][1]
-    #   in the *Amazon Elastic Compute Cloud User Guide*.
+    #   The type of request. The default value is `maintain`.
+    #
+    #   * `maintain` - The EC2 Fleet plaees an asynchronous request for your
+    #     desired capacity, and continues to maintain your desired Spot
+    #     capacity by replenishing interrupted Spot Instances.
+    #
+    #   * `request` - The EC2 Fleet places an asynchronous one-time request
+    #     for your desired capacity, but does submit Spot requests in
+    #     alternative capacity pools if Spot capacity is unavailable, and
+    #     does not maintain Spot capacity if Spot Instances are interrupted.
+    #
+    #   * `instant` - The EC2 Fleet places a synchronous one-time request
+    #     for your desired capacity, and returns errors for any instances
+    #     that could not be launched.
+    #
+    #   For more information, see [EC2 Fleet request types][1] in the
+    #   *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -5921,7 +6029,7 @@ module Aws::EC2
     #   The value for `ResourceType` must be `fleet`, otherwise the 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].
+    #   see [Tagging your resources][2].
     #
     #
     #
@@ -6357,14 +6465,14 @@ module Aws::EC2
     #
     #       {
     #         description: "String",
-    #         export_to_s3_task: {
+    #         export_to_s3_task: { # required
     #           container_format: "ova", # accepts ova
     #           disk_image_format: "VMDK", # accepts VMDK, RAW, VHD
     #           s3_bucket: "String",
     #           s3_prefix: "String",
     #         },
     #         instance_id: "InstanceId", # required
-    #         target_environment: "citrix", # accepts citrix, vmware, microsoft
+    #         target_environment: "citrix", # required, accepts citrix, vmware, microsoft
     #         tag_specifications: [
     #           {
     #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, internet-gateway, key-pair, launch-template, local-gateway-route-table-vpc-association, 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, vpc-flow-log
@@ -7790,6 +7898,7 @@ module Aws::EC2
     #         destination_ipv_6_cidr_block: "String",
     #         destination_prefix_list_id: "PrefixListResourceId",
     #         dry_run: false,
+    #         vpc_endpoint_id: "VpcEndpointId",
     #         egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
     #         gateway_id: "RouteGatewayId",
     #         instance_id: "InstanceId",
@@ -7825,6 +7934,11 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] vpc_endpoint_id
+    #   The ID of a VPC endpoint. Supported for Gateway Load Balancer
+    #   endpoints only.
+    #   @return [String]
+    #
     # @!attribute [rw] egress_only_internet_gateway_id
     #   \[IPv6 traffic only\] The ID of an egress-only internet gateway.
     #   @return [String]
@@ -7878,6 +7992,7 @@ module Aws::EC2
       :destination_ipv_6_cidr_block,
       :destination_prefix_list_id,
       :dry_run,
+      :vpc_endpoint_id,
       :egress_only_internet_gateway_id,
       :gateway_id,
       :instance_id,
@@ -9288,7 +9403,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] ipv_6_support
-    #   Enable or disable IPv6 support. The default is `enable`.
+    #   Enable or disable IPv6 support.
     #   @return [String]
     #
     # @!attribute [rw] appliance_mode_support
@@ -9461,15 +9576,15 @@ module Aws::EC2
     #
     #   You can specify the CMK using any of the following:
     #
-    #   * Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
+    #   * Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Key alias. For example, alias/ExampleAlias.
     #
     #   * Key ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
+    #     arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Alias ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
+    #     arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
     #
     #   AWS authenticates the CMK asynchronously. Therefore, if you specify
     #   an ID, alias, or ARN that is not valid, the action can appear to
@@ -9632,7 +9747,7 @@ module Aws::EC2
     #
     #       {
     #         dry_run: false,
-    #         vpc_endpoint_type: "Interface", # accepts Interface, Gateway
+    #         vpc_endpoint_type: "Interface", # accepts Interface, Gateway, GatewayLoadBalancer
     #         vpc_id: "VpcId", # required
     #         service_name: "String", # required
     #         policy_document: "String",
@@ -9678,10 +9793,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] policy_document
-    #   A policy to attach to the endpoint that controls access to the
-    #   service. The policy must be in valid JSON format. If this parameter
-    #   is not specified, we attach a default policy that allows full access
-    #   to the service.
+    #   (Interface and gateway endpoints) A policy to attach to the endpoint
+    #   that controls access to the service. The policy must be in valid
+    #   JSON format. If this parameter is not specified, we attach a default
+    #   policy that allows full access to the service.
     #   @return [String]
     #
     # @!attribute [rw] route_table_ids
@@ -9689,8 +9804,9 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] subnet_ids
-    #   (Interface endpoint) The ID of one or more subnets in which to
-    #   create an endpoint network interface.
+    #   (Interface and Gateway Load Balancer endpoints) The ID of one or
+    #   more subnets in which to create an endpoint network interface. For a
+    #   Gateway Load Balancer endpoint, you can specify one subnet only.
     #   @return [Array<String>]
     #
     # @!attribute [rw] security_group_ids
@@ -9774,7 +9890,8 @@ module Aws::EC2
     #         dry_run: false,
     #         acceptance_required: false,
     #         private_dns_name: "String",
-    #         network_load_balancer_arns: ["String"], # required
+    #         network_load_balancer_arns: ["String"],
+    #         gateway_load_balancer_arns: ["String"],
     #         client_token: "String",
     #         tag_specifications: [
     #           {
@@ -9803,7 +9920,8 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] private_dns_name
-    #   The private DNS name to assign to the VPC endpoint service.
+    #   (Interface endpoint configuration) The private DNS name to assign to
+    #   the VPC endpoint service.
     #   @return [String]
     #
     # @!attribute [rw] network_load_balancer_arns
@@ -9811,6 +9929,11 @@ module Aws::EC2
     #   Balancers for your service.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] gateway_load_balancer_arns
+    #   The Amazon Resource Names (ARNs) of one or more Gateway Load
+    #   Balancers.
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [How to Ensure
@@ -9832,6 +9955,7 @@ module Aws::EC2
       :acceptance_required,
       :private_dns_name,
       :network_load_balancer_arns,
+      :gateway_load_balancer_arns,
       :client_token,
       :tag_specifications)
       SENSITIVE = []
@@ -10703,8 +10827,15 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] terminate_instances
-    #   Indicates whether to terminate instances for an EC2 Fleet if it is
-    #   deleted successfully.
+    #   Indicates whether to terminate the instances when the EC2 Fleet is
+    #   deleted. The default is to terminate the instances.
+    #
+    #   To let the instances continue to run after the EC2 Fleet is deleted,
+    #   specify `NoTerminateInstances`. Supported only for fleets of type
+    #   `maintain` and `request`.
+    #
+    #   For `instant` fleets, you cannot specify `NoTerminateInstances`. A
+    #   deleted `instant` fleet with running instances is not supported.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteFleetsRequest AWS API Documentation
@@ -14963,7 +15094,7 @@ module Aws::EC2
     #
     #   * `log-destination-type` - The type of destination to which the flow
     #     log publishes data. Possible destination types include
-    #     `cloud-watch-logs` and `S3`.
+    #     `cloud-watch-logs` and `s3`.
     #
     #   * `flow-log-id` - The ID of the flow log.
     #
@@ -16266,7 +16397,7 @@ module Aws::EC2
     #     the location type is `region` (default), the location is the
     #     Region code (for example, `us-east-2`.)
     #
-    #   * `instance-type` - The instance type.
+    #   * `instance-type` - The instance type. For example, `c5.2xlarge`.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -16345,17 +16476,17 @@ module Aws::EC2
     #   One or more filters. Filter names and values are case-sensitive.
     #
     #   * `auto-recovery-supported` - Indicates whether auto recovery is
-    #     supported. (`true` \| `false`)
+    #     supported (`true` \| `false`).
     #
-    #   * `bare-metal` - Indicates whether it is a bare metal instance type.
-    #     (`true` \| `false`)
+    #   * `bare-metal` - Indicates whether it is a bare metal instance type
+    #     (`true` \| `false`).
     #
     #   * `burstable-performance-supported` - Indicates whether it is a
-    #     burstable performance instance type. (`true` \| `false`)
+    #     burstable performance instance type (`true` \| `false`).
     #
     #   * `current-generation` - Indicates whether this instance type is the
-    #     latest generation instance type of an instance family. (`true` \|
-    #     `false`)
+    #     latest generation instance type of an instance family (`true` \|
+    #     `false`).
     #
     #   * `ebs-info.ebs-optimized-info.baseline-bandwidth-in-mbps` - The
     #     baseline bandwidth performance for an EBS-optimized instance type,
@@ -16367,7 +16498,7 @@ module Aws::EC2
     #
     #   * `ebs-info.ebs-optimized-info.baseline-throughput-in-mbps` - The
     #     baseline throughput performance for an EBS-optimized instance
-    #     type, in MBps.
+    #     type, in MB/s.
     #
     #   * `ebs-info.ebs-optimized-info.maximum-bandwidth-in-mbps` - The
     #     maximum bandwidth performance for an EBS-optimized instance type,
@@ -16379,25 +16510,25 @@ module Aws::EC2
     #
     #   * `ebs-info.ebs-optimized-info.maximum-throughput-in-mbps` - The
     #     maximum throughput performance for an EBS-optimized instance type,
-    #     in MBps.
+    #     in MB/s.
     #
     #   * `ebs-info.ebs-optimized-support` - Indicates whether the instance
-    #     type is EBS-optimized. (`supported` \| `unsupported` \| `default`)
+    #     type is EBS-optimized (`supported` \| `unsupported` \| `default`).
     #
     #   * `ebs-info.encryption-support` - Indicates whether EBS encryption
-    #     is supported. (`supported` \| `unsupported`)
+    #     is supported (`supported` \| `unsupported`).
     #
     #   * `ebs-info.nvme-support` - Indicates whether non-volatile memory
-    #     express (NVMe) is supported for EBS volumes. (`required` \|
-    #     `supported` \| `unsupported`)
+    #     express (NVMe) is supported for EBS volumes (`required` \|
+    #     `supported` \| `unsupported`).
     #
     #   * `free-tier-eligible` - Indicates whether the instance type is
-    #     eligible to use in the free tier. (`true` \| `false`)
+    #     eligible to use in the free tier (`true` \| `false`).
     #
     #   * `hibernation-supported` - Indicates whether On-Demand hibernation
-    #     is supported. (`true` \| `false`)
+    #     is supported (`true` \| `false`).
     #
-    #   * `hypervisor` - The hypervisor. (`nitro` \| `xen`)
+    #   * `hypervisor` - The hypervisor (`nitro` \| `xen`).
     #
     #   * `instance-storage-info.disk.count` - The number of local disks.
     #
@@ -16405,17 +16536,17 @@ module Aws::EC2
     #     instance storage disk, in GB.
     #
     #   * `instance-storage-info.disk.type` - The storage technology for the
-    #     local instance storage disks. (`hdd` \| `ssd`)
+    #     local instance storage disks (`hdd` \| `ssd`).
     #
     #   * `instance-storage-info.nvme-support` - Indicates whether
-    #     non-volatile memory express (NVMe) is supported for instance
-    #     store. (`required` \| `supported`) \| `unsupported`)
+    #     non-volatile memory express (NVMe) is supported for instance store
+    #     (`required` \| `supported`) \| `unsupported`).
     #
     #   * `instance-storage-info.total-size-in-gb` - The total amount of
     #     storage available from all local instance storage, in GB.
     #
     #   * `instance-storage-supported` - Indicates whether the instance type
-    #     has local instance storage. (`true` \| `false`)
+    #     has local instance storage (`true` \| `false`).
     #
     #   * `instance-type` - The instance type (for example `c5.2xlarge` or
     #     c5*).
@@ -16423,11 +16554,11 @@ module Aws::EC2
     #   * `memory-info.size-in-mib` - The memory size.
     #
     #   * `network-info.efa-supported` - Indicates whether the instance type
-    #     supports Elastic Fabric Adapter (EFA). (`true` \| `false`)
+    #     supports Elastic Fabric Adapter (EFA) (`true` \| `false`).
     #
     #   * `network-info.ena-support` - Indicates whether Elastic Network
-    #     Adapter (ENA) is supported or required. (`required` \| `supported`
-    #     \| `unsupported`)
+    #     Adapter (ENA) is supported or required (`required` \| `supported`
+    #     \| `unsupported`).
     #
     #   * `network-info.ipv4-addresses-per-interface` - The maximum number
     #     of private IPv4 addresses per network interface.
@@ -16436,7 +16567,7 @@ module Aws::EC2
     #     of private IPv6 addresses per network interface.
     #
     #   * `network-info.ipv6-supported` - Indicates whether the instance
-    #     type supports IPv6. (`true` \| `false`)
+    #     type supports IPv6 (`true` \| `false`).
     #
     #   * `network-info.maximum-network-interfaces` - The maximum number of
     #     network interfaces per instance.
@@ -16444,19 +16575,19 @@ module Aws::EC2
     #   * `network-info.network-performance` - The network performance (for
     #     example, "25 Gigabit").
     #
-    #   * `processor-info.supported-architecture` - The CPU architecture.
-    #     (`arm64` \| `i386` \| `x86_64`)
+    #   * `processor-info.supported-architecture` - The CPU architecture
+    #     (`arm64` \| `i386` \| `x86_64`).
     #
     #   * `processor-info.sustained-clock-speed-in-ghz` - The CPU clock
     #     speed, in GHz.
     #
-    #   * `supported-root-device-type` - The root device type. (`ebs` \|
-    #     `instance-store`)
+    #   * `supported-root-device-type` - The root device type (`ebs` \|
+    #     `instance-store`).
     #
-    #   * `supported-usage-class` - The usage class. (`on-demand` \| `spot`)
+    #   * `supported-usage-class` - The usage class (`on-demand` \| `spot`).
     #
-    #   * `supported-virtualization-type` - The virtualization type. (`hvm`
-    #     \| `paravirtual`)
+    #   * `supported-virtualization-type` - The virtualization type (`hvm`
+    #     \| `paravirtual`).
     #
     #   * `vcpu-info.default-cores` - The default number of cores for the
     #     instance type.
@@ -21472,6 +21603,16 @@ module Aws::EC2
     #     `initiatingRequest` \| `modifying` \| `pendingAcceptance` \|
     #     `pending` \| `rollingBack` \| `rejected` \| `rejecting`).
     #
+    #   * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
+    #     to the resource. Use the tag key in the filter name and the tag
+    #     value as the filter value. For example, to find all resources that
+    #     have a tag with the key `Owner` and the value `TeamA`, specify
+    #     `tag:Owner` for the filter name and `TeamA` for the filter value.
+    #
+    #   * `tag-key` - The key of a tag assigned to the resource. Use this
+    #     filter to find all resources that have a tag with a specific key,
+    #     regardless of the tag value.
+    #
     #   * `transit-gateway-id` - The ID of the transit gateway.
     #   @return [Array<Types::Filter>]
     #
@@ -22851,6 +22992,9 @@ module Aws::EC2
     #     (`pendingAcceptance` \| `pending` \| `available` \| `deleting` \|
     #     `deleted` \| `rejected` \| `failed`).
     #
+    #   * `vpc-endpoint-type` - The type of VPC endpoint (`Interface` \|
+    #     `Gateway` \| `GatewayLoadBalancer`).
+    #
     #   * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
     #     to the resource. Use the tag key in the filter name and the tag
     #     value as the filter value. For example, to find all resources that
@@ -24733,9 +24877,9 @@ module Aws::EC2
     # Describes the Amazon EBS features supported by the instance type.
     #
     # @!attribute [rw] ebs_optimized_support
-    #   Indicates that the instance type is Amazon EBS-optimized. For more
-    #   information, see [Amazon EBS-Optimized Instances][1] in *Amazon EC2
-    #   User Guide for Linux Instances*.
+    #   Indicates whether the instance type is Amazon EBS-optimized. For
+    #   more information, see [Amazon EBS-Optimized Instances][1] in *Amazon
+    #   EC2 User Guide for Linux Instances*.
     #
     #
     #
@@ -24832,7 +24976,7 @@ module Aws::EC2
     #
     # @!attribute [rw] baseline_throughput_in_m_bps
     #   The baseline throughput performance for an EBS-optimized instance
-    #   type, in MBps.
+    #   type, in MB/s.
     #   @return [Float]
     #
     # @!attribute [rw] baseline_iops
@@ -24847,7 +24991,7 @@ module Aws::EC2
     #
     # @!attribute [rw] maximum_throughput_in_m_bps
     #   The maximum throughput performance for an EBS-optimized instance
-    #   type, in MBps.
+    #   type, in MB/s.
     #   @return [Float]
     #
     # @!attribute [rw] maximum_iops
@@ -25519,12 +25663,12 @@ module Aws::EC2
     end
 
     # Indicates whether the instance is enabled for AWS Nitro Enclaves. For
-    # more information, see [ AWS Nitro Enclaves][1] in the *Amazon Elastic
-    # Compute Cloud User Guide*.
+    # more information, see [ What is AWS Nitro Enclaves?][1] in the *AWS
+    # Nitro Enclaves User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html
+    # [1]: https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html
     #
     # @note When making an API call, you may pass EnclaveOptionsRequest
     #   data as a hash:
@@ -26733,6 +26877,113 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The strategy to use when Amazon EC2 emits a signal that your Spot
+    # Instance is at an elevated risk of being interrupted.
+    #
+    # @!attribute [rw] replacement_strategy
+    #   To allow EC2 Fleet to launch a replacement Spot Instance when an
+    #   instance rebalance notification is emitted for an existing Spot
+    #   Instance in the fleet, specify `launch`. Only available for fleets
+    #   of type `maintain`.
+    #
+    #   <note markdown="1"> When a replacement instance is launched, the instance marked for
+    #   rebalance is not automatically terminated. You can terminate it, or
+    #   you can leave it running. You are charged for both instances while
+    #   they are running.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetSpotCapacityRebalance AWS API Documentation
+    #
+    class FleetSpotCapacityRebalance < Struct.new(
+      :replacement_strategy)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The Spot Instance replacement strategy to use when Amazon EC2 emits a
+    # signal that your Spot Instance is at an elevated risk of being
+    # interrupted. For more information, see [Capacity rebalancing][1] in
+    # the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-configuration-strategies.html#ec2-fleet-capacity-rebalance
+    #
+    # @note When making an API call, you may pass FleetSpotCapacityRebalanceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         replacement_strategy: "launch", # accepts launch
+    #       }
+    #
+    # @!attribute [rw] replacement_strategy
+    #   The replacement strategy to use. Only available for fleets of type
+    #   `maintain`.
+    #
+    #   To allow EC2 Fleet to launch a replacement Spot Instance when an
+    #   instance rebalance notification is emitted for an existing Spot
+    #   Instance in the fleet, specify `launch`. You must specify a value,
+    #   otherwise you get an error.
+    #
+    #   <note markdown="1"> When a replacement instance is launched, the instance marked for
+    #   rebalance is not automatically terminated. You can terminate it, or
+    #   you can leave it running. You are charged for all instances while
+    #   they are running.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetSpotCapacityRebalanceRequest AWS API Documentation
+    #
+    class FleetSpotCapacityRebalanceRequest < Struct.new(
+      :replacement_strategy)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The strategies for managing your Spot Instances that are at an
+    # elevated risk of being interrupted.
+    #
+    # @!attribute [rw] capacity_rebalance
+    #   The strategy to use when Amazon EC2 emits a signal that your Spot
+    #   Instance is at an elevated risk of being interrupted.
+    #   @return [Types::FleetSpotCapacityRebalance]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetSpotMaintenanceStrategies AWS API Documentation
+    #
+    class FleetSpotMaintenanceStrategies < Struct.new(
+      :capacity_rebalance)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The strategies for managing your Spot Instances that are at an
+    # elevated risk of being interrupted.
+    #
+    # @note When making an API call, you may pass FleetSpotMaintenanceStrategiesRequest
+    #   data as a hash:
+    #
+    #       {
+    #         capacity_rebalance: {
+    #           replacement_strategy: "launch", # accepts launch
+    #         },
+    #       }
+    #
+    # @!attribute [rw] capacity_rebalance
+    #   The strategy to use when Amazon EC2 emits a signal that your Spot
+    #   Instance is at an elevated risk of being interrupted.
+    #   @return [Types::FleetSpotCapacityRebalanceRequest]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetSpotMaintenanceStrategiesRequest AWS API Documentation
+    #
+    class FleetSpotMaintenanceStrategiesRequest < Struct.new(
+      :capacity_rebalance)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a flow log.
     #
     # @!attribute [rw] creation_time
@@ -26869,7 +27120,7 @@ module Aws::EC2
     # Describes the memory for the FPGA accelerator for the instance type.
     #
     # @!attribute [rw] size_in_mi_b
-    #   The size (in MiB) for the memory available to the FPGA accelerator.
+    #   The size of the memory available to the FPGA accelerator, in MiB.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FpgaDeviceMemoryInfo AWS API Documentation
@@ -28445,7 +28696,7 @@ module Aws::EC2
     # Describes the memory available to the GPU accelerator.
     #
     # @!attribute [rw] size_in_mi_b
-    #   The size (in MiB) for the memory available to the GPU accelerator.
+    #   The size of the memory available to the GPU accelerator, in MiB.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GpuDeviceMemoryInfo AWS API Documentation
@@ -28464,7 +28715,7 @@ module Aws::EC2
     #
     # @!attribute [rw] total_gpu_memory_in_mi_b
     #   The total size of the memory for the GPU accelerators for the
-    #   instance type.
+    #   instance type, in MiB.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GpuInfo AWS API Documentation
@@ -31914,7 +32165,7 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] disks
-    #   Array describing the disks that are available for the instance type.
+    #   Describes the disks that are available for the instance type.
     #   @return [Array<Types::DiskInfo>]
     #
     # @!attribute [rw] nvme_support
@@ -31965,7 +32216,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] current_generation
-    #   Indicates whether the instance type is a current generation.
+    #   Indicates whether the instance type is current generation.
     #   @return [Boolean]
     #
     # @!attribute [rw] free_tier_eligible
@@ -31978,7 +32229,7 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] supported_root_device_types
-    #   Indicates the supported root device types.
+    #   The supported root device types.
     #   @return [Array<String>]
     #
     # @!attribute [rw] supported_virtualization_types
@@ -31986,11 +32237,11 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] bare_metal
-    #   Indicates whether the instance is bare metal.
+    #   Indicates whether the instance is a bare metal instance type.
     #   @return [Boolean]
     #
     # @!attribute [rw] hypervisor
-    #   Indicates the hypervisor used for the instance type.
+    #   The hypervisor for the instance type.
     #   @return [String]
     #
     # @!attribute [rw] processor_info
@@ -32010,7 +32261,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] instance_storage_info
-    #   Describes the disks for the instance type.
+    #   Describes the instance storage for the instance type.
     #   @return [Types::InstanceStorageInfo]
     #
     # @!attribute [rw] ebs_info
@@ -34737,7 +34988,7 @@ module Aws::EC2
     # Describes the memory for the instance type.
     #
     # @!attribute [rw] size_in_mi_b
-    #   Size of the memory, in MiB.
+    #   The size of the memory, in MiB.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/MemoryInfo AWS API Documentation
@@ -34904,6 +35155,10 @@ module Aws::EC2
     #         security_group_ids: ["SecurityGroupId"],
     #         vpc_id: "VpcId",
     #         self_service_portal: "enabled", # accepts enabled, disabled
+    #         client_connect_options: {
+    #           enabled: false,
+    #           lambda_function_arn: "String",
+    #         },
     #       }
     #
     # @!attribute [rw] client_vpn_endpoint_id
@@ -34982,6 +35237,11 @@ module Aws::EC2
     #   endpoint.
     #   @return [String]
     #
+    # @!attribute [rw] client_connect_options
+    #   The options for managing connection authorization for new client
+    #   connections.
+    #   @return [Types::ClientConnectOptions]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyClientVpnEndpointRequest AWS API Documentation
     #
     class ModifyClientVpnEndpointRequest < Struct.new(
@@ -34995,7 +35255,8 @@ module Aws::EC2
       :dry_run,
       :security_group_ids,
       :vpc_id,
-      :self_service_portal)
+      :self_service_portal,
+      :client_connect_options)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -35077,15 +35338,15 @@ module Aws::EC2
     #
     #   You can specify the CMK using any of the following:
     #
-    #   * Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
+    #   * Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Key alias. For example, alias/ExampleAlias.
     #
     #   * Key ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
+    #     arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
     #
     #   * Alias ARN. For example,
-    #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
+    #     arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
     #
     #   AWS authenticates the CMK asynchronously. Therefore, if you specify
     #   an ID, alias, or ARN that is not valid, the action can appear to
@@ -35159,7 +35420,7 @@ module Aws::EC2
     #           },
     #         ],
     #         fleet_id: "FleetId", # required
-    #         target_capacity_specification: { # required
+    #         target_capacity_specification: {
     #           total_target_capacity: 1, # required
     #           on_demand_target_capacity: 1,
     #           spot_target_capacity: 1,
@@ -37405,8 +37666,9 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] policy_document
-    #   A policy to attach to the endpoint that controls access to the
-    #   service. The policy must be in valid JSON format.
+    #   (Interface and gateway endpoints) A policy to attach to the endpoint
+    #   that controls access to the service. The policy must be in valid
+    #   JSON format.
     #   @return [String]
     #
     # @!attribute [rw] add_route_table_ids
@@ -37420,8 +37682,9 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] add_subnet_ids
-    #   (Interface endpoint) One or more subnet IDs in which to serve the
-    #   endpoint.
+    #   (Interface and Gateway Load Balancer endpoints) One or more subnet
+    #   IDs in which to serve the endpoint. For a Gateway Load Balancer
+    #   endpoint, you can specify only one subnet.
     #   @return [Array<String>]
     #
     # @!attribute [rw] remove_subnet_ids
@@ -37486,6 +37749,8 @@ module Aws::EC2
     #         acceptance_required: false,
     #         add_network_load_balancer_arns: ["String"],
     #         remove_network_load_balancer_arns: ["String"],
+    #         add_gateway_load_balancer_arns: ["String"],
+    #         remove_gateway_load_balancer_arns: ["String"],
     #       }
     #
     # @!attribute [rw] dry_run
@@ -37500,11 +37765,13 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] private_dns_name
-    #   The private DNS name to assign to the endpoint service.
+    #   (Interface endpoint configuration) The private DNS name to assign to
+    #   the endpoint service.
     #   @return [String]
     #
     # @!attribute [rw] remove_private_dns_name
-    #   Removes the private DNS name of the endpoint service.
+    #   (Interface endpoint configuration) Removes the private DNS name of
+    #   the endpoint service.
     #   @return [Boolean]
     #
     # @!attribute [rw] acceptance_required
@@ -37522,6 +37789,16 @@ module Aws::EC2
     #   from your service configuration.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] add_gateway_load_balancer_arns
+    #   The Amazon Resource Names (ARNs) of Gateway Load Balancers to add to
+    #   your service configuration.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] remove_gateway_load_balancer_arns
+    #   The Amazon Resource Names (ARNs) of Gateway Load Balancers to remove
+    #   from your service configuration.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyVpcEndpointServiceConfigurationRequest AWS API Documentation
     #
     class ModifyVpcEndpointServiceConfigurationRequest < Struct.new(
@@ -37531,7 +37808,9 @@ module Aws::EC2
       :remove_private_dns_name,
       :acceptance_required,
       :add_network_load_balancer_arns,
-      :remove_network_load_balancer_arns)
+      :remove_network_load_balancer_arns,
+      :add_gateway_load_balancer_arns,
+      :remove_gateway_load_balancer_arns)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -38623,16 +38902,53 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes the network card support of the instance type.
+    #
+    # @!attribute [rw] network_card_index
+    #   The index of the network card.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] network_performance
+    #   The network performance of the network card.
+    #   @return [String]
+    #
+    # @!attribute [rw] maximum_network_interfaces
+    #   The maximum number of network interfaces for the network card.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/NetworkCardInfo AWS API Documentation
+    #
+    class NetworkCardInfo < Struct.new(
+      :network_card_index,
+      :network_performance,
+      :maximum_network_interfaces)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the networking features of the instance type.
     #
     # @!attribute [rw] network_performance
-    #   Describes the network performance.
+    #   The network performance.
     #   @return [String]
     #
     # @!attribute [rw] maximum_network_interfaces
     #   The maximum number of network interfaces for the instance type.
     #   @return [Integer]
     #
+    # @!attribute [rw] maximum_network_cards
+    #   The maximum number of physical network cards that can be allocated
+    #   to the instance.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] default_network_card_index
+    #   The index of the default network card, starting at 0.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] network_cards
+    #   Describes the network cards for the instance type.
+    #   @return [Array<Types::NetworkCardInfo>]
+    #
     # @!attribute [rw] ipv_4_addresses_per_interface
     #   The maximum number of IPv4 addresses per network interface.
     #   @return [Integer]
@@ -38658,6 +38974,9 @@ module Aws::EC2
     class NetworkInfo < Struct.new(
       :network_performance,
       :maximum_network_interfaces,
+      :maximum_network_cards,
+      :default_network_card_index,
+      :network_cards,
       :ipv_4_addresses_per_interface,
       :ipv_6_addresses_per_interface,
       :ipv_6_supported,
@@ -39677,7 +39996,7 @@ module Aws::EC2
     # Describes the placement group support of the instance type.
     #
     # @!attribute [rw] supported_strategies
-    #   A list of supported placement groups types.
+    #   The supported placement group types.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PlacementGroupInfo AWS API Documentation
@@ -40024,7 +40343,7 @@ module Aws::EC2
     # Describes the processor used by the instance type.
     #
     # @!attribute [rw] supported_architectures
-    #   A list of architectures supported by the instance type.
+    #   The architectures supported by the instance type.
     #   @return [Array<String>]
     #
     # @!attribute [rw] sustained_clock_speed_in_ghz
@@ -41510,6 +41829,7 @@ module Aws::EC2
     #         destination_ipv_6_cidr_block: "String",
     #         destination_prefix_list_id: "PrefixListResourceId",
     #         dry_run: false,
+    #         vpc_endpoint_id: "VpcEndpointId",
     #         egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
     #         gateway_id: "RouteGatewayId",
     #         instance_id: "InstanceId",
@@ -41546,6 +41866,11 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] vpc_endpoint_id
+    #   The ID of a VPC endpoint. Supported for Gateway Load Balancer
+    #   endpoints only.
+    #   @return [String]
+    #
     # @!attribute [rw] egress_only_internet_gateway_id
     #   \[IPv6 traffic only\] The ID of an egress-only internet gateway.
     #   @return [String]
@@ -41598,6 +41923,7 @@ module Aws::EC2
       :destination_ipv_6_cidr_block,
       :destination_prefix_list_id,
       :dry_run,
+      :vpc_endpoint_id,
       :egress_only_internet_gateway_id,
       :gateway_id,
       :instance_id,
@@ -42209,6 +42535,11 @@ module Aws::EC2
     #         spot_fleet_request_config: { # required
     #           allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified, capacityOptimized
     #           on_demand_allocation_strategy: "lowestPrice", # accepts lowestPrice, prioritized
+    #           spot_maintenance_strategies: {
+    #             capacity_rebalance: {
+    #               replacement_strategy: "launch", # accepts launch
+    #             },
+    #           },
     #           client_token: "String",
     #           excess_capacity_termination_policy: "noTermination", # accepts noTermination, default
     #           fulfilled_capacity: 1.0,
@@ -44968,18 +45299,15 @@ module Aws::EC2
     #
     # @!attribute [rw] enclave_options
     #   Indicates whether the instance is enabled for AWS Nitro Enclaves.
-    #   For more information, see [ AWS Nitro Enclaves][1] in the *Amazon
-    #   Elastic Compute Cloud User Guide*.
+    #   For more information, see [ What is AWS Nitro Enclaves?][1] in the
+    #   *AWS Nitro Enclaves User Guide*.
     #
     #   You can't enable AWS Nitro Enclaves and hibernation on the same
-    #   instance. For more information about AWS Nitro Enclaves
-    #   requirements, see [ AWS Nitro Enclaves][2] in the *Amazon Elastic
-    #   Compute Cloud User Guide*.
+    #   instance.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html#nitro-enclave-reqs
+    #   [1]: https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html
     #   @return [Types::EnclaveOptionsRequest]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RunInstancesRequest AWS API Documentation
@@ -46406,6 +46734,11 @@ module Aws::EC2
     #   the service.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] gateway_load_balancer_arns
+    #   The Amazon Resource Names (ARNs) of the Gateway Load Balancers for
+    #   the service.
+    #   @return [Array<String>]
+    #
     # @!attribute [rw] base_endpoint_dns_names
     #   The DNS names for the service.
     #   @return [Array<String>]
@@ -46434,6 +46767,7 @@ module Aws::EC2
       :acceptance_required,
       :manages_vpc_endpoints,
       :network_load_balancer_arns,
+      :gateway_load_balancer_arns,
       :base_endpoint_dns_names,
       :private_dns_name,
       :private_dns_name_configuration,
@@ -46660,10 +46994,8 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] owner_alias
-    #   The AWS owner alias, as maintained by Amazon. The possible values
-    #   are: `amazon` \| `self` \| `all` \| `aws-marketplace` \|
-    #   `microsoft`. This AWS owner alias is not to be confused with the
-    #   user-configured AWS account alias, which is set from the IAM
+    #   The AWS owner alias, from an Amazon-maintained list (`amazon`). This
+    #   is not the user-configured AWS account alias set using the IAM
     #   console.
     #   @return [String]
     #
@@ -46922,6 +47254,46 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The Spot Instance replacement strategy to use when Amazon EC2 emits a
+    # signal that your Spot Instance is at an elevated risk of being
+    # interrupted. For more information, see [Capacity rebalancing][1] in
+    # the *Amazon EC2 User Guide for Linux Instances*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-configuration-strategies.html#spot-fleet-capacity-rebalance
+    #
+    # @note When making an API call, you may pass SpotCapacityRebalance
+    #   data as a hash:
+    #
+    #       {
+    #         replacement_strategy: "launch", # accepts launch
+    #       }
+    #
+    # @!attribute [rw] replacement_strategy
+    #   The replacement strategy to use. Only available for fleets of type
+    #   `maintain`. You must specify a value, otherwise you get an error.
+    #
+    #   To allow Spot Fleet to launch a replacement Spot Instance when an
+    #   instance rebalance notification is emitted for a Spot Instance in
+    #   the fleet, specify `launch`.
+    #
+    #   <note markdown="1"> When a replacement instance is launched, the instance marked for
+    #   rebalance is not automatically terminated. You can terminate it, or
+    #   you can leave it running. You are charged for all instances while
+    #   they are running.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotCapacityRebalance AWS API Documentation
+    #
+    class SpotCapacityRebalance < Struct.new(
+      :replacement_strategy)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the data feed for a Spot Instance.
     #
     # @!attribute [rw] bucket
@@ -47270,6 +47642,11 @@ module Aws::EC2
     #       {
     #         allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified, capacityOptimized
     #         on_demand_allocation_strategy: "lowestPrice", # accepts lowestPrice, prioritized
+    #         spot_maintenance_strategies: {
+    #           capacity_rebalance: {
+    #             replacement_strategy: "launch", # accepts launch
+    #           },
+    #         },
     #         client_token: "String",
     #         excess_capacity_termination_policy: "noTermination", # accepts noTermination, default
     #         fulfilled_capacity: 1.0,
@@ -47449,6 +47826,11 @@ module Aws::EC2
     #   defaults to `lowestPrice`.
     #   @return [String]
     #
+    # @!attribute [rw] spot_maintenance_strategies
+    #   The strategies for managing your Spot Instances that are at an
+    #   elevated risk of being interrupted.
+    #   @return [Types::SpotMaintenanceStrategies]
+    #
     # @!attribute [rw] client_token
     #   A unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of your listings. This helps to avoid duplicate
@@ -47631,6 +48013,7 @@ module Aws::EC2
     class SpotFleetRequestConfigData < Struct.new(
       :allocation_strategy,
       :on_demand_allocation_strategy,
+      :spot_maintenance_strategies,
       :client_token,
       :excess_capacity_termination_policy,
       :fulfilled_capacity,
@@ -47875,6 +48258,31 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The strategies for managing your Spot Instances that are at an
+    # elevated risk of being interrupted.
+    #
+    # @note When making an API call, you may pass SpotMaintenanceStrategies
+    #   data as a hash:
+    #
+    #       {
+    #         capacity_rebalance: {
+    #           replacement_strategy: "launch", # accepts launch
+    #         },
+    #       }
+    #
+    # @!attribute [rw] capacity_rebalance
+    #   The strategy to use when Amazon EC2 emits a signal that your Spot
+    #   Instance is at an elevated risk of being interrupted.
+    #   @return [Types::SpotCapacityRebalance]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotMaintenanceStrategies AWS API Documentation
+    #
+    class SpotMaintenanceStrategies < Struct.new(
+      :capacity_rebalance)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The options for Spot Instances.
     #
     # @note When making an API call, you may pass SpotMarketOptions
@@ -47972,6 +48380,12 @@ module Aws::EC2
     #   for the number of instances that are launching.
     #   @return [String]
     #
+    # @!attribute [rw] maintenance_strategies
+    #   The strategies for managing your workloads on your Spot Instances
+    #   that will be interrupted. Currently only the capacity rebalance
+    #   strategy is available.
+    #   @return [Types::FleetSpotMaintenanceStrategies]
+    #
     # @!attribute [rw] instance_interruption_behavior
     #   The behavior when a Spot Instance is interrupted. The default is
     #   `terminate`.
@@ -48011,6 +48425,7 @@ module Aws::EC2
     #
     class SpotOptions < Struct.new(
       :allocation_strategy,
+      :maintenance_strategies,
       :instance_interruption_behavior,
       :instance_pools_to_use_count,
       :single_instance_type,
@@ -48028,6 +48443,11 @@ module Aws::EC2
     #
     #       {
     #         allocation_strategy: "lowest-price", # accepts lowest-price, diversified, capacity-optimized
+    #         maintenance_strategies: {
+    #           capacity_rebalance: {
+    #             replacement_strategy: "launch", # accepts launch
+    #           },
+    #         },
     #         instance_interruption_behavior: "hibernate", # accepts hibernate, stop, terminate
     #         instance_pools_to_use_count: 1,
     #         single_instance_type: false,
@@ -48052,6 +48472,11 @@ module Aws::EC2
     #   for the number of instances that are launching.
     #   @return [String]
     #
+    # @!attribute [rw] maintenance_strategies
+    #   The strategies for managing your Spot Instances that are at an
+    #   elevated risk of being interrupted.
+    #   @return [Types::FleetSpotMaintenanceStrategiesRequest]
+    #
     # @!attribute [rw] instance_interruption_behavior
     #   The behavior when a Spot Instance is interrupted. The default is
     #   `terminate`.
@@ -48091,6 +48516,7 @@ module Aws::EC2
     #
     class SpotOptionsRequest < Struct.new(
       :allocation_strategy,
+      :maintenance_strategies,
       :instance_interruption_behavior,
       :instance_pools_to_use_count,
       :single_instance_type,
@@ -48804,15 +49230,16 @@ module Aws::EC2
     # @!attribute [rw] resource_type
     #   The type of resource to tag. Currently, the resource types that
     #   support tagging on creation are: `capacity-reservation` \|
-    #   `client-vpn-endpoint` \| `customer-gateway` \| `dedicated-host` \|
-    #   `dhcp-options` \| `export-image-task` \| `export-instance-task` \|
-    #   `fleet` \| `fpga-image` \| `host-reservation` \| `import-image-task`
-    #   \| `import-snapshot-task` \| `instance` \| `internet-gateway` \|
-    #   `ipv4pool-ec2` \| `ipv6pool-ec2` \| `key-pair` \| `launch-template`
-    #   \| `placement-group` \| `prefix-list` \| `natgateway` \|
-    #   `network-acl` \| `route-table` \| `security-group` \|
-    #   `spot-fleet-request` \| `spot-instances-request` \| `snapshot` \|
-    #   `subnet` \| `traffic-mirror-filter` \| `traffic-mirror-session` \|
+    #   `carrier-gateway` \| `client-vpn-endpoint` \| `customer-gateway` \|
+    #   `dedicated-host` \| `dhcp-options` \| `export-image-task` \|
+    #   `export-instance-task` \| `fleet` \| `fpga-image` \|
+    #   `host-reservation` \| `import-image-task` \| `import-snapshot-task`
+    #   \| `instance` \| `internet-gateway` \| `ipv4pool-ec2` \|
+    #   `ipv6pool-ec2` \| `key-pair` \| `launch-template` \|
+    #   `placement-group` \| `prefix-list` \| `natgateway` \| `network-acl`
+    #   \| `route-table` \| `security-group` \| `spot-fleet-request` \|
+    #   `spot-instances-request` \| `snapshot` \| `subnet` \|
+    #   `traffic-mirror-filter` \| `traffic-mirror-session` \|
     #   `traffic-mirror-target` \| `transit-gateway` \|
     #   `transit-gateway-attachment` \| `transit-gateway-route-table` \|
     #   `volume` \|`vpc` \| ` vpc-peering-connection` \| `vpc-endpoint` (for
@@ -51118,13 +51545,13 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] valid_cores
-    #   List of the valid number of cores that can be configured for the
-    #   instance type.
+    #   The valid number of cores that can be configured for the instance
+    #   type.
     #   @return [Array<Integer>]
     #
     # @!attribute [rw] valid_threads_per_core
-    #   List of the valid number of threads per core that can be configured
-    #   for the instance type.
+    #   The valid number of threads per core that can be configured for the
+    #   instance type.
     #   @return [Array<Integer>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VCpuInfo AWS API Documentation
@@ -51916,6 +52343,11 @@ module Aws::EC2
     #   the service.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] gateway_load_balancer_arns
+    #   The Amazon Resource Names (ARNs) of the Gateway Load Balancers for
+    #   the service.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VpcEndpointConnection AWS API Documentation
     #
     class VpcEndpointConnection < Struct.new(
@@ -51925,7 +52357,8 @@ module Aws::EC2
       :vpc_endpoint_state,
       :creation_timestamp,
       :dns_entries,
-      :network_load_balancer_arns)
+      :network_load_balancer_arns,
+      :gateway_load_balancer_arns)
       SENSITIVE = []
       include Aws::Structure
     end