aws-sdk-ec2 1.179.0 → 1.184.0

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",
     #       },
     #     ],
@@ -405,6 +406,7 @@ module Aws::EC2
     #       capacity_reservation_preference: "open", # accepts open, none
     #       capacity_reservation_target: {
     #         capacity_reservation_id: "CapacityReservationId",
+    #         capacity_reservation_resource_group_arn: "String",
     #       },
     #     },
     #     hibernation_options: {

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
@@ -3066,6 +3085,26 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes a resource group to which a Capacity Reservation has been
+    # added.
+    #
+    # @!attribute [rw] group_arn
+    #   The ARN of the resource group.
+    #   @return [String]
+    #
+    # @!attribute [rw] owner_id
+    #   The ID of the AWS account that owns the resource group.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationGroup AWS API Documentation
+    #
+    class CapacityReservationGroup < Struct.new(
+      :group_arn,
+      :owner_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the strategy for using unused Capacity Reservations for
     # fulfilling On-Demand capacity.
     #
@@ -3170,7 +3209,8 @@ module Aws::EC2
     # instance to run as an On-Demand Instance or to run in any `open`
     # Capacity Reservation that has matching attributes (instance type,
     # platform, Availability Zone). Use the `CapacityReservationTarget`
-    # parameter to explicitly target a specific Capacity Reservation.
+    # parameter to explicitly target a specific Capacity Reservation or a
+    # Capacity Reservation group.
     #
     # @note When making an API call, you may pass CapacityReservationSpecification
     #   data as a hash:
@@ -3179,6 +3219,7 @@ module Aws::EC2
     #         capacity_reservation_preference: "open", # accepts open, none
     #         capacity_reservation_target: {
     #           capacity_reservation_id: "CapacityReservationId",
+    #           capacity_reservation_resource_group_arn: "String",
     #         },
     #       }
     #
@@ -3193,13 +3234,11 @@ module Aws::EC2
     #   * `none` - The instance avoids running in a Capacity Reservation
     #     even if one is available. The instance runs as an On-Demand
     #     Instance.
-    #
-    #   When `CapacityReservationPreference` is not specified, it defaults
-    #   to `open`.
     #   @return [String]
     #
     # @!attribute [rw] capacity_reservation_target
-    #   Information about the target Capacity Reservation.
+    #   Information about the target Capacity Reservation or Capacity
+    #   Reservation group.
     #   @return [Types::CapacityReservationTarget]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationSpecification AWS API Documentation
@@ -3217,7 +3256,8 @@ module Aws::EC2
     # if it is configured in run in any `open` Capacity Reservation that has
     # matching attributes (instance type, platform, Availability Zone). The
     # action returns the `capacityReservationTarget` response element if the
-    # instance explicily targets a specific Capacity Reservation.
+    # instance explicily targets a specific Capacity Reservation or Capacity
+    # Reservation group.
     #
     # @!attribute [rw] capacity_reservation_preference
     #   Describes the instance's Capacity Reservation preferences. Possible
@@ -3232,7 +3272,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] capacity_reservation_target
-    #   Information about the targeted Capacity Reservation.
+    #   Information about the targeted Capacity Reservation or Capacity
+    #   Reservation group.
     #   @return [Types::CapacityReservationTargetResponse]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationSpecificationResponse AWS API Documentation
@@ -3244,37 +3285,83 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes a target Capacity Reservation.
+    # Describes a target Capacity Reservation or Capacity Reservation group.
     #
     # @note When making an API call, you may pass CapacityReservationTarget
     #   data as a hash:
     #
     #       {
     #         capacity_reservation_id: "CapacityReservationId",
+    #         capacity_reservation_resource_group_arn: "String",
     #       }
     #
     # @!attribute [rw] capacity_reservation_id
-    #   The ID of the Capacity Reservation.
+    #   The ID of the Capacity Reservation in which to run the instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_resource_group_arn
+    #   The ARN of the Capacity Reservation resource group in which to run
+    #   the instance.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationTarget AWS API Documentation
     #
     class CapacityReservationTarget < Struct.new(
-      :capacity_reservation_id)
+      :capacity_reservation_id,
+      :capacity_reservation_resource_group_arn)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # Describes a target Capacity Reservation.
+    # Describes a target Capacity Reservation or Capacity Reservation group.
     #
     # @!attribute [rw] capacity_reservation_id
-    #   The ID of the Capacity Reservation.
+    #   The ID of the targeted Capacity Reservation.
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_resource_group_arn
+    #   The ARN of the targeted Capacity Reservation group.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationTargetResponse AWS API Documentation
     #
     class CapacityReservationTargetResponse < Struct.new(
-      :capacity_reservation_id)
+      :capacity_reservation_id,
+      :capacity_reservation_resource_group_arn)
+      SENSITIVE = []
+      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
@@ -4624,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
+    #         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
     #         availability_zone: "String",
     #         availability_zone_id: "String",
     #         tenancy: "default", # accepts default, dedicated
@@ -4653,8 +4740,6 @@ module Aws::EC2
     #   idempotency of the request. For more information, see [How to Ensure
     #   Idempotency][1].
     #
-    #   Constraint: Maximum 64 ASCII characters.
-    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
@@ -4804,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:
     #
@@ -5108,6 +5264,17 @@ module Aws::EC2
     #         public_ip: "String",
     #         certificate_arn: "String",
     #         type: "ipsec.1", # required, accepts ipsec.1
+    #         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",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #         device_name: "String",
     #         dry_run: false,
     #       }
@@ -5132,6 +5299,10 @@ module Aws::EC2
     #   (`ipsec.1`).
     #   @return [String]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the customer gateway.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @!attribute [rw] device_name
     #   A name for the customer gateway device.
     #
@@ -5152,6 +5323,7 @@ module Aws::EC2
       :public_ip,
       :certificate_arn,
       :type,
+      :tag_specifications,
       :device_name,
       :dry_run)
       SENSITIVE = []
@@ -6256,6 +6428,7 @@ module Aws::EC2
     #           ],
     #           network_interfaces: [
     #             {
+    #               associate_carrier_ip_address: false,
     #               associate_public_ip_address: false,
     #               delete_on_termination: false,
     #               description: "String",
@@ -6345,6 +6518,7 @@ module Aws::EC2
     #             capacity_reservation_preference: "open", # accepts open, none
     #             capacity_reservation_target: {
     #               capacity_reservation_id: "CapacityReservationId",
+    #               capacity_reservation_resource_group_arn: "String",
     #             },
     #           },
     #           license_specifications: [
@@ -6476,6 +6650,7 @@ module Aws::EC2
     #           ],
     #           network_interfaces: [
     #             {
+    #               associate_carrier_ip_address: false,
     #               associate_public_ip_address: false,
     #               delete_on_termination: false,
     #               description: "String",
@@ -6565,6 +6740,7 @@ module Aws::EC2
     #             capacity_reservation_preference: "open", # accepts open, none
     #             capacity_reservation_target: {
     #               capacity_reservation_id: "CapacityReservationId",
+    #               capacity_reservation_resource_group_arn: "String",
     #             },
     #           },
     #           license_specifications: [
@@ -7488,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",
@@ -7543,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]
@@ -7568,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)
@@ -9717,6 +9902,17 @@ module Aws::EC2
     #             },
     #           ],
     #         },
+    #         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",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] customer_gateway_id
@@ -9748,6 +9944,10 @@ module Aws::EC2
     #   The options for the VPN connection.
     #   @return [Types::VpnConnectionOptionsSpecification]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the VPN connection.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateVpnConnectionRequest AWS API Documentation
     #
     class CreateVpnConnectionRequest < Struct.new(
@@ -9756,7 +9956,8 @@ module Aws::EC2
       :vpn_gateway_id,
       :transit_gateway_id,
       :dry_run,
-      :options)
+      :options,
+      :tag_specifications)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -9811,6 +10012,17 @@ module Aws::EC2
     #       {
     #         availability_zone: "String",
     #         type: "ipsec.1", # required, accepts ipsec.1
+    #         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",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #         amazon_side_asn: 1,
     #         dry_run: false,
     #       }
@@ -9823,6 +10035,10 @@ module Aws::EC2
     #   The type of VPN connection this virtual private gateway supports.
     #   @return [String]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the virtual private gateway.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @!attribute [rw] amazon_side_asn
     #   A private Autonomous System Number (ASN) for the Amazon side of a
     #   BGP session. If you're using a 16-bit ASN, it must be in the 64512
@@ -9844,6 +10060,7 @@ module Aws::EC2
     class CreateVpnGatewayRequest < Struct.new(
       :availability_zone,
       :type,
+      :tag_specifications,
       :amazon_side_asn,
       :dry_run)
       SENSITIVE = []
@@ -9955,6 +10172,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:
     #
@@ -12257,8 +12514,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.
@@ -12268,7 +12525,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
@@ -12383,45 +12640,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.
@@ -12447,7 +12715,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
@@ -12610,13 +12879,15 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] next_token
-    #   The token to retrieve the next page of results.
+    #   The token to use to retrieve the next page of results.
     #   @return [String]
     #
     # @!attribute [rw] max_results
     #   The maximum number of results to return for the request in a single
     #   page. The remaining results can be seen by sending another request
-    #   with the returned nextToken value.
+    #   with the returned `nextToken` value. This value can be between 5 and
+    #   500. If `maxResults` is given a larger value than 500, you receive
+    #   an error.
     #   @return [Integer]
     #
     # @!attribute [rw] filters
@@ -12739,6 +13010,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:
     #
@@ -23939,7 +24301,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
@@ -26368,13 +26730,15 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] next_token
-    #   The token to retrieve the next page of results.
+    #   The token to use to retrieve the next page of results.
     #   @return [String]
     #
     # @!attribute [rw] max_results
     #   The maximum number of results to return for the request in a single
     #   page. The remaining results can be seen by sending another request
-    #   with the returned nextToken value.
+    #   with the returned `nextToken` value. This value can be between 5 and
+    #   500. If `maxResults` is given a larger value than 500, you receive
+    #   an error.
     #
     #   Valid range: Minimum value of 1. Maximum value of 1000.
     #   @return [Integer]
@@ -26776,6 +27140,69 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetGroupsForCapacityReservationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         capacity_reservation_id: "CapacityReservationId", # required
+    #         next_token: "String",
+    #         max_results: 1,
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] capacity_reservation_id
+    #   The ID of the Capacity Reservation.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return for the request in a single
+    #   page. The remaining results can be seen by sending another request
+    #   with the returned `nextToken` value. This value can be between 5 and
+    #   500. If `maxResults` is given a larger value than 500, you receive
+    #   an error.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] 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/GetGroupsForCapacityReservationRequest AWS API Documentation
+    #
+    class GetGroupsForCapacityReservationRequest < Struct.new(
+      :capacity_reservation_id,
+      :next_token,
+      :max_results,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!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]
+    #
+    # @!attribute [rw] capacity_reservation_groups
+    #   Information about the resource groups to which the Capacity
+    #   Reservation has been added.
+    #   @return [Array<Types::CapacityReservationGroup>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetGroupsForCapacityReservationResult AWS API Documentation
+    #
+    class GetGroupsForCapacityReservationResult < Struct.new(
+      :next_token,
+      :capacity_reservation_groups)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass GetHostReservationPurchasePreviewRequest
     #   data as a hash:
     #
@@ -29619,7 +30046,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
@@ -30428,6 +30859,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]
@@ -30444,6 +30879,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)
@@ -30514,6 +30950,7 @@ module Aws::EC2
     #         ],
     #         secondary_private_ip_address_count: 1,
     #         subnet_id: "String",
+    #         associate_carrier_ip_address: false,
     #         interface_type: "String",
     #       }
     #
@@ -30611,6 +31048,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
@@ -30641,6 +31088,7 @@ module Aws::EC2
       :private_ip_addresses,
       :secondary_private_ip_address_count,
       :subnet_id,
+      :associate_carrier_ip_address,
       :interface_type)
       SENSITIVE = []
       include Aws::Structure
@@ -31812,7 +32260,8 @@ module Aws::EC2
     # run in On-Demand capacity or to run in any `open` Capacity Reservation
     # that has matching attributes (instance type, platform, Availability
     # Zone). Use the `CapacityReservationTarget` parameter to explicitly
-    # target a specific Capacity Reservation.
+    # target a specific Capacity Reservation or a Capacity Reservation
+    # group.
     #
     # @note When making an API call, you may pass LaunchTemplateCapacityReservationSpecificationRequest
     #   data as a hash:
@@ -31821,6 +32270,7 @@ module Aws::EC2
     #         capacity_reservation_preference: "open", # accepts open, none
     #         capacity_reservation_target: {
     #           capacity_reservation_id: "CapacityReservationId",
+    #           capacity_reservation_resource_group_arn: "String",
     #         },
     #       }
     #
@@ -31837,7 +32287,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] capacity_reservation_target
-    #   Information about the target Capacity Reservation.
+    #   Information about the target Capacity Reservation or Capacity
+    #   Reservation group.
     #   @return [Types::CapacityReservationTarget]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateCapacityReservationSpecificationRequest AWS API Documentation
@@ -31864,7 +32315,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] capacity_reservation_target
-    #   Information about the target Capacity Reservation.
+    #   Information about the target Capacity Reservation or Capacity
+    #   Reservation group.
     #   @return [Types::CapacityReservationTargetResponse]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateCapacityReservationSpecificationResponse AWS API Documentation
@@ -32424,6 +32876,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.
@@ -32482,6 +32948,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,
@@ -32505,6 +32972,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
+    #         associate_carrier_ip_address: false,
     #         associate_public_ip_address: false,
     #         delete_on_termination: false,
     #         description: "String",
@@ -32529,6 +32997,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.
@@ -32603,6 +33085,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,
@@ -33608,13 +34091,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.
     #
     #
     #
@@ -34593,6 +35078,7 @@ module Aws::EC2
     #           capacity_reservation_preference: "open", # accepts open, none
     #           capacity_reservation_target: {
     #             capacity_reservation_id: "CapacityReservationId",
+    #             capacity_reservation_resource_group_arn: "String",
     #           },
     #         },
     #         dry_run: false,
@@ -35328,10 +35814,6 @@ module Aws::EC2
     #           value: false,
     #         },
     #         subnet_id: "SubnetId", # required
-    #         map_customer_owned_ip_on_launch: {
-    #           value: false,
-    #         },
-    #         customer_owned_ipv_4_pool: "CoipPoolId",
     #       }
     #
     # @!attribute [rw] assign_ipv_6_address_on_creation
@@ -35355,30 +35837,12 @@ module Aws::EC2
     #   The ID of the subnet.
     #   @return [String]
     #
-    # @!attribute [rw] map_customer_owned_ip_on_launch
-    #   Specify `true` to indicate that network interfaces attached to
-    #   instances created in the specified subnet should be assigned a
-    #   customer-owned IPv4 address.
-    #
-    #   When this value is `true`, you must specify the customer-owned IP
-    #   pool using `CustomerOwnedIpv4Pool`.
-    #   @return [Types::AttributeBooleanValue]
-    #
-    # @!attribute [rw] customer_owned_ipv_4_pool
-    #   The customer-owned IPv4 address pool associated with the subnet.
-    #
-    #   You must set this value when you specify `true` for
-    #   `MapCustomerOwnedIpOnLaunch`.
-    #   @return [String]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifySubnetAttributeRequest AWS API Documentation
     #
     class ModifySubnetAttributeRequest < Struct.new(
       :assign_ipv_6_address_on_creation,
       :map_public_ip_on_launch,
-      :subnet_id,
-      :map_customer_owned_ip_on_launch,
-      :customer_owned_ipv_4_pool)
+      :subnet_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -37262,7 +37726,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.
@@ -37281,8 +37746,15 @@ 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] 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
@@ -37292,7 +37764,8 @@ module Aws::EC2
       :association_id,
       :ip_owner_id,
       :public_dns_name,
-      :public_ip)
+      :public_ip,
+      :carrier_ip)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -39682,7 +40155,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
@@ -39975,6 +40449,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",
@@ -40032,6 +40507,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]
@@ -40058,6 +40537,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)
@@ -40288,6 +40768,7 @@ module Aws::EC2
     #         ],
     #         network_interfaces: [
     #           {
+    #             associate_carrier_ip_address: false,
     #             associate_public_ip_address: false,
     #             delete_on_termination: false,
     #             description: "String",
@@ -40377,6 +40858,7 @@ module Aws::EC2
     #           capacity_reservation_preference: "open", # accepts open, none
     #           capacity_reservation_target: {
     #             capacity_reservation_id: "CapacityReservationId",
+    #             capacity_reservation_resource_group_arn: "String",
     #           },
     #         },
     #         license_specifications: [
@@ -40706,6 +41188,7 @@ module Aws::EC2
     #                   ],
     #                   secondary_private_ip_address_count: 1,
     #                   subnet_id: "String",
+    #                   associate_carrier_ip_address: false,
     #                   interface_type: "String",
     #                 },
     #               ],
@@ -40894,6 +41377,7 @@ module Aws::EC2
     #               ],
     #               secondary_private_ip_address_count: 1,
     #               subnet_id: "String",
+    #               associate_carrier_ip_address: false,
     #               interface_type: "String",
     #             },
     #           ],
@@ -41141,6 +41625,7 @@ module Aws::EC2
     #             ],
     #             secondary_private_ip_address_count: 1,
     #             subnet_id: "String",
+    #             associate_carrier_ip_address: false,
     #             interface_type: "String",
     #           },
     #         ],
@@ -42635,6 +43120,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]
@@ -42675,6 +43164,7 @@ module Aws::EC2
       :nat_gateway_id,
       :transit_gateway_id,
       :local_gateway_id,
+      :carrier_gateway_id,
       :network_interface_id,
       :origin,
       :state,
@@ -42894,6 +43384,7 @@ module Aws::EC2
     #             ],
     #             secondary_private_ip_address_count: 1,
     #             subnet_id: "String",
+    #             associate_carrier_ip_address: false,
     #             interface_type: "String",
     #           },
     #         ],
@@ -42946,6 +43437,7 @@ module Aws::EC2
     #           capacity_reservation_preference: "open", # accepts open, none
     #           capacity_reservation_target: {
     #             capacity_reservation_id: "CapacityReservationId",
+    #             capacity_reservation_resource_group_arn: "String",
     #           },
     #         },
     #         hibernation_options: {
@@ -45368,6 +45860,7 @@ module Aws::EC2
     #             ],
     #             secondary_private_ip_address_count: 1,
     #             subnet_id: "String",
+    #             associate_carrier_ip_address: false,
     #             interface_type: "String",
     #           },
     #         ],
@@ -45662,6 +46155,7 @@ module Aws::EC2
     #                 ],
     #                 secondary_private_ip_address_count: 1,
     #                 subnet_id: "String",
+    #                 associate_carrier_ip_address: false,
     #                 interface_type: "String",
     #               },
     #             ],
@@ -47105,20 +47599,20 @@ 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` \| `dedicated-host` \| `dhcp-options` \|
-    #   `export-image-task` \| `export-instance-task` \| `fleet` \|
-    #   `fpga-image` \| `host-reservation` \| `import-image-task` \|
-    #   `import-snapshot-task` \| `instance` \| `internet-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` \| `security-group` \| `spot-fleet-request` \|
-    #   `spot-instances-request` \| `snapshot` \| `subnet` \|
-    #   `traffic-mirror-filter` \| `traffic-mirror-session` \|
+    #   `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-endpoint` (for interface and gateway
-    #   endpoints) \| `vpc-endpoint-service` (for AWS PrivateLink) \|
-    #   `vpc-flow-log`.
+    #   `volume` \|`vpc` \| ` vpc-peering-connection` \| `vpc-endpoint` (for
+    #   interface and gateway endpoints) \| `vpc-endpoint-service` (for AWS
+    #   PrivateLink) \| `vpc-flow-log` \| `vpn-connection` \| `vpn-gateway`.
     #
     #   To tag a resource after it has been created, see [CreateTags][1].
     #
@@ -49849,8 +50343,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
@@ -50147,8 +50640,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