aws-sdk-ec2 1.182.0 → 1.187.0

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

@@ -176,6 +176,12 @@ module Aws::EC2
     CapacityReservationTarget = Shapes::StructureShape.new(name: 'CapacityReservationTarget')
     CapacityReservationTargetResponse = Shapes::StructureShape.new(name: 'CapacityReservationTargetResponse')
     CapacityReservationTenancy = Shapes::StringShape.new(name: 'CapacityReservationTenancy')
+    CarrierGateway = Shapes::StructureShape.new(name: 'CarrierGateway')
+    CarrierGatewayId = Shapes::StringShape.new(name: 'CarrierGatewayId')
+    CarrierGatewayIdSet = Shapes::ListShape.new(name: 'CarrierGatewayIdSet')
+    CarrierGatewayMaxResults = Shapes::IntegerShape.new(name: 'CarrierGatewayMaxResults')
+    CarrierGatewaySet = Shapes::ListShape.new(name: 'CarrierGatewaySet')
+    CarrierGatewayState = Shapes::StringShape.new(name: 'CarrierGatewayState')
     CertificateAuthentication = Shapes::StructureShape.new(name: 'CertificateAuthentication')
     CertificateAuthenticationRequest = Shapes::StructureShape.new(name: 'CertificateAuthenticationRequest')
     CidrAuthorizationContext = Shapes::StructureShape.new(name: 'CidrAuthorizationContext')
@@ -248,6 +254,8 @@ module Aws::EC2
     CpuOptionsRequest = Shapes::StructureShape.new(name: 'CpuOptionsRequest')
     CreateCapacityReservationRequest = Shapes::StructureShape.new(name: 'CreateCapacityReservationRequest')
     CreateCapacityReservationResult = Shapes::StructureShape.new(name: 'CreateCapacityReservationResult')
+    CreateCarrierGatewayRequest = Shapes::StructureShape.new(name: 'CreateCarrierGatewayRequest')
+    CreateCarrierGatewayResult = Shapes::StructureShape.new(name: 'CreateCarrierGatewayResult')
     CreateClientVpnEndpointRequest = Shapes::StructureShape.new(name: 'CreateClientVpnEndpointRequest')
     CreateClientVpnEndpointResult = Shapes::StructureShape.new(name: 'CreateClientVpnEndpointResult')
     CreateClientVpnRouteRequest = Shapes::StructureShape.new(name: 'CreateClientVpnRouteRequest')
@@ -374,6 +382,8 @@ module Aws::EC2
     DefaultRouteTablePropagationValue = Shapes::StringShape.new(name: 'DefaultRouteTablePropagationValue')
     DefaultTargetCapacityType = Shapes::StringShape.new(name: 'DefaultTargetCapacityType')
     DefaultingDhcpOptionsId = Shapes::StringShape.new(name: 'DefaultingDhcpOptionsId')
+    DeleteCarrierGatewayRequest = Shapes::StructureShape.new(name: 'DeleteCarrierGatewayRequest')
+    DeleteCarrierGatewayResult = Shapes::StructureShape.new(name: 'DeleteCarrierGatewayResult')
     DeleteClientVpnEndpointRequest = Shapes::StructureShape.new(name: 'DeleteClientVpnEndpointRequest')
     DeleteClientVpnEndpointResult = Shapes::StructureShape.new(name: 'DeleteClientVpnEndpointResult')
     DeleteClientVpnRouteRequest = Shapes::StructureShape.new(name: 'DeleteClientVpnRouteRequest')
@@ -489,6 +499,8 @@ module Aws::EC2
     DescribeCapacityReservationsMaxResults = Shapes::IntegerShape.new(name: 'DescribeCapacityReservationsMaxResults')
     DescribeCapacityReservationsRequest = Shapes::StructureShape.new(name: 'DescribeCapacityReservationsRequest')
     DescribeCapacityReservationsResult = Shapes::StructureShape.new(name: 'DescribeCapacityReservationsResult')
+    DescribeCarrierGatewaysRequest = Shapes::StructureShape.new(name: 'DescribeCarrierGatewaysRequest')
+    DescribeCarrierGatewaysResult = Shapes::StructureShape.new(name: 'DescribeCarrierGatewaysResult')
     DescribeClassicLinkInstancesMaxResults = Shapes::IntegerShape.new(name: 'DescribeClassicLinkInstancesMaxResults')
     DescribeClassicLinkInstancesRequest = Shapes::StructureShape.new(name: 'DescribeClassicLinkInstancesRequest')
     DescribeClassicLinkInstancesResult = Shapes::StructureShape.new(name: 'DescribeClassicLinkInstancesResult')
@@ -1932,6 +1944,7 @@ module Aws::EC2
     TransitGatewayVpcAttachmentList = Shapes::ListShape.new(name: 'TransitGatewayVpcAttachmentList')
     TransitGatewayVpcAttachmentOptions = Shapes::StructureShape.new(name: 'TransitGatewayVpcAttachmentOptions')
     TransportProtocol = Shapes::StringShape.new(name: 'TransportProtocol')
+    TunnelInsideIpVersion = Shapes::StringShape.new(name: 'TunnelInsideIpVersion')
     TunnelOption = Shapes::StructureShape.new(name: 'TunnelOption')
     TunnelOptionsList = Shapes::ListShape.new(name: 'TunnelOptionsList')
     UnassignIpv6AddressesRequest = Shapes::StructureShape.new(name: 'UnassignIpv6AddressesRequest')
@@ -2143,6 +2156,7 @@ module Aws::EC2
     Address.add_member(:network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "networkBorderGroup"))
     Address.add_member(:customer_owned_ip, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIp"))
     Address.add_member(:customer_owned_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIpv4Pool"))
+    Address.add_member(:carrier_ip, Shapes::ShapeRef.new(shape: String, location_name: "carrierIp"))
     Address.struct_class = Types::Address
 
     AddressList.member = Shapes::ShapeRef.new(shape: Address, location_name: "item")
@@ -2169,6 +2183,7 @@ module Aws::EC2
     AllocateAddressResult.add_member(:domain, Shapes::ShapeRef.new(shape: DomainType, location_name: "domain"))
     AllocateAddressResult.add_member(:customer_owned_ip, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIp"))
     AllocateAddressResult.add_member(:customer_owned_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIpv4Pool"))
+    AllocateAddressResult.add_member(:carrier_ip, Shapes::ShapeRef.new(shape: String, location_name: "carrierIp"))
     AllocateAddressResult.struct_class = Types::AllocateAddressResult
 
     AllocateHostsRequest.add_member(:auto_placement, Shapes::ShapeRef.new(shape: AutoPlacement, location_name: "autoPlacement"))
@@ -2615,6 +2630,17 @@ module Aws::EC2
     CapacityReservationTargetResponse.add_member(:capacity_reservation_resource_group_arn, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationResourceGroupArn"))
     CapacityReservationTargetResponse.struct_class = Types::CapacityReservationTargetResponse
 
+    CarrierGateway.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, location_name: "carrierGatewayId"))
+    CarrierGateway.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "vpcId"))
+    CarrierGateway.add_member(:state, Shapes::ShapeRef.new(shape: CarrierGatewayState, location_name: "state"))
+    CarrierGateway.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    CarrierGateway.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    CarrierGateway.struct_class = Types::CarrierGateway
+
+    CarrierGatewayIdSet.member = Shapes::ShapeRef.new(shape: CarrierGatewayId)
+
+    CarrierGatewaySet.member = Shapes::ShapeRef.new(shape: CarrierGateway, location_name: "item")
+
     CertificateAuthentication.add_member(:client_root_certificate_chain, Shapes::ShapeRef.new(shape: String, location_name: "clientRootCertificateChain"))
     CertificateAuthentication.struct_class = Types::CertificateAuthentication
 
@@ -2877,6 +2903,15 @@ module Aws::EC2
     CreateCapacityReservationResult.add_member(:capacity_reservation, Shapes::ShapeRef.new(shape: CapacityReservation, location_name: "capacityReservation"))
     CreateCapacityReservationResult.struct_class = Types::CreateCapacityReservationResult
 
+    CreateCarrierGatewayRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "VpcId"))
+    CreateCarrierGatewayRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateCarrierGatewayRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateCarrierGatewayRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    CreateCarrierGatewayRequest.struct_class = Types::CreateCarrierGatewayRequest
+
+    CreateCarrierGatewayResult.add_member(:carrier_gateway, Shapes::ShapeRef.new(shape: CarrierGateway, location_name: "carrierGateway"))
+    CreateCarrierGatewayResult.struct_class = Types::CreateCarrierGatewayResult
+
     CreateClientVpnEndpointRequest.add_member(:client_cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClientCidrBlock"))
     CreateClientVpnEndpointRequest.add_member(:server_certificate_arn, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ServerCertificateArn"))
     CreateClientVpnEndpointRequest.add_member(:authentication_options, Shapes::ShapeRef.new(shape: ClientVpnAuthenticationRequestList, required: true, location_name: "Authentication"))
@@ -3195,6 +3230,7 @@ module Aws::EC2
     CreateRouteRequest.add_member(:nat_gateway_id, Shapes::ShapeRef.new(shape: NatGatewayId, location_name: "natGatewayId"))
     CreateRouteRequest.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: TransitGatewayId, location_name: "TransitGatewayId"))
     CreateRouteRequest.add_member(:local_gateway_id, Shapes::ShapeRef.new(shape: LocalGatewayId, location_name: "LocalGatewayId"))
+    CreateRouteRequest.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, location_name: "CarrierGatewayId"))
     CreateRouteRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, location_name: "networkInterfaceId"))
     CreateRouteRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
     CreateRouteRequest.add_member(:vpc_peering_connection_id, Shapes::ShapeRef.new(shape: VpcPeeringConnectionId, location_name: "vpcPeeringConnectionId"))
@@ -3515,6 +3551,13 @@ module Aws::EC2
 
     CustomerGatewayList.member = Shapes::ShapeRef.new(shape: CustomerGateway, location_name: "item")
 
+    DeleteCarrierGatewayRequest.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, required: true, location_name: "CarrierGatewayId"))
+    DeleteCarrierGatewayRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteCarrierGatewayRequest.struct_class = Types::DeleteCarrierGatewayRequest
+
+    DeleteCarrierGatewayResult.add_member(:carrier_gateway, Shapes::ShapeRef.new(shape: CarrierGateway, location_name: "carrierGateway"))
+    DeleteCarrierGatewayResult.struct_class = Types::DeleteCarrierGatewayResult
+
     DeleteClientVpnEndpointRequest.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: ClientVpnEndpointId, required: true, location_name: "ClientVpnEndpointId"))
     DeleteClientVpnEndpointRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DeleteClientVpnEndpointRequest.struct_class = Types::DeleteClientVpnEndpointRequest
@@ -3949,6 +3992,17 @@ module Aws::EC2
     DescribeCapacityReservationsResult.add_member(:capacity_reservations, Shapes::ShapeRef.new(shape: CapacityReservationSet, location_name: "capacityReservationSet"))
     DescribeCapacityReservationsResult.struct_class = Types::DescribeCapacityReservationsResult
 
+    DescribeCarrierGatewaysRequest.add_member(:carrier_gateway_ids, Shapes::ShapeRef.new(shape: CarrierGatewayIdSet, location_name: "CarrierGatewayId"))
+    DescribeCarrierGatewaysRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeCarrierGatewaysRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: CarrierGatewayMaxResults, location_name: "MaxResults"))
+    DescribeCarrierGatewaysRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeCarrierGatewaysRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeCarrierGatewaysRequest.struct_class = Types::DescribeCarrierGatewaysRequest
+
+    DescribeCarrierGatewaysResult.add_member(:carrier_gateways, Shapes::ShapeRef.new(shape: CarrierGatewaySet, location_name: "carrierGatewaySet"))
+    DescribeCarrierGatewaysResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeCarrierGatewaysResult.struct_class = Types::DescribeCarrierGatewaysResult
+
     DescribeClassicLinkInstancesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeClassicLinkInstancesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeClassicLinkInstancesRequest.add_member(:instance_ids, Shapes::ShapeRef.new(shape: InstanceIdStringList, location_name: "InstanceId"))
@@ -6508,6 +6562,7 @@ module Aws::EC2
     InstanceNetworkInterface.add_member(:interface_type, Shapes::ShapeRef.new(shape: String, location_name: "interfaceType"))
     InstanceNetworkInterface.struct_class = Types::InstanceNetworkInterface
 
+    InstanceNetworkInterfaceAssociation.add_member(:carrier_ip, Shapes::ShapeRef.new(shape: String, location_name: "carrierIp"))
     InstanceNetworkInterfaceAssociation.add_member(:ip_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ipOwnerId"))
     InstanceNetworkInterfaceAssociation.add_member(:public_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicDnsName"))
     InstanceNetworkInterfaceAssociation.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "publicIp"))
@@ -6534,6 +6589,7 @@ module Aws::EC2
     InstanceNetworkInterfaceSpecification.add_member(:private_ip_addresses, Shapes::ShapeRef.new(shape: PrivateIpAddressSpecificationList, location_name: "privateIpAddressesSet", metadata: {"queryName"=>"PrivateIpAddresses"}))
     InstanceNetworkInterfaceSpecification.add_member(:secondary_private_ip_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "secondaryPrivateIpAddressCount"))
     InstanceNetworkInterfaceSpecification.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
+    InstanceNetworkInterfaceSpecification.add_member(:associate_carrier_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "AssociateCarrierIpAddress"))
     InstanceNetworkInterfaceSpecification.add_member(:interface_type, Shapes::ShapeRef.new(shape: String, location_name: "InterfaceType"))
     InstanceNetworkInterfaceSpecification.struct_class = Types::InstanceNetworkInterfaceSpecification
 
@@ -6878,6 +6934,7 @@ module Aws::EC2
     LaunchTemplateInstanceMetadataOptionsRequest.add_member(:http_endpoint, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataEndpointState, location_name: "HttpEndpoint"))
     LaunchTemplateInstanceMetadataOptionsRequest.struct_class = Types::LaunchTemplateInstanceMetadataOptionsRequest
 
+    LaunchTemplateInstanceNetworkInterfaceSpecification.add_member(:associate_carrier_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "associateCarrierIpAddress"))
     LaunchTemplateInstanceNetworkInterfaceSpecification.add_member(:associate_public_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "associatePublicIpAddress"))
     LaunchTemplateInstanceNetworkInterfaceSpecification.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "deleteOnTermination"))
     LaunchTemplateInstanceNetworkInterfaceSpecification.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
@@ -6895,6 +6952,7 @@ module Aws::EC2
 
     LaunchTemplateInstanceNetworkInterfaceSpecificationList.member = Shapes::ShapeRef.new(shape: LaunchTemplateInstanceNetworkInterfaceSpecification, location_name: "item")
 
+    LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.add_member(:associate_carrier_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "AssociateCarrierIpAddress"))
     LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.add_member(:associate_public_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "AssociatePublicIpAddress"))
     LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "DeleteOnTermination"))
     LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
@@ -7530,6 +7588,7 @@ module Aws::EC2
     ModifyVpnTunnelOptionsResult.struct_class = Types::ModifyVpnTunnelOptionsResult
 
     ModifyVpnTunnelOptionsSpecification.add_member(:tunnel_inside_cidr, Shapes::ShapeRef.new(shape: String, location_name: "TunnelInsideCidr"))
+    ModifyVpnTunnelOptionsSpecification.add_member(:tunnel_inside_ipv_6_cidr, Shapes::ShapeRef.new(shape: String, location_name: "TunnelInsideIpv6Cidr"))
     ModifyVpnTunnelOptionsSpecification.add_member(:pre_shared_key, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKey"))
     ModifyVpnTunnelOptionsSpecification.add_member(:phase_1_lifetime_seconds, Shapes::ShapeRef.new(shape: Integer, location_name: "Phase1LifetimeSeconds"))
     ModifyVpnTunnelOptionsSpecification.add_member(:phase_2_lifetime_seconds, Shapes::ShapeRef.new(shape: Integer, location_name: "Phase2LifetimeSeconds"))
@@ -7664,6 +7723,8 @@ module Aws::EC2
     NetworkInterfaceAssociation.add_member(:ip_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ipOwnerId"))
     NetworkInterfaceAssociation.add_member(:public_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicDnsName"))
     NetworkInterfaceAssociation.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "publicIp"))
+    NetworkInterfaceAssociation.add_member(:customer_owned_ip, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIp"))
+    NetworkInterfaceAssociation.add_member(:carrier_ip, Shapes::ShapeRef.new(shape: String, location_name: "carrierIp"))
     NetworkInterfaceAssociation.struct_class = Types::NetworkInterfaceAssociation
 
     NetworkInterfaceAttachment.add_member(:attach_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "attachTime"))
@@ -8204,6 +8265,7 @@ module Aws::EC2
     ReplaceRouteRequest.add_member(:nat_gateway_id, Shapes::ShapeRef.new(shape: NatGatewayId, location_name: "natGatewayId"))
     ReplaceRouteRequest.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: TransitGatewayId, location_name: "TransitGatewayId"))
     ReplaceRouteRequest.add_member(:local_gateway_id, Shapes::ShapeRef.new(shape: LocalGatewayId, location_name: "LocalGatewayId"))
+    ReplaceRouteRequest.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, location_name: "CarrierGatewayId"))
     ReplaceRouteRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, location_name: "networkInterfaceId"))
     ReplaceRouteRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
     ReplaceRouteRequest.add_member(:vpc_peering_connection_id, Shapes::ShapeRef.new(shape: VpcPeeringConnectionId, location_name: "vpcPeeringConnectionId"))
@@ -8576,6 +8638,7 @@ module Aws::EC2
     Route.add_member(:nat_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "natGatewayId"))
     Route.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "transitGatewayId"))
     Route.add_member(:local_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "localGatewayId"))
+    Route.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, location_name: "carrierGatewayId"))
     Route.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: String, location_name: "networkInterfaceId"))
     Route.add_member(:origin, Shapes::ShapeRef.new(shape: RouteOrigin, location_name: "origin"))
     Route.add_member(:state, Shapes::ShapeRef.new(shape: RouteState, location_name: "state"))
@@ -9592,6 +9655,7 @@ module Aws::EC2
 
     TunnelOption.add_member(:outside_ip_address, Shapes::ShapeRef.new(shape: String, location_name: "outsideIpAddress"))
     TunnelOption.add_member(:tunnel_inside_cidr, Shapes::ShapeRef.new(shape: String, location_name: "tunnelInsideCidr"))
+    TunnelOption.add_member(:tunnel_inside_ipv_6_cidr, Shapes::ShapeRef.new(shape: String, location_name: "tunnelInsideIpv6Cidr"))
     TunnelOption.add_member(:pre_shared_key, Shapes::ShapeRef.new(shape: String, location_name: "preSharedKey"))
     TunnelOption.add_member(:phase_1_lifetime_seconds, Shapes::ShapeRef.new(shape: Integer, location_name: "phase1LifetimeSeconds"))
     TunnelOption.add_member(:phase_2_lifetime_seconds, Shapes::ShapeRef.new(shape: Integer, location_name: "phase2LifetimeSeconds"))
@@ -9967,11 +10031,13 @@ module Aws::EC2
 
     VpnConnectionOptions.add_member(:enable_acceleration, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableAcceleration"))
     VpnConnectionOptions.add_member(:static_routes_only, Shapes::ShapeRef.new(shape: Boolean, location_name: "staticRoutesOnly"))
+    VpnConnectionOptions.add_member(:tunnel_inside_ip_version, Shapes::ShapeRef.new(shape: TunnelInsideIpVersion, location_name: "tunnelInsideIpVersion"))
     VpnConnectionOptions.add_member(:tunnel_options, Shapes::ShapeRef.new(shape: TunnelOptionsList, location_name: "tunnelOptionSet"))
     VpnConnectionOptions.struct_class = Types::VpnConnectionOptions
 
     VpnConnectionOptionsSpecification.add_member(:enable_acceleration, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableAcceleration"))
     VpnConnectionOptionsSpecification.add_member(:static_routes_only, Shapes::ShapeRef.new(shape: Boolean, location_name: "staticRoutesOnly"))
+    VpnConnectionOptionsSpecification.add_member(:tunnel_inside_ip_version, Shapes::ShapeRef.new(shape: TunnelInsideIpVersion, location_name: "TunnelInsideIpVersion"))
     VpnConnectionOptionsSpecification.add_member(:tunnel_options, Shapes::ShapeRef.new(shape: VpnTunnelOptionsSpecificationsList, location_name: "TunnelOptions"))
     VpnConnectionOptionsSpecification.struct_class = Types::VpnConnectionOptionsSpecification
 
@@ -9996,6 +10062,7 @@ module Aws::EC2
     VpnStaticRouteList.member = Shapes::ShapeRef.new(shape: VpnStaticRoute, location_name: "item")
 
     VpnTunnelOptionsSpecification.add_member(:tunnel_inside_cidr, Shapes::ShapeRef.new(shape: String, location_name: "TunnelInsideCidr"))
+    VpnTunnelOptionsSpecification.add_member(:tunnel_inside_ipv_6_cidr, Shapes::ShapeRef.new(shape: String, location_name: "TunnelInsideIpv6Cidr"))
     VpnTunnelOptionsSpecification.add_member(:pre_shared_key, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKey"))
     VpnTunnelOptionsSpecification.add_member(:phase_1_lifetime_seconds, Shapes::ShapeRef.new(shape: Integer, location_name: "Phase1LifetimeSeconds"))
     VpnTunnelOptionsSpecification.add_member(:phase_2_lifetime_seconds, Shapes::ShapeRef.new(shape: Integer, location_name: "Phase2LifetimeSeconds"))
@@ -10379,6 +10446,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateCapacityReservationResult)
       end)
 
+      api.add_operation(:create_carrier_gateway, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateCarrierGateway"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateCarrierGatewayRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateCarrierGatewayResult)
+      end)
+
       api.add_operation(:create_client_vpn_endpoint, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateClientVpnEndpoint"
         o.http_method = "POST"
@@ -10803,6 +10878,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateVpnGatewayResult)
       end)
 
+      api.add_operation(:delete_carrier_gateway, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteCarrierGateway"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteCarrierGatewayRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteCarrierGatewayResult)
+      end)
+
       api.add_operation(:delete_client_vpn_endpoint, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteClientVpnEndpoint"
         o.http_method = "POST"
@@ -11295,6 +11378,20 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_carrier_gateways, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeCarrierGateways"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeCarrierGatewaysRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeCarrierGatewaysResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_classic_link_instances, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeClassicLinkInstances"
         o.http_method = "POST"

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

@@ -126,7 +126,11 @@ module Aws::EC2
       data[:public_dns_name]
     end
 
-    # The public IPv4 address assigned to the instance, if applicable.
+    # The public IPv4 address, or the Carrier IP address assigned to the
+    # instance, if applicable.
+    #
+    # A Carrier IP address only applies to an instance launched in a subnet
+    # associated with a Wavelength Zone.
     # @return [String]
     def public_ip_address
       data[:public_ip_address]
@@ -1492,8 +1496,8 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
-    #   * `network-border-group` - The location from where the IP address is
-    #     advertised.
+    #   * `network-border-group` - A unique set of Availability Zones, Local
+    #     Zones, or Wavelength Zones from where AWS advertises IP addresses.
     #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
     #     that the address is associated with, if any.
@@ -1503,7 +1507,7 @@ module Aws::EC2
     #   * `private-ip-address` - \[EC2-VPC\] The private IP address associated
     #     with the Elastic IP address.
     #
-    #   * `public-ip` - The Elastic IP address.
+    #   * `public-ip` - The Elastic IP address, or the carrier IP address.
     #
     #   * `tag`\:<key> - The key/value combination of a tag assigned to
     #     the resource. Use the tag key in the filter name and the tag value

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

@@ -34,6 +34,12 @@ module Aws::EC2
       @id
     end
 
+    # The carrier IP address associated with the network interface.
+    # @return [String]
+    def carrier_ip
+      data[:carrier_ip]
+    end
+
     # The ID of the owner of the Elastic IP address.
     # @return [String]
     def ip_owner_id

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

@@ -159,6 +159,7 @@ module Aws::EC2
     #         ],
     #         secondary_private_ip_address_count: 1,
     #         subnet_id: "String",
+    #         associate_carrier_ip_address: false,
     #         interface_type: "String",
     #       },
     #     ],
@@ -1559,8 +1560,8 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
-    #   * `network-border-group` - The location from where the IP address is
-    #     advertised.
+    #   * `network-border-group` - A unique set of Availability Zones, Local
+    #     Zones, or Wavelength Zones from where AWS advertises IP addresses.
     #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
     #     that the address is associated with, if any.
@@ -1570,7 +1571,7 @@ module Aws::EC2
     #   * `private-ip-address` - \[EC2-VPC\] The private IP address associated
     #     with the Elastic IP address.
     #
-    #   * `public-ip` - The Elastic IP address.
+    #   * `public-ip` - The Elastic IP address, or the carrier IP address.
     #
     #   * `tag`\:<key> - The key/value combination of a tag assigned to
     #     the resource. Use the tag key in the filter name and the tag value
@@ -3307,8 +3308,8 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
-    #   * `network-border-group` - The location from where the IP address is
-    #     advertised.
+    #   * `network-border-group` - A unique set of Availability Zones, Local
+    #     Zones, or Wavelength Zones from where AWS advertises IP addresses.
     #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
     #     that the address is associated with, if any.
@@ -3318,7 +3319,7 @@ module Aws::EC2
     #   * `private-ip-address` - \[EC2-VPC\] The private IP address associated
     #     with the Elastic IP address.
     #
-    #   * `public-ip` - The Elastic IP address.
+    #   * `public-ip` - The Elastic IP address, or the carrier IP address.
     #
     #   * `tag`\:<key> - The key/value combination of a tag assigned to
     #     the resource. Use the tag key in the filter name and the tag value

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

@@ -96,6 +96,12 @@ module Aws::EC2
       data[:local_gateway_id]
     end
 
+    # The ID of the carrier gateway.
+    # @return [String]
+    def carrier_gateway_id
+      data[:carrier_gateway_id]
+    end
+
     # The ID of the network interface.
     # @return [String]
     def network_interface_id
@@ -301,6 +307,7 @@ module Aws::EC2
     #     nat_gateway_id: "NatGatewayId",
     #     transit_gateway_id: "TransitGatewayId",
     #     local_gateway_id: "LocalGatewayId",
+    #     carrier_gateway_id: "CarrierGatewayId",
     #     network_interface_id: "NetworkInterfaceId",
     #     vpc_peering_connection_id: "VpcPeeringConnectionId",
     #   })
@@ -331,6 +338,8 @@ module Aws::EC2
     #   The ID of a transit gateway.
     # @option options [String] :local_gateway_id
     #   The ID of the local gateway.
+    # @option options [String] :carrier_gateway_id
+    #   \[IPv4 traffic only\] The ID of a carrier gateway.
     # @option options [String] :network_interface_id
     #   The ID of a network interface.
     # @option options [String] :vpc_peering_connection_id

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

@@ -233,6 +233,7 @@ module Aws::EC2
     #     nat_gateway_id: "NatGatewayId",
     #     transit_gateway_id: "TransitGatewayId",
     #     local_gateway_id: "LocalGatewayId",
+    #     carrier_gateway_id: "CarrierGatewayId",
     #     network_interface_id: "NetworkInterfaceId",
     #     vpc_peering_connection_id: "VpcPeeringConnectionId",
     #   })
@@ -267,6 +268,11 @@ module Aws::EC2
     #   The ID of a transit gateway.
     # @option options [String] :local_gateway_id
     #   The ID of the local gateway.
+    # @option options [String] :carrier_gateway_id
+    #   The ID of the carrier gateway.
+    #
+    #   You can only use this option when the VPC contains a subnet which is
+    #   associated with a Wavelength Zone.
     # @option options [String] :network_interface_id
     #   The ID of a network interface.
     # @option options [String] :vpc_peering_connection_id

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

@@ -353,6 +353,7 @@ module Aws::EC2
     #         ],
     #         secondary_private_ip_address_count: 1,
     #         subnet_id: "String",
+    #         associate_carrier_ip_address: false,
     #         interface_type: "String",
     #       },
     #     ],

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

@@ -329,7 +329,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes an Elastic IP address.
+    # Describes an Elastic IP address, or a carrier IP address.
     #
     # @!attribute [rw] instance_id
     #   The ID of the instance that the address is associated with (if any).
@@ -375,7 +375,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] network_border_group
-    #   The name of the location from which the IP address is advertised.
+    #   The name of the unique set of Availability Zones, Local Zones, or
+    #   Wavelength Zones from which AWS advertises IP addresses.
     #   @return [String]
     #
     # @!attribute [rw] customer_owned_ip
@@ -386,6 +387,12 @@ module Aws::EC2
     #   The ID of the customer-owned address pool.
     #   @return [String]
     #
+    # @!attribute [rw] carrier_ip
+    #   The carrier IP address associated. This option is only available for
+    #   network interfaces which reside in a subnet in a Wavelength Zone
+    #   (for example an EC2 instance).
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Address AWS API Documentation
     #
     class Address < Struct.new(
@@ -401,7 +408,8 @@ module Aws::EC2
       :public_ipv_4_pool,
       :network_border_group,
       :customer_owned_ip,
-      :customer_owned_ipv_4_pool)
+      :customer_owned_ipv_4_pool,
+      :carrier_ip)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -481,13 +489,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] network_border_group
-    #   The location from which the IP address is advertised. Use this
-    #   parameter to limit the address to this location.
-    #
-    #   A network border group is a unique set of Availability Zones or
-    #   Local Zones from where AWS advertises IP addresses and limits the
-    #   addresses to the group. IP addresses cannot move between network
-    #   border groups.
+    #   A unique set of Availability Zones, Local Zones, or Wavelength Zones
+    #   from which AWS advertises IP addresses. Use this parameter to limit
+    #   the IP address to this location. IP addresses cannot move between
+    #   network border groups.
     #
     #   Use [DescribeAvailabilityZones][1] to view the network border
     #   groups.
@@ -545,7 +550,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] network_border_group
-    #   The location from which the IP address is advertised.
+    #   The set of Availability Zones, Local Zones, or Wavelength Zones from
+    #   which AWS advertises IP addresses.
     #   @return [String]
     #
     # @!attribute [rw] domain
@@ -561,6 +567,12 @@ module Aws::EC2
     #   The ID of the customer-owned address pool.
     #   @return [String]
     #
+    # @!attribute [rw] carrier_ip
+    #   The carrier IP address. This option is only available for network
+    #   interfaces which reside in a subnet in a Wavelength Zone (for
+    #   example an EC2 instance).
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AllocateAddressResult AWS API Documentation
     #
     class AllocateAddressResult < Struct.new(
@@ -570,7 +582,8 @@ module Aws::EC2
       :network_border_group,
       :domain,
       :customer_owned_ip,
-      :customer_owned_ipv_4_pool)
+      :customer_owned_ipv_4_pool,
+      :carrier_ip)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1365,7 +1378,7 @@ module Aws::EC2
     #
     # @!attribute [rw] ipv_6_cidr_block_network_border_group
     #   The name of the location from which we advertise the IPV6 CIDR
-    #   block. Use this parameter to limit the CiDR block to this location.
+    #   block. Use this parameter to limit the CIDR block to this location.
     #
     #   You must set `AmazonProvidedIpv6CidrBlock` to `true` to use this
     #   parameter.
@@ -2133,22 +2146,23 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes a Zone.
+    # Describes Availability Zones, Local Zones, and Wavelength Zones.
     #
     # @!attribute [rw] state
-    #   The state of the Zone.
+    #   The state of the Availability Zone, Local Zone, or Wavelength Zone.
     #   @return [String]
     #
     # @!attribute [rw] opt_in_status
     #   For Availability Zones, this parameter always has the value of
     #   `opt-in-not-required`.
     #
-    #   For Local Zones, this parameter is the opt in status. The possible
-    #   values are `opted-in`, and `not-opted-in`.
+    #   For Local Zones and Wavelength Zones, this parameter is the opt-in
+    #   status. The possible values are `opted-in`, and `not-opted-in`.
     #   @return [String]
     #
     # @!attribute [rw] messages
-    #   Any messages about the Zone.
+    #   Any messages about the Availability Zone, Local Zone, or Wavelength
+    #   Zone.
     #   @return [Array<Types::AvailabilityZoneMessage>]
     #
     # @!attribute [rw] region_name
@@ -2156,11 +2170,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] zone_name
-    #   The name of the Zone.
+    #   The name of the Availability Zone, Local Zone, or Wavelength Zone.
     #   @return [String]
     #
     # @!attribute [rw] zone_id
-    #   The ID of the Zone.
+    #   The ID of the Availability Zone, Local Zone, or Wavelength Zone.
     #   @return [String]
     #
     # @!attribute [rw] group_name
@@ -2169,25 +2183,28 @@ module Aws::EC2
     #
     #   For Local Zones, the name of the associated group, for example
     #   `us-west-2-lax-1`.
+    #
+    #   For Wavelength Zones, the name of the associated group, for example
+    #   `us-east-1-wl1-bos-wlz-1`.
     #   @return [String]
     #
     # @!attribute [rw] network_border_group
-    #   The name of the location from which the address is advertised.
+    #   The name of the network border group.
     #   @return [String]
     #
     # @!attribute [rw] zone_type
-    #   The type of zone. The valid values are `availability-zone` and
-    #   `local-zone`.
+    #   The type of zone. The valid values are `availability-zone`,
+    #   `local-zone`, and `wavelength-zone`.
     #   @return [String]
     #
     # @!attribute [rw] parent_zone_name
-    #   The name of the zone that handles some of the Local Zone control
-    #   plane operations, such as API calls.
+    #   The name of the zone that handles some of the Local Zone or
+    #   Wavelength Zone control plane operations, such as API calls.
     #   @return [String]
     #
     # @!attribute [rw] parent_zone_id
-    #   The ID of the zone that handles some of the Local Zone control plane
-    #   operations, such as API calls.
+    #   The ID of the zone that handles some of the Local Zone or Wavelength
+    #   Zone control plane operations, such as API calls.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AvailabilityZone AWS API Documentation
@@ -2208,10 +2225,12 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes a message about a Zone.
+    # Describes a message about an Availability Zone, Local Zone, or
+    # Wavelength Zone.
     #
     # @!attribute [rw] message
-    #   The message about the Zone.
+    #   The message about the Availability Zone, Local Zone, or Wavelength
+    #   Zone.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AvailabilityZoneMessage AWS API Documentation
@@ -3313,6 +3332,40 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes a carrier gateway.
+    #
+    # @!attribute [rw] carrier_gateway_id
+    #   The ID of the carrier gateway.
+    #   @return [String]
+    #
+    # @!attribute [rw] vpc_id
+    #   The ID of the VPC associated with the carrier gateway.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The state of the carrier gateway.
+    #   @return [String]
+    #
+    # @!attribute [rw] owner_id
+    #   The AWS account ID of the owner of the carrier gateway.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   The tags assigned to the carrier gateway.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CarrierGateway AWS API Documentation
+    #
+    class CarrierGateway < Struct.new(
+      :carrier_gateway_id,
+      :vpc_id,
+      :state,
+      :owner_id,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Information about the client certificate used for authentication.
     #
     # @!attribute [rw] client_root_certificate_chain
@@ -4658,7 +4711,7 @@ module Aws::EC2
     #       {
     #         client_token: "String",
     #         instance_type: "String", # required
-    #         instance_platform: "Linux/UNIX", # required, accepts Linux/UNIX, Red Hat Enterprise Linux, SUSE Linux, Windows, Windows with SQL Server, Windows with SQL Server Enterprise, Windows with SQL Server Standard, Windows with SQL Server Web, Linux with SQL Server Standard, Linux with SQL Server Web, Linux with SQL Server Enterprise, Windows BYOL
+    #         instance_platform: "Linux/UNIX", # required, accepts Linux/UNIX, Red Hat Enterprise Linux, SUSE Linux, Windows, Windows with SQL Server, Windows with SQL Server Enterprise, Windows with SQL Server Standard, Windows with SQL Server Web, Linux with SQL Server Standard, Linux with SQL Server Web, Linux with SQL Server Enterprise
     #         availability_zone: "String",
     #         availability_zone_id: "String",
     #         tenancy: "default", # accepts default, dedicated
@@ -4836,6 +4889,77 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateCarrierGatewayRequest
+    #   data as a hash:
+    #
+    #       {
+    #         vpc_id: "VpcId", # required
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, 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
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
+    #         dry_run: false,
+    #         client_token: "String",
+    #       }
+    #
+    # @!attribute [rw] vpc_id
+    #   The ID of the VPC to associate with the carrier gateway.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_specifications
+    #   The tags to associate with the carrier gateway.
+    #   @return [Array<Types::TagSpecification>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] client_token
+    #   Unique, case-sensitive identifier that you provide to ensure the
+    #   idempotency of the request. For more information, see [How to Ensure
+    #   Idempotency][1].
+    #
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateCarrierGatewayRequest AWS API Documentation
+    #
+    class CreateCarrierGatewayRequest < Struct.new(
+      :vpc_id,
+      :tag_specifications,
+      :dry_run,
+      :client_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] carrier_gateway
+    #   Information about the carrier gateway.
+    #   @return [Types::CarrierGateway]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateCarrierGatewayResult AWS API Documentation
+    #
+    class CreateCarrierGatewayResult < Struct.new(
+      :carrier_gateway)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateClientVpnEndpointRequest
     #   data as a hash:
     #
@@ -6304,6 +6428,7 @@ module Aws::EC2
     #           ],
     #           network_interfaces: [
     #             {
+    #               associate_carrier_ip_address: false,
     #               associate_public_ip_address: false,
     #               delete_on_termination: false,
     #               description: "String",
@@ -6525,6 +6650,7 @@ module Aws::EC2
     #           ],
     #           network_interfaces: [
     #             {
+    #               associate_carrier_ip_address: false,
     #               associate_public_ip_address: false,
     #               delete_on_termination: false,
     #               description: "String",
@@ -7538,6 +7664,7 @@ module Aws::EC2
     #         nat_gateway_id: "NatGatewayId",
     #         transit_gateway_id: "TransitGatewayId",
     #         local_gateway_id: "LocalGatewayId",
+    #         carrier_gateway_id: "CarrierGatewayId",
     #         network_interface_id: "NetworkInterfaceId",
     #         route_table_id: "RouteTableId", # required
     #         vpc_peering_connection_id: "VpcPeeringConnectionId",
@@ -7593,6 +7720,13 @@ module Aws::EC2
     #   The ID of the local gateway.
     #   @return [String]
     #
+    # @!attribute [rw] carrier_gateway_id
+    #   The ID of the carrier gateway.
+    #
+    #   You can only use this option when the VPC contains a subnet which is
+    #   associated with a Wavelength Zone.
+    #   @return [String]
+    #
     # @!attribute [rw] network_interface_id
     #   The ID of a network interface.
     #   @return [String]
@@ -7618,6 +7752,7 @@ module Aws::EC2
       :nat_gateway_id,
       :transit_gateway_id,
       :local_gateway_id,
+      :carrier_gateway_id,
       :network_interface_id,
       :route_table_id,
       :vpc_peering_connection_id)
@@ -9719,9 +9854,11 @@ module Aws::EC2
     #         options: {
     #           enable_acceleration: false,
     #           static_routes_only: false,
+    #           tunnel_inside_ip_version: "ipv4", # accepts ipv4, ipv6
     #           tunnel_options: [
     #             {
     #               tunnel_inside_cidr: "String",
+    #               tunnel_inside_ipv_6_cidr: "String",
     #               pre_shared_key: "String",
     #               phase_1_lifetime_seconds: 1,
     #               phase_2_lifetime_seconds: 1,
@@ -10037,6 +10174,46 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DeleteCarrierGatewayRequest
+    #   data as a hash:
+    #
+    #       {
+    #         carrier_gateway_id: "CarrierGatewayId", # required
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] carrier_gateway_id
+    #   The ID of the carrier gateway.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteCarrierGatewayRequest AWS API Documentation
+    #
+    class DeleteCarrierGatewayRequest < Struct.new(
+      :carrier_gateway_id,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] carrier_gateway
+    #   Information about the carrier gateway.
+    #   @return [Types::CarrierGateway]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteCarrierGatewayResult AWS API Documentation
+    #
+    class DeleteCarrierGatewayResult < Struct.new(
+      :carrier_gateway)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DeleteClientVpnEndpointRequest
     #   data as a hash:
     #
@@ -12339,8 +12516,8 @@ module Aws::EC2
     #   * `instance-id` - The ID of the instance the address is associated
     #     with, if any.
     #
-    #   * `network-border-group` - The location from where the IP address is
-    #     advertised.
+    #   * `network-border-group` - A unique set of Availability Zones, Local
+    #     Zones, or Wavelength Zones from where AWS advertises IP addresses.
     #
     #   * `network-interface-id` - \[EC2-VPC\] The ID of the network
     #     interface that the address is associated with, if any.
@@ -12350,7 +12527,7 @@ module Aws::EC2
     #   * `private-ip-address` - \[EC2-VPC\] The private IP address
     #     associated with the Elastic IP address.
     #
-    #   * `public-ip` - The Elastic IP address.
+    #   * `public-ip` - The Elastic IP address, or the carrier IP address.
     #
     #   * `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
@@ -12465,45 +12642,56 @@ module Aws::EC2
     #
     #   * `group-name` - For Availability Zones, use the Region name. For
     #     Local Zones, use the name of the group associated with the Local
-    #     Zone (for example, `us-west-2-lax-1`).
+    #     Zone (for example, `us-west-2-lax-1`) For Wavelength Zones, use
+    #     the name of the group associated with the Wavelength Zone (for
+    #     example, `us-east-1-wl1-bos-wlz-1`).
     #
     #   * `message` - The Zone message.
     #
-    #   * `opt-in-status` - The opt in status (`opted-in`, and
+    #   * `opt-in-status` - The opt-in status (`opted-in`, and
     #     `not-opted-in` \| `opt-in-not-required`).
     #
-    #   * The ID of the zone that handles some of the Local Zone control
-    #     plane operations, such as API calls.
+    #   * `parent-zoneID` - The ID of the zone that handles some of the
+    #     Local Zone and Wavelength Zone control plane operations, such as
+    #     API calls.
+    #
+    #   * `parent-zoneName` - The ID of the zone that handles some of the
+    #     Local Zone and Wavelength Zone control plane operations, such as
+    #     API calls.
     #
     #   * `region-name` - The name of the Region for the Zone (for example,
     #     `us-east-1`).
     #
-    #   * `state` - The state of the Availability Zone or Local Zone
-    #     (`available` \| `information` \| `impaired` \| `unavailable`).
+    #   * `state` - The state of the Availability Zone, the Local Zone, or
+    #     the Wavelength Zone (`available` \| `information` \| `impaired` \|
+    #     `unavailable`).
     #
     #   * `zone-id` - The ID of the Availability Zone (for example,
-    #     `use1-az1`) or the Local Zone (for example, use `usw2-lax1-az1`).
+    #     `use1-az1`), the Local Zone (for example, `usw2-lax1-az1`), or the
+    #     Wavelength Zone (for example, `us-east-1-wl1-bos-wlz-1`).
     #
     #   * `zone-type` - The type of zone, for example, `local-zone`.
     #
     #   * `zone-name` - The name of the Availability Zone (for example,
-    #     `us-east-1a`) or the Local Zone (for example, use
-    #     `us-west-2-lax-1a`).
+    #     `us-east-1a`), the Local Zone (for example, `us-west-2-lax-1a`),
+    #     or the Wavelength Zone (for example, `us-east-1-wl1-bos-wlz-1`).
     #
     #   * `zone-type` - The type of zone, for example, `local-zone`.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] zone_names
-    #   The names of the Zones.
+    #   The names of the Availability Zones, Local Zones, and Wavelength
+    #   Zones.
     #   @return [Array<String>]
     #
     # @!attribute [rw] zone_ids
-    #   The IDs of the Zones.
+    #   The IDs of the Availability Zones, Local Zones, and Wavelength
+    #   Zones.
     #   @return [Array<String>]
     #
     # @!attribute [rw] all_availability_zones
-    #   Include all Availability Zones and Local Zones regardless of your
-    #   opt in status.
+    #   Include all Availability Zones, Local Zones, and Wavelength Zones
+    #   regardless of your opt-in status.
     #
     #   If you do not use this parameter, the results include only the zones
     #   for the Regions where you have chosen the option to opt in.
@@ -12529,7 +12717,8 @@ module Aws::EC2
     end
 
     # @!attribute [rw] availability_zones
-    #   Information about the Zones.
+    #   Information about the Availability Zones, Local Zones, and
+    #   Wavelength Zones.
     #   @return [Array<Types::AvailabilityZone>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeAvailabilityZonesResult AWS API Documentation
@@ -12823,6 +13012,97 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeCarrierGatewaysRequest
+    #   data as a hash:
+    #
+    #       {
+    #         carrier_gateway_ids: ["CarrierGatewayId"],
+    #         filters: [
+    #           {
+    #             name: "String",
+    #             values: ["String"],
+    #           },
+    #         ],
+    #         max_results: 1,
+    #         next_token: "String",
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] carrier_gateway_ids
+    #   One or more carrier gateway IDs.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] filters
+    #   One or more filters.
+    #
+    #   * `carrier-gateway-id` - The ID of the carrier gateway.
+    #
+    #   * `state` - The state of the carrier gateway (`pending` \| `failed`
+    #     \| `available` \| `deleting` \| `deleted`).
+    #
+    #   * `owner-id` - The AWS account ID of the owner of the carrier
+    #     gateway.
+    #
+    #   * `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 assigned a tag with a specific key,
+    #     regardless of the tag value.
+    #
+    #   * `vpc-id` - The ID of the VPC associated with the carrier gateway.
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return with a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `nextToken` value.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCarrierGatewaysRequest AWS API Documentation
+    #
+    class DescribeCarrierGatewaysRequest < Struct.new(
+      :carrier_gateway_ids,
+      :filters,
+      :max_results,
+      :next_token,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] carrier_gateways
+    #   Information about the carrier gateway.
+    #   @return [Array<Types::CarrierGateway>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCarrierGatewaysResult AWS API Documentation
+    #
+    class DescribeCarrierGatewaysResult < Struct.new(
+      :carrier_gateways,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeClassicLinkInstancesRequest
     #   data as a hash:
     #
@@ -24023,7 +24303,7 @@ module Aws::EC2
     #   Cloud User Guide*.
     #
     #   Constraints: Range is 100-16,000 IOPS for `gp2` volumes and 100 to
-    #   64,000IOPS for `io1` volumes in most Regions. Maximum `io1` IOPS of
+    #   64,000 IOPS for `io1` volumes in most Regions. Maximum `io1` IOPS of
     #   64,000 is guaranteed only on [Nitro-based instances][2]. Other
     #   instance families guarantee performance up to 32,000 IOPS. For more
     #   information, see [Amazon EBS Volume Types][1] in the *Amazon Elastic
@@ -29768,7 +30048,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] public_ip_address
-    #   The public IPv4 address assigned to the instance, if applicable.
+    #   The public IPv4 address, or the Carrier IP address assigned to the
+    #   instance, if applicable.
+    #
+    #   A Carrier IP address only applies to an instance launched in a
+    #   subnet associated with a Wavelength Zone.
     #   @return [String]
     #
     # @!attribute [rw] ramdisk_id
@@ -30577,6 +30861,10 @@ module Aws::EC2
 
     # Describes association information for an Elastic IP address (IPv4).
     #
+    # @!attribute [rw] carrier_ip
+    #   The carrier IP address associated with the network interface.
+    #   @return [String]
+    #
     # @!attribute [rw] ip_owner_id
     #   The ID of the owner of the Elastic IP address.
     #   @return [String]
@@ -30593,6 +30881,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceNetworkInterfaceAssociation AWS API Documentation
     #
     class InstanceNetworkInterfaceAssociation < Struct.new(
+      :carrier_ip,
       :ip_owner_id,
       :public_dns_name,
       :public_ip)
@@ -30663,6 +30952,7 @@ module Aws::EC2
     #         ],
     #         secondary_private_ip_address_count: 1,
     #         subnet_id: "String",
+    #         associate_carrier_ip_address: false,
     #         interface_type: "String",
     #       }
     #
@@ -30760,6 +31050,16 @@ module Aws::EC2
     #   only if creating a network interface when launching an instance.
     #   @return [String]
     #
+    # @!attribute [rw] associate_carrier_ip_address
+    #   Indicates whether to assign a carrier IP address to the network
+    #   interface.
+    #
+    #   You can only assign a carrier IP address to a network interface that
+    #   is in a subnet in a Wavelength Zone. For more information about
+    #   carrier IP addresses, see Carrier IP addresses in the AWS Wavelength
+    #   Developer Guide.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] interface_type
     #   The type of network interface. To create an Elastic Fabric Adapter
     #   (EFA), specify `efa`. For more information, see [Elastic Fabric
@@ -30790,6 +31090,7 @@ module Aws::EC2
       :private_ip_addresses,
       :secondary_private_ip_address_count,
       :subnet_id,
+      :associate_carrier_ip_address,
       :interface_type)
       SENSITIVE = []
       include Aws::Structure
@@ -32577,6 +32878,20 @@ module Aws::EC2
 
     # Describes a network interface.
     #
+    # @!attribute [rw] associate_carrier_ip_address
+    #   Indicates whether to associate a Carrier IP address with eth0 for a
+    #   new network interface.
+    #
+    #   Use this option when you launch an instance in a Wavelength Zone and
+    #   want to associate a Carrier IP address with the network interface.
+    #   For more information about Carrier IP addresses, see [Carrier IP
+    #   addresses][1] in the *AWS Wavelength Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/wavelength/latest/developerguide/how-wavelengths-work.html#provider-owned-ip
+    #   @return [Boolean]
+    #
     # @!attribute [rw] associate_public_ip_address
     #   Indicates whether to associate a public IPv4 address with eth0 for a
     #   new network interface.
@@ -32635,6 +32950,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateInstanceNetworkInterfaceSpecification AWS API Documentation
     #
     class LaunchTemplateInstanceNetworkInterfaceSpecification < Struct.new(
+      :associate_carrier_ip_address,
       :associate_public_ip_address,
       :delete_on_termination,
       :description,
@@ -32658,6 +32974,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
+    #         associate_carrier_ip_address: false,
     #         associate_public_ip_address: false,
     #         delete_on_termination: false,
     #         description: "String",
@@ -32682,6 +32999,20 @@ module Aws::EC2
     #         subnet_id: "SubnetId",
     #       }
     #
+    # @!attribute [rw] associate_carrier_ip_address
+    #   Associates a Carrier IP address with eth0 for a new network
+    #   interface.
+    #
+    #   Use this option when you launch an instance in a Wavelength Zone and
+    #   want to associate a Carrier IP address with the network interface.
+    #   For more information about Carrier IP addresses, see [Carrier IP
+    #   addresses][1] in the *AWS Wavelength Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/wavelength/latest/developerguide/how-wavelengths-work.html#provider-owned-ip
+    #   @return [Boolean]
+    #
     # @!attribute [rw] associate_public_ip_address
     #   Associates a public IPv4 address with eth0 for a new network
     #   interface.
@@ -32756,6 +33087,7 @@ module Aws::EC2
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest AWS API Documentation
     #
     class LaunchTemplateInstanceNetworkInterfaceSpecificationRequest < Struct.new(
+      :associate_carrier_ip_address,
       :associate_public_ip_address,
       :delete_on_termination,
       :description,
@@ -33761,13 +34093,15 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] group_name
-    #   The name of the Availability Zone Group.
+    #   The name of the Availability Zone group, Local Zone group, or
+    #   Wavelength Zone group.
     #   @return [String]
     #
     # @!attribute [rw] opt_in_status
-    #   Indicates whether to enable or disable membership. The valid values
-    #   are `opted-in`. You must contact [AWS Support][1] to disable an
-    #   Availability Zone group.
+    #   Indicates whether you are opted in to the Local Zone group or
+    #   Wavelength Zone group. The only valid value is `opted-in`. You must
+    #   contact [AWS Support][1] to opt out of a Local Zone group, or
+    #   Wavelength Zone group.
     #
     #
     #
@@ -36576,6 +36910,7 @@ module Aws::EC2
     #         vpn_tunnel_outside_ip_address: "String", # required
     #         tunnel_options: { # required
     #           tunnel_inside_cidr: "String",
+    #           tunnel_inside_ipv_6_cidr: "String",
     #           pre_shared_key: "String",
     #           phase_1_lifetime_seconds: 1,
     #           phase_2_lifetime_seconds: 1,
@@ -36671,6 +37006,7 @@ module Aws::EC2
     #
     #       {
     #         tunnel_inside_cidr: "String",
+    #         tunnel_inside_ipv_6_cidr: "String",
     #         pre_shared_key: "String",
     #         phase_1_lifetime_seconds: 1,
     #         phase_2_lifetime_seconds: 1,
@@ -36716,9 +37052,9 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] tunnel_inside_cidr
-    #   The range of inside IP addresses for the tunnel. Any specified CIDR
-    #   blocks must be unique across all VPN connections that use the same
-    #   virtual private gateway.
+    #   The range of inside IPv4 addresses for the tunnel. Any specified
+    #   CIDR blocks must be unique across all VPN connections that use the
+    #   same virtual private gateway.
     #
     #   Constraints: A size /30 CIDR block from the `169.254.0.0/16` range.
     #   The following CIDR blocks are reserved and cannot be used:
@@ -36738,6 +37074,14 @@ module Aws::EC2
     #   * `169.254.169.252/30`
     #   @return [String]
     #
+    # @!attribute [rw] tunnel_inside_ipv_6_cidr
+    #   The range of inside IPv6 addresses for the tunnel. Any specified
+    #   CIDR blocks must be unique across all VPN connections that use the
+    #   same transit gateway.
+    #
+    #   Constraints: A size /126 CIDR block from the local `fd00::/8` range.
+    #   @return [String]
+    #
     # @!attribute [rw] pre_shared_key
     #   The pre-shared key (PSK) to establish initial authentication between
     #   the virtual private gateway and the customer gateway.
@@ -36805,36 +37149,38 @@ module Aws::EC2
     #   One or more encryption algorithms that are permitted for the VPN
     #   tunnel for phase 1 IKE negotiations.
     #
-    #   Valid values: `AES128` \| `AES256`
+    #   Valid values: `AES128` \| `AES256` \| `AES128-GCM-16` \|
+    #   `AES256-GCM-16`
     #   @return [Array<Types::Phase1EncryptionAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_2_encryption_algorithms
     #   One or more encryption algorithms that are permitted for the VPN
     #   tunnel for phase 2 IKE negotiations.
     #
-    #   Valid values: `AES128` \| `AES256`
+    #   Valid values: `AES128` \| `AES256` \| `AES128-GCM-16` \|
+    #   `AES256-GCM-16`
     #   @return [Array<Types::Phase2EncryptionAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_1_integrity_algorithms
     #   One or more integrity algorithms that are permitted for the VPN
     #   tunnel for phase 1 IKE negotiations.
     #
-    #   Valid values: `SHA1` \| `SHA2-256`
+    #   Valid values: `SHA1` \| `SHA2-256` \| `SHA2-384` \| `SHA2-512`
     #   @return [Array<Types::Phase1IntegrityAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_2_integrity_algorithms
     #   One or more integrity algorithms that are permitted for the VPN
     #   tunnel for phase 2 IKE negotiations.
     #
-    #   Valid values: `SHA1` \| `SHA2-256`
+    #   Valid values: `SHA1` \| `SHA2-256` \| `SHA2-384` \| `SHA2-512`
     #   @return [Array<Types::Phase2IntegrityAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_1_dh_group_numbers
     #   One or more Diffie-Hellman group numbers that are permitted for the
     #   VPN tunnel for phase 1 IKE negotiations.
     #
-    #   Valid values: `2` \| `14` \| `15` \| `16` \| `17` \| `18` \| `22` \|
-    #   `23` \| `24`
+    #   Valid values: `2` \| `14` \| `15` \| `16` \| `17` \| `18` \| `19` \|
+    #   `20` \| `21` \| `22` \| `23` \| `24`
     #   @return [Array<Types::Phase1DHGroupNumbersRequestListValue>]
     #
     # @!attribute [rw] phase_2_dh_group_numbers
@@ -36842,7 +37188,7 @@ module Aws::EC2
     #   VPN tunnel for phase 2 IKE negotiations.
     #
     #   Valid values: `2` \| `5` \| `14` \| `15` \| `16` \| `17` \| `18` \|
-    #   `22` \| `23` \| `24`
+    #   `19` \| `20` \| `21` \| `22` \| `23` \| `24`
     #   @return [Array<Types::Phase2DHGroupNumbersRequestListValue>]
     #
     # @!attribute [rw] ike_versions
@@ -36855,6 +37201,7 @@ module Aws::EC2
     #
     class ModifyVpnTunnelOptionsSpecification < Struct.new(
       :tunnel_inside_cidr,
+      :tunnel_inside_ipv_6_cidr,
       :pre_shared_key,
       :phase_1_lifetime_seconds,
       :phase_2_lifetime_seconds,
@@ -37416,7 +37763,8 @@ module Aws::EC2
     end
 
     # Describes association information for an Elastic IP address (IPv4
-    # only).
+    # only), or a Carrier IP address (for a network interface which resides
+    # in a subnet in a Wavelength Zone).
     #
     # @!attribute [rw] allocation_id
     #   The allocation ID.
@@ -37435,8 +37783,19 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] public_ip
-    #   The address of the Elastic IP address bound to the network
-    #   interface.
+    #   The address of the Elastic IP address or Carrier IP address bound to
+    #   the network interface.
+    #   @return [String]
+    #
+    # @!attribute [rw] customer_owned_ip
+    #   The customer-owned IP address associated with the network interface.
+    #   @return [String]
+    #
+    # @!attribute [rw] carrier_ip
+    #   The carrier IP address associated with the network interface.
+    #
+    #   This option is only available when the network interface is in a
+    #   subnet which is associated with a Wavelength Zone.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/NetworkInterfaceAssociation AWS API Documentation
@@ -37446,7 +37805,9 @@ module Aws::EC2
       :association_id,
       :ip_owner_id,
       :public_dns_name,
-      :public_ip)
+      :public_ip,
+      :customer_owned_ip,
+      :carrier_ip)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -39836,7 +40197,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] network_border_group
-    #   The location that the IP address is released from.
+    #   The set of Availability Zones, Local Zones, or Wavelength Zones from
+    #   which AWS advertises IP addresses.
     #
     #   If you provide an incorrect network border group, you will receive
     #   an `InvalidAddress.NotFound` error. For more information, see [Error
@@ -40129,6 +40491,7 @@ module Aws::EC2
     #         nat_gateway_id: "NatGatewayId",
     #         transit_gateway_id: "TransitGatewayId",
     #         local_gateway_id: "LocalGatewayId",
+    #         carrier_gateway_id: "CarrierGatewayId",
     #         network_interface_id: "NetworkInterfaceId",
     #         route_table_id: "RouteTableId", # required
     #         vpc_peering_connection_id: "VpcPeeringConnectionId",
@@ -40186,6 +40549,10 @@ module Aws::EC2
     #   The ID of the local gateway.
     #   @return [String]
     #
+    # @!attribute [rw] carrier_gateway_id
+    #   \[IPv4 traffic only\] The ID of a carrier gateway.
+    #   @return [String]
+    #
     # @!attribute [rw] network_interface_id
     #   The ID of a network interface.
     #   @return [String]
@@ -40212,6 +40579,7 @@ module Aws::EC2
       :nat_gateway_id,
       :transit_gateway_id,
       :local_gateway_id,
+      :carrier_gateway_id,
       :network_interface_id,
       :route_table_id,
       :vpc_peering_connection_id)
@@ -40442,6 +40810,7 @@ module Aws::EC2
     #         ],
     #         network_interfaces: [
     #           {
+    #             associate_carrier_ip_address: false,
     #             associate_public_ip_address: false,
     #             delete_on_termination: false,
     #             description: "String",
@@ -40861,6 +41230,7 @@ module Aws::EC2
     #                   ],
     #                   secondary_private_ip_address_count: 1,
     #                   subnet_id: "String",
+    #                   associate_carrier_ip_address: false,
     #                   interface_type: "String",
     #                 },
     #               ],
@@ -41049,6 +41419,7 @@ module Aws::EC2
     #               ],
     #               secondary_private_ip_address_count: 1,
     #               subnet_id: "String",
+    #               associate_carrier_ip_address: false,
     #               interface_type: "String",
     #             },
     #           ],
@@ -41296,6 +41667,7 @@ module Aws::EC2
     #             ],
     #             secondary_private_ip_address_count: 1,
     #             subnet_id: "String",
+    #             associate_carrier_ip_address: false,
     #             interface_type: "String",
     #           },
     #         ],
@@ -42790,6 +43162,10 @@ module Aws::EC2
     #   The ID of the local gateway.
     #   @return [String]
     #
+    # @!attribute [rw] carrier_gateway_id
+    #   The ID of the carrier gateway.
+    #   @return [String]
+    #
     # @!attribute [rw] network_interface_id
     #   The ID of the network interface.
     #   @return [String]
@@ -42830,6 +43206,7 @@ module Aws::EC2
       :nat_gateway_id,
       :transit_gateway_id,
       :local_gateway_id,
+      :carrier_gateway_id,
       :network_interface_id,
       :origin,
       :state,
@@ -43049,6 +43426,7 @@ module Aws::EC2
     #             ],
     #             secondary_private_ip_address_count: 1,
     #             subnet_id: "String",
+    #             associate_carrier_ip_address: false,
     #             interface_type: "String",
     #           },
     #         ],
@@ -45524,6 +45902,7 @@ module Aws::EC2
     #             ],
     #             secondary_private_ip_address_count: 1,
     #             subnet_id: "String",
+    #             associate_carrier_ip_address: false,
     #             interface_type: "String",
     #           },
     #         ],
@@ -45818,6 +46197,7 @@ module Aws::EC2
     #                 ],
     #                 secondary_private_ip_address_count: 1,
     #                 subnet_id: "String",
+    #                 associate_carrier_ip_address: false,
     #                 interface_type: "String",
     #               },
     #             ],
@@ -48847,7 +49227,11 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tunnel_inside_cidr
-    #   The range of inside IP addresses for the tunnel.
+    #   The range of inside IPv4 addresses for the tunnel.
+    #   @return [String]
+    #
+    # @!attribute [rw] tunnel_inside_ipv_6_cidr
+    #   The range of inside IPv6 addresses for the tunnel.
     #   @return [String]
     #
     # @!attribute [rw] pre_shared_key
@@ -48922,6 +49306,7 @@ module Aws::EC2
     class TunnelOption < Struct.new(
       :outside_ip_address,
       :tunnel_inside_cidr,
+      :tunnel_inside_ipv_6_cidr,
       :pre_shared_key,
       :phase_1_lifetime_seconds,
       :phase_2_lifetime_seconds,
@@ -50005,8 +50390,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] dhcp_options_id
-    #   The ID of the set of DHCP options you've associated with the VPC
-    #   (or `default` if the default options are associated with the VPC).
+    #   The ID of the set of DHCP options you've associated with the VPC.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -50303,8 +50687,9 @@ module Aws::EC2
     #   @return [Types::VpcCidrBlockState]
     #
     # @!attribute [rw] network_border_group
-    #   The name of the location from which we advertise the IPV6 CIDR
-    #   block.
+    #   The name of the unique set of Availability Zones, Local Zones, or
+    #   Wavelength Zones from which AWS advertises IP addresses, for
+    #   example, `us-east-1-wl1-bos-wlz-1`.
     #   @return [String]
     #
     # @!attribute [rw] ipv_6_pool
@@ -50544,6 +50929,10 @@ module Aws::EC2
     #   routes must be used for devices that don't support BGP.
     #   @return [Boolean]
     #
+    # @!attribute [rw] tunnel_inside_ip_version
+    #   Indicates whether the VPN tunnels process IPv4 or IPv6 traffic.
+    #   @return [String]
+    #
     # @!attribute [rw] tunnel_options
     #   Indicates the VPN tunnel options.
     #   @return [Array<Types::TunnelOption>]
@@ -50553,6 +50942,7 @@ module Aws::EC2
     class VpnConnectionOptions < Struct.new(
       :enable_acceleration,
       :static_routes_only,
+      :tunnel_inside_ip_version,
       :tunnel_options)
       SENSITIVE = []
       include Aws::Structure
@@ -50566,9 +50956,11 @@ module Aws::EC2
     #       {
     #         enable_acceleration: false,
     #         static_routes_only: false,
+    #         tunnel_inside_ip_version: "ipv4", # accepts ipv4, ipv6
     #         tunnel_options: [
     #           {
     #             tunnel_inside_cidr: "String",
+    #             tunnel_inside_ipv_6_cidr: "String",
     #             pre_shared_key: "String",
     #             phase_1_lifetime_seconds: 1,
     #             phase_2_lifetime_seconds: 1,
@@ -50630,6 +51022,12 @@ module Aws::EC2
     #   Default: `false`
     #   @return [Boolean]
     #
+    # @!attribute [rw] tunnel_inside_ip_version
+    #   Indicate whether the VPN tunnels process IPv4 or IPv6 traffic.
+    #
+    #   Default: `ipv4`
+    #   @return [String]
+    #
     # @!attribute [rw] tunnel_options
     #   The tunnel options for the VPN connection.
     #   @return [Array<Types::VpnTunnelOptionsSpecification>]
@@ -50639,6 +51037,7 @@ module Aws::EC2
     class VpnConnectionOptionsSpecification < Struct.new(
       :enable_acceleration,
       :static_routes_only,
+      :tunnel_inside_ip_version,
       :tunnel_options)
       SENSITIVE = []
       include Aws::Structure
@@ -50722,6 +51121,7 @@ module Aws::EC2
     #
     #       {
     #         tunnel_inside_cidr: "String",
+    #         tunnel_inside_ipv_6_cidr: "String",
     #         pre_shared_key: "String",
     #         phase_1_lifetime_seconds: 1,
     #         phase_2_lifetime_seconds: 1,
@@ -50767,9 +51167,9 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] tunnel_inside_cidr
-    #   The range of inside IP addresses for the tunnel. Any specified CIDR
-    #   blocks must be unique across all VPN connections that use the same
-    #   virtual private gateway.
+    #   The range of inside IPv4 addresses for the tunnel. Any specified
+    #   CIDR blocks must be unique across all VPN connections that use the
+    #   same virtual private gateway.
     #
     #   Constraints: A size /30 CIDR block from the `169.254.0.0/16` range.
     #   The following CIDR blocks are reserved and cannot be used:
@@ -50789,6 +51189,14 @@ module Aws::EC2
     #   * `169.254.169.252/30`
     #   @return [String]
     #
+    # @!attribute [rw] tunnel_inside_ipv_6_cidr
+    #   The range of inside IPv6 addresses for the tunnel. Any specified
+    #   CIDR blocks must be unique across all VPN connections that use the
+    #   same transit gateway.
+    #
+    #   Constraints: A size /126 CIDR block from the local `fd00::/8` range.
+    #   @return [String]
+    #
     # @!attribute [rw] pre_shared_key
     #   The pre-shared key (PSK) to establish initial authentication between
     #   the virtual private gateway and customer gateway.
@@ -50856,36 +51264,38 @@ module Aws::EC2
     #   One or more encryption algorithms that are permitted for the VPN
     #   tunnel for phase 1 IKE negotiations.
     #
-    #   Valid values: `AES128` \| `AES256`
+    #   Valid values: `AES128` \| `AES256` \| `AES128-GCM-16` \|
+    #   `AES256-GCM-16`
     #   @return [Array<Types::Phase1EncryptionAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_2_encryption_algorithms
     #   One or more encryption algorithms that are permitted for the VPN
     #   tunnel for phase 2 IKE negotiations.
     #
-    #   Valid values: `AES128` \| `AES256`
+    #   Valid values: `AES128` \| `AES256` \| `AES128-GCM-16` \|
+    #   `AES256-GCM-16`
     #   @return [Array<Types::Phase2EncryptionAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_1_integrity_algorithms
     #   One or more integrity algorithms that are permitted for the VPN
     #   tunnel for phase 1 IKE negotiations.
     #
-    #   Valid values: `SHA1` \| `SHA2-256`
+    #   Valid values: `SHA1` \| `SHA2-256` \| `SHA2-384` \| `SHA2-512`
     #   @return [Array<Types::Phase1IntegrityAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_2_integrity_algorithms
     #   One or more integrity algorithms that are permitted for the VPN
     #   tunnel for phase 2 IKE negotiations.
     #
-    #   Valid values: `SHA1` \| `SHA2-256`
+    #   Valid values: `SHA1` \| `SHA2-256` \| `SHA2-384` \| `SHA2-512`
     #   @return [Array<Types::Phase2IntegrityAlgorithmsRequestListValue>]
     #
     # @!attribute [rw] phase_1_dh_group_numbers
     #   One or more Diffie-Hellman group numbers that are permitted for the
     #   VPN tunnel for phase 1 IKE negotiations.
     #
-    #   Valid values: `2` \| `14` \| `15` \| `16` \| `17` \| `18` \| `22` \|
-    #   `23` \| `24`
+    #   Valid values: `2` \| `14` \| `15` \| `16` \| `17` \| `18` \| `19` \|
+    #   `20` \| `21` \| `22` \| `23` \| `24`
     #   @return [Array<Types::Phase1DHGroupNumbersRequestListValue>]
     #
     # @!attribute [rw] phase_2_dh_group_numbers
@@ -50893,7 +51303,7 @@ module Aws::EC2
     #   VPN tunnel for phase 2 IKE negotiations.
     #
     #   Valid values: `2` \| `5` \| `14` \| `15` \| `16` \| `17` \| `18` \|
-    #   `22` \| `23` \| `24`
+    #   `19` \| `20` \| `21` \| `22` \| `23` \| `24`
     #   @return [Array<Types::Phase2DHGroupNumbersRequestListValue>]
     #
     # @!attribute [rw] ike_versions
@@ -50906,6 +51316,7 @@ module Aws::EC2
     #
     class VpnTunnelOptionsSpecification < Struct.new(
       :tunnel_inside_cidr,
+      :tunnel_inside_ipv_6_cidr,
       :pre_shared_key,
       :phase_1_lifetime_seconds,
       :phase_2_lifetime_seconds,