aws-sdk-ec2 1.0.0.rc1 → 1.0.0.rc2

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

@@ -104,6 +104,18 @@ module Aws
         data.origin
       end
 
+      # The IPv6 CIDR block used for the destination match.
+      # @return [String]
+      def destination_ipv_6_cidr_block
+        data.destination_ipv_6_cidr_block
+      end
+
+      # The ID of the egress-only Internet gateway.
+      # @return [String]
+      def egress_only_internet_gateway_id
+        data.egress_only_internet_gateway_id
+      end
+
       # @!endgroup
 
       # @return [Client]
@@ -140,6 +152,7 @@ module Aws
       #
       #   route.delete({
       #     dry_run: false,
+      #     destination_ipv_6_cidr_block: "String",
       #   })
       # @param [Hash] options ({})
       # @option options [Boolean] :dry_run
@@ -147,6 +160,9 @@ module Aws
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+      # @option options [String] :destination_ipv_6_cidr_block
+      #   The IPv6 CIDR range for the route. The value you specify must match
+      #   the CIDR for the route exactly.
       # @return [EmptyStructure]
       def delete(options = {})
         options = options.merge(
@@ -162,6 +178,8 @@ module Aws
       #   route.replace({
       #     dry_run: false,
       #     gateway_id: "String",
+      #     destination_ipv_6_cidr_block: "String",
+      #     egress_only_internet_gateway_id: "String",
       #     instance_id: "String",
       #     network_interface_id: "String",
       #     vpc_peering_connection_id: "String",
@@ -175,6 +193,11 @@ module Aws
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
       # @option options [String] :gateway_id
       #   The ID of an Internet gateway or virtual private gateway.
+      # @option options [String] :destination_ipv_6_cidr_block
+      #   The IPv6 CIDR address block used for the destination match. The value
+      #   you provide must match the CIDR of an existing route in the table.
+      # @option options [String] :egress_only_internet_gateway_id
+      #   \[IPv6 traffic only\] The ID of an egress-only Internet gateway.
       # @option options [String] :instance_id
       #   The ID of a NAT instance in your VPC.
       # @option options [String] :network_interface_id
@@ -182,7 +205,7 @@ module Aws
       # @option options [String] :vpc_peering_connection_id
       #   The ID of a VPC peering connection.
       # @option options [String] :nat_gateway_id
-      #   The ID of a NAT gateway.
+      #   \[IPv4 traffic only\] The ID of a NAT gateway.
       # @return [EmptyStructure]
       def replace(options = {})
         options = options.merge(

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

@@ -115,8 +115,10 @@ module Aws
       #
       #   route = route_table.create_route({
       #     dry_run: false,
-      #     destination_cidr_block: "String", # required
+      #     destination_cidr_block: "String",
       #     gateway_id: "String",
+      #     destination_ipv_6_cidr_block: "String",
+      #     egress_only_internet_gateway_id: "String",
       #     instance_id: "String",
       #     network_interface_id: "String",
       #     vpc_peering_connection_id: "String",
@@ -128,12 +130,17 @@ module Aws
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-      # @option options [required, String] :destination_cidr_block
-      #   The CIDR address block used for the destination match. Routing
+      # @option options [String] :destination_cidr_block
+      #   The IPv4 CIDR address block used for the destination match. Routing
       #   decisions are based on the most specific match.
       # @option options [String] :gateway_id
       #   The ID of an Internet gateway or virtual private gateway attached to
       #   your VPC.
+      # @option options [String] :destination_ipv_6_cidr_block
+      #   The IPv6 CIDR block used for the destination match. Routing decisions
+      #   are based on the most specific match.
+      # @option options [String] :egress_only_internet_gateway_id
+      #   \[IPv6 traffic only\] The ID of an egress-only Internet gateway.
       # @option options [String] :instance_id
       #   The ID of a NAT instance in your VPC. The operation fails if you
       #   specify an instance ID unless exactly one network interface is
@@ -143,7 +150,7 @@ module Aws
       # @option options [String] :vpc_peering_connection_id
       #   The ID of a VPC peering connection.
       # @option options [String] :nat_gateway_id
-      #   The ID of a NAT gateway.
+      #   \[IPv4 traffic only\] The ID of a NAT gateway.
       # @return [Route]
       def create_route(options = {})
         options = options.merge(route_table_id: @id)

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

@@ -142,6 +142,11 @@ module Aws
       #             cidr_ip: "String",
       #           },
       #         ],
+      #         ipv_6_ranges: [
+      #           {
+      #             cidr_ipv_6: "String",
+      #           },
+      #         ],
       #         prefix_list_ids: [
       #           {
       #             prefix_list_id: "String",
@@ -176,7 +181,7 @@ module Aws
       #   number. We recommend that you specify the port range in a set of IP
       #   permissions instead.
       # @option options [String] :cidr_ip
-      #   The CIDR IP address range. We recommend that you specify the CIDR
+      #   The CIDR IPv4 address range. We recommend that you specify the CIDR
       #   range in a set of IP permissions instead.
       # @option options [Array<Types::IpPermission>] :ip_permissions
       #   A set of IP permissions. You can't specify a destination security
@@ -219,6 +224,11 @@ module Aws
       #             cidr_ip: "String",
       #           },
       #         ],
+      #         ipv_6_ranges: [
+      #           {
+      #             cidr_ipv_6: "String",
+      #           },
+      #         ],
       #         prefix_list_ids: [
       #           {
       #             prefix_list_id: "String",
@@ -253,22 +263,26 @@ module Aws
       #   protocol and port range, use a set of IP permissions instead.
       # @option options [String] :ip_protocol
       #   The IP protocol name (`tcp`, `udp`, `icmp`) or number (see [Protocol
-      #   Numbers][1]). (VPC only) Use `-1` to specify all traffic. If you
-      #   specify `-1`, traffic on all ports is allowed, regardless of any ports
-      #   you specify.
+      #   Numbers][1]). (VPC only) Use `-1` to specify all protocols. If you
+      #   specify `-1`, or a protocol number other than `tcp`, `udp`, `icmp`, or
+      #   `58` (ICMPv6), traffic on all ports is allowed, regardless of any
+      #   ports you specify. For `tcp`, `udp`, and `icmp`, you must specify a
+      #   port range. For protocol `58` (ICMPv6), you can optionally specify a
+      #   port range; if you don't, traffic for all types and codes is allowed.
       #
       #
       #
       #   [1]: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
       # @option options [Integer] :from_port
-      #   The start of port range for the TCP and UDP protocols, or an ICMP type
-      #   number. For the ICMP type number, use `-1` to specify all ICMP types.
+      #   The start of port range for the TCP and UDP protocols, or an
+      #   ICMP/ICMPv6 type number. For the ICMP/ICMPv6 type number, use `-1` to
+      #   specify all types.
       # @option options [Integer] :to_port
-      #   The end of port range for the TCP and UDP protocols, or an ICMP code
-      #   number. For the ICMP code number, use `-1` to specify all ICMP codes
-      #   for the ICMP type.
+      #   The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6
+      #   code number. For the ICMP/ICMPv6 code number, use `-1` to specify all
+      #   codes.
       # @option options [String] :cidr_ip
-      #   The CIDR IP address range. You can't specify this parameter when
+      #   The CIDR IPv4 address range. You can't specify this parameter when
       #   specifying a source security group.
       # @option options [Array<Types::IpPermission>] :ip_permissions
       #   A set of IP permissions. Can be used to specify multiple rules in a
@@ -369,6 +383,11 @@ module Aws
       #             cidr_ip: "String",
       #           },
       #         ],
+      #         ipv_6_ranges: [
+      #           {
+      #             cidr_ipv_6: "String",
+      #           },
+      #         ],
       #         prefix_list_ids: [
       #           {
       #             prefix_list_id: "String",
@@ -446,6 +465,11 @@ module Aws
       #             cidr_ip: "String",
       #           },
       #         ],
+      #         ipv_6_ranges: [
+      #           {
+      #             cidr_ipv_6: "String",
+      #           },
+      #         ],
       #         prefix_list_ids: [
       #           {
       #             prefix_list_id: "String",

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

@@ -44,14 +44,29 @@ module Aws
         data.vpc_id
       end
 
-      # The CIDR block assigned to the subnet.
+      # The IPv4 CIDR block assigned to the subnet.
       # @return [String]
       def cidr_block
         data.cidr_block
       end
 
-      # The number of unused IP addresses in the subnet. Note that the IP
-      # addresses for any stopped instances are considered unavailable.
+      # Information about the IPv6 CIDR blocks associated with the subnet.
+      # @return [Array<Types::SubnetIpv6CidrBlockAssociation>]
+      def ipv_6_cidr_block_association_set
+        data.ipv_6_cidr_block_association_set
+      end
+
+      # Indicates whether a network interface created in this subnet
+      # (including a network interface created by RunInstances) receives an
+      # IPv6 address.
+      # @return [Boolean]
+      def assign_ipv_6_address_on_creation
+        data.assign_ipv_6_address_on_creation
+      end
+
+      # The number of unused private IPv4 addresses in the subnet. Note that
+      # the IPv4 addresses for any stopped instances are considered
+      # unavailable.
       # @return [Integer]
       def available_ip_address_count
         data.available_ip_address_count
@@ -71,7 +86,7 @@ module Aws
       end
 
       # Indicates whether instances launched in this subnet receive a public
-      # IP address.
+      # IPv4 address.
       # @return [Boolean]
       def map_public_ip_on_launch
         data.map_public_ip_on_launch
@@ -131,7 +146,7 @@ module Aws
       #     security_groups: ["String"],
       #     security_group_ids: ["String"],
       #     user_data: "String",
-      #     instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, x1.16xlarge, x1.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge
+      #     instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, x1.16xlarge, x1.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, f1.2xlarge, f1.16xlarge
       #     placement: {
       #       availability_zone: "String",
       #       group_name: "String",
@@ -162,6 +177,12 @@ module Aws
       #     disable_api_termination: false,
       #     instance_initiated_shutdown_behavior: "stop", # accepts stop, terminate
       #     private_ip_address: "String",
+      #     ipv_6_addresses: [
+      #       {
+      #         ipv_6_address: "String",
+      #       },
+      #     ],
+      #     ipv_6_address_count: 1,
       #     client_token: "String",
       #     additional_info: "String",
       #     network_interfaces: [
@@ -181,6 +202,12 @@ module Aws
       #         ],
       #         secondary_private_ip_address_count: 1,
       #         associate_public_ip_address: false,
+      #         ipv_6_addresses: [
+      #           {
+      #             ipv_6_address: "String",
+      #           },
+      #         ],
+      #         ipv_6_address_count: 1,
       #       },
       #     ],
       #     iam_instance_profile: {
@@ -297,10 +324,8 @@ module Aws
       #   The monitoring for the instance.
       # @option options [Boolean] :disable_api_termination
       #   If you set this parameter to `true`, you can't terminate the instance
-      #   using the Amazon EC2 console, CLI, or API; otherwise, you can. If you
-      #   set this parameter to `true` and then later want to be able to
-      #   terminate the instance, you must first change the value of the
-      #   `disableApiTermination` attribute to `false` using
+      #   using the Amazon EC2 console, CLI, or API; otherwise, you can. To
+      #   change this attribute to `false` after launch, use
       #   ModifyInstanceAttribute. Alternatively, if you set
       #   `InstanceInitiatedShutdownBehavior` to `terminate`, you can terminate
       #   the instance by running the shutdown command from the instance.
@@ -313,19 +338,27 @@ module Aws
       #
       #   Default: `stop`
       # @option options [String] :private_ip_address
-      #   \[EC2-VPC\] The primary IP address. You must specify a value from the
-      #   IP address range of the subnet.
-      #
-      #   Only one private IP address can be designated as primary. Therefore,
-      #   you can't specify this parameter if `PrivateIpAddresses.n.Primary` is
-      #   set to `true` and `PrivateIpAddresses.n.PrivateIpAddress` is set to an
-      #   IP address.
-      #
-      #   You cannot specify this option if you're launching more than one
-      #   instance in the request.
-      #
-      #   Default: We select an IP address from the IP address range of the
-      #   subnet.
+      #   \[EC2-VPC\] The primary IPv4 address. You must specify a value from
+      #   the IPv4 address range of the subnet.
+      #
+      #   Only one private IP address can be designated as primary. You can't
+      #   specify this option if you've specified the option to designate a
+      #   private IP address as the primary IP address in a network interface
+      #   specification. You cannot specify this option if you're launching
+      #   more than one instance in the request.
+      # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
+      #   \[EC2-VPC\] Specify one or more IPv6 addresses from the range of the
+      #   subnet to associate with the primary network interface. You cannot
+      #   specify this option and the option to assign a number of IPv6
+      #   addresses in the same request. You cannot specify this option if
+      #   you've specified a minimum number of instances to launch.
+      # @option options [Integer] :ipv_6_address_count
+      #   \[EC2-VPC\] A number of IPv6 addresses to associate with the primary
+      #   network interface. Amazon EC2 chooses the IPv6 addresses from the
+      #   range of your subnet. You cannot specify this option and the option to
+      #   assign specific IPv6 addresses in the same request. You can specify
+      #   this option if you've specified a minimum number of instances to
+      #   launch.
       # @option options [String] :client_token
       #   Unique, case-sensitive identifier you provide to ensure the
       #   idempotency of the request. For more information, see [Ensuring
@@ -378,36 +411,52 @@ module Aws
       #       },
       #     ],
       #     secondary_private_ip_address_count: 1,
+      #     ipv_6_addresses: [
+      #       {
+      #         ipv_6_address: "String",
+      #       },
+      #     ],
+      #     ipv_6_address_count: 1,
       #     dry_run: false,
       #   })
       # @param [Hash] options ({})
       # @option options [String] :description
       #   A description for the network interface.
       # @option options [String] :private_ip_address
-      #   The primary private IP address of the network interface. If you don't
-      #   specify an IP address, Amazon EC2 selects one for you from the subnet
-      #   range. If you specify an IP address, you cannot indicate any IP
-      #   addresses specified in `privateIpAddresses` as primary (only one IP
-      #   address can be designated as primary).
+      #   The primary private IPv4 address of the network interface. If you
+      #   don't specify an IPv4 address, Amazon EC2 selects one for you from
+      #   the subnet's IPv4 CIDR range. If you specify an IP address, you
+      #   cannot indicate any IP addresses specified in `privateIpAddresses` as
+      #   primary (only one IP address can be designated as primary).
       # @option options [Array<String>] :groups
       #   The IDs of one or more security groups.
       # @option options [Array<Types::PrivateIpAddressSpecification>] :private_ip_addresses
-      #   One or more private IP addresses.
+      #   One or more private IPv4 addresses.
       # @option options [Integer] :secondary_private_ip_address_count
-      #   The number of secondary private IP addresses to assign to a network
-      #   interface. When you specify a number of secondary IP addresses, Amazon
-      #   EC2 selects these IP addresses within the subnet range. You can't
-      #   specify this option and specify more than one private IP address using
-      #   `privateIpAddresses`.
+      #   The number of secondary private IPv4 addresses to assign to a network
+      #   interface. When you specify a number of secondary IPv4 addresses,
+      #   Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR
+      #   range. You can't specify this option and specify more than one
+      #   private IP address using `privateIpAddresses`.
       #
       #   The number of IP addresses you can assign to a network interface
-      #   varies by instance type. For more information, see [Private IP
-      #   Addresses Per ENI Per Instance Type][1] in the *Amazon Elastic Compute
-      #   Cloud User Guide*.
+      #   varies by instance type. For more information, see [IP Addresses Per
+      #   ENI Per Instance Type][1] in the *Amazon Virtual Private Cloud User
+      #   Guide*.
       #
       #
       #
       #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
+      # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
+      #   One or more specific IPv6 addresses from the IPv6 CIDR block range of
+      #   your subnet. You can't use this option if you're specifying a number
+      #   of IPv6 addresses.
+      # @option options [Integer] :ipv_6_address_count
+      #   The number of IPv6 addresses to assign to a network interface. Amazon
+      #   EC2 automatically selects the IPv6 addresses from the subnet range.
+      #   You can't use this option if specifying specific IPv6 addresses. If
+      #   your subnet has the `AssignIpv6AddressOnCreation` attribute set to
+      #   `true`, you can specify `0` to override this setting.
       # @option options [Boolean] :dry_run
       #   Checks whether you have the required permissions for the action,
       #   without actually making the request, and provides an error response.
@@ -511,6 +560,18 @@ module Aws
       #
       #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
       #
+      #   * `association.public-ip` - The address of the Elastic IP address
+      #     (IPv4) bound to the network interface.
+      #
+      #   * `association.ip-owner-id` - The owner of the Elastic IP address
+      #     (IPv4) associated with the network interface.
+      #
+      #   * `association.allocation-id` - The allocation ID returned when you
+      #     allocated the Elastic IP address (IPv4) for your network interface.
+      #
+      #   * `association.association-id` - The association ID returned when the
+      #     network interface was associated with an IPv4 address.
+      #
       #   * `availability-zone` - The Availability Zone of the instance.
       #
       #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -571,7 +632,7 @@ module Aws
       #   * `instance.group-name` - The name of the security group for the
       #     instance.
       #
-      #   * `ip-address` - The public IP address of the instance.
+      #   * `ip-address` - The public IPv4 address of the instance.
       #
       #   * `kernel-id` - The kernel ID.
       #
@@ -584,8 +645,91 @@ module Aws
       #
       #   * `launch-time` - The time when the instance was launched.
       #
-      #   * `monitoring-state` - Indicates whether monitoring is enabled for the
-      #     instance (`disabled` \| `enabled`).
+      #   * `monitoring-state` - Indicates whether detailed monitoring is
+      #     enabled (`disabled` \| `enabled`).
+      #
+      #   * `network-interface.addresses.private-ip-address` - The private IPv4
+      #     address associated with the network interface.
+      #
+      #   * `network-interface.addresses.primary` - Specifies whether the IPv4
+      #     address of the network interface is the primary private IPv4
+      #     address.
+      #
+      #   * `network-interface.addresses.association.public-ip` - The ID of the
+      #     association of an Elastic IP address (IPv4) with a network
+      #     interface.
+      #
+      #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
+      #     of the private IPv4 address associated with the network interface.
+      #
+      #   * `network-interface.attachment.attachment-id` - The ID of the
+      #     interface attachment.
+      #
+      #   * `network-interface.attachment.instance-id` - The ID of the instance
+      #     to which the network interface is attached.
+      #
+      #   * `network-interface.attachment.instance-owner-id` - The owner ID of
+      #     the instance to which the network interface is attached.
+      #
+      #   * `network-interface.attachment.device-index` - The device index to
+      #     which the network interface is attached.
+      #
+      #   * `network-interface.attachment.status` - The status of the attachment
+      #     (`attaching` \| `attached` \| `detaching` \| `detached`).
+      #
+      #   * `network-interface.attachment.attach-time` - The time that the
+      #     network interface was attached to an instance.
+      #
+      #   * `network-interface.attachment.delete-on-termination` - Specifies
+      #     whether the attachment is deleted when an instance is terminated.
+      #
+      #   * `network-interface.availability-zone` - The Availability Zone for
+      #     the network interface.
+      #
+      #   * `network-interface.description` - The description of the network
+      #     interface.
+      #
+      #   * `network-interface.group-id` - The ID of a security group associated
+      #     with the network interface.
+      #
+      #   * `network-interface.group-name` - The name of a security group
+      #     associated with the network interface.
+      #
+      #   * `network-interface.ipv6-addresses.ipv6-address` - The IPv6 address
+      #     associated with the network interface.
+      #
+      #   * `network-interface.mac-address` - The MAC address of the network
+      #     interface.
+      #
+      #   * `network-interface.network-interface-id` - The ID of the network
+      #     interface.
+      #
+      #   * `network-interface.owner-id` - The ID of the owner of the network
+      #     interface.
+      #
+      #   * `network-interface.private-dns-name` - The private DNS name of the
+      #     network interface.
+      #
+      #   * `network-interface.requester-id` - The requester ID for the network
+      #     interface.
+      #
+      #   * `network-interface.requester-managed` - Indicates whether the
+      #     network interface is being managed by AWS.
+      #
+      #   * `network-interface.status` - The status of the network interface
+      #     (`available`) \| `in-use`).
+      #
+      #   * `network-interface.source-dest-check` - Whether the network
+      #     interface performs source/destination checking. A value of `true`
+      #     means checking is enabled, and `false` means checking is disabled.
+      #     The value must be `false` for the network interface to perform
+      #     network address translation (NAT) in your VPC.
+      #
+      #   * `network-interface.subnet-id` - The ID of the subnet for the network
+      #     interface.
+      #
+      #   * `network-interface.vpc-id` - The ID of the VPC for the network
+      #     interface.
       #
       #   * `owner-id` - The AWS account ID of the instance owner.
       #
@@ -595,9 +739,9 @@ module Aws
       #   * `platform` - The platform. Use `windows` if you have Windows
       #     instances; otherwise, leave blank.
       #
-      #   * `private-dns-name` - The private DNS name of the instance.
+      #   * `private-dns-name` - The private IPv4 DNS name of the instance.
       #
-      #   * `private-ip-address` - The private IP address of the instance.
+      #   * `private-ip-address` - The private IPv4 address of the instance.
       #
       #   * `product-code` - The product code associated with the AMI used to
       #     launch the instance.
@@ -665,96 +809,6 @@ module Aws
       #     (`paravirtual` \| `hvm`).
       #
       #   * `vpc-id` - The ID of the VPC that the instance is running in.
-      #
-      #   * `network-interface.description` - The description of the network
-      #     interface.
-      #
-      #   * `network-interface.subnet-id` - The ID of the subnet for the network
-      #     interface.
-      #
-      #   * `network-interface.vpc-id` - The ID of the VPC for the network
-      #     interface.
-      #
-      #   * `network-interface.network-interface-id` - The ID of the network
-      #     interface.
-      #
-      #   * `network-interface.owner-id` - The ID of the owner of the network
-      #     interface.
-      #
-      #   * `network-interface.availability-zone` - The Availability Zone for
-      #     the network interface.
-      #
-      #   * `network-interface.requester-id` - The requester ID for the network
-      #     interface.
-      #
-      #   * `network-interface.requester-managed` - Indicates whether the
-      #     network interface is being managed by AWS.
-      #
-      #   * `network-interface.status` - The status of the network interface
-      #     (`available`) \| `in-use`).
-      #
-      #   * `network-interface.mac-address` - The MAC address of the network
-      #     interface.
-      #
-      #   * `network-interface.private-dns-name` - The private DNS name of the
-      #     network interface.
-      #
-      #   * `network-interface.source-dest-check` - Whether the network
-      #     interface performs source/destination checking. A value of `true`
-      #     means checking is enabled, and `false` means checking is disabled.
-      #     The value must be `false` for the network interface to perform
-      #     network address translation (NAT) in your VPC.
-      #
-      #   * `network-interface.group-id` - The ID of a security group associated
-      #     with the network interface.
-      #
-      #   * `network-interface.group-name` - The name of a security group
-      #     associated with the network interface.
-      #
-      #   * `network-interface.attachment.attachment-id` - The ID of the
-      #     interface attachment.
-      #
-      #   * `network-interface.attachment.instance-id` - The ID of the instance
-      #     to which the network interface is attached.
-      #
-      #   * `network-interface.attachment.instance-owner-id` - The owner ID of
-      #     the instance to which the network interface is attached.
-      #
-      #   * `network-interface.addresses.private-ip-address` - The private IP
-      #     address associated with the network interface.
-      #
-      #   * `network-interface.attachment.device-index` - The device index to
-      #     which the network interface is attached.
-      #
-      #   * `network-interface.attachment.status` - The status of the attachment
-      #     (`attaching` \| `attached` \| `detaching` \| `detached`).
-      #
-      #   * `network-interface.attachment.attach-time` - The time that the
-      #     network interface was attached to an instance.
-      #
-      #   * `network-interface.attachment.delete-on-termination` - Specifies
-      #     whether the attachment is deleted when an instance is terminated.
-      #
-      #   * `network-interface.addresses.primary` - Specifies whether the IP
-      #     address of the network interface is the primary private IP address.
-      #
-      #   * `network-interface.addresses.association.public-ip` - The ID of the
-      #     association of an Elastic IP address with a network interface.
-      #
-      #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
-      #     of the private IP address associated with the network interface.
-      #
-      #   * `association.public-ip` - The address of the Elastic IP address
-      #     bound to the network interface.
-      #
-      #   * `association.ip-owner-id` - The owner of the Elastic IP address
-      #     associated with the network interface.
-      #
-      #   * `association.allocation-id` - The allocation ID returned when you
-      #     allocated the Elastic IP address for your network interface.
-      #
-      #   * `association.association-id` - The association ID returned when the
-      #     network interface was associated with an IP address.
       # @return [Instance::Collection]
       def instances(options = {})
         batches = Enumerator.new do |y|
@@ -805,32 +859,33 @@ module Aws
       # @option options [Array<Types::Filter>] :filters
       #   One or more filters.
       #
-      #   * `addresses.private-ip-address` - The private IP addresses associated
-      #     with the network interface.
+      #   * `addresses.private-ip-address` - The private IPv4 addresses
+      #     associated with the network interface.
       #
-      #   * `addresses.primary` - Whether the private IP address is the primary
-      #     IP address associated with the network interface.
+      #   * `addresses.primary` - Whether the private IPv4 address is the
+      #     primary IP address associated with the network interface.
       #
       #   * `addresses.association.public-ip` - The association ID returned when
-      #     the network interface was associated with the Elastic IP address.
+      #     the network interface was associated with the Elastic IP address
+      #     (IPv4).
       #
       #   * `addresses.association.owner-id` - The owner ID of the addresses
       #     associated with the network interface.
       #
       #   * `association.association-id` - The association ID returned when the
-      #     network interface was associated with an IP address.
+      #     network interface was associated with an IPv4 address.
       #
       #   * `association.allocation-id` - The allocation ID returned when you
-      #     allocated the Elastic IP address for your network interface.
+      #     allocated the Elastic IP address (IPv4) for your network interface.
       #
       #   * `association.ip-owner-id` - The owner of the Elastic IP address
-      #     associated with the network interface.
+      #     (IPv4) associated with the network interface.
       #
       #   * `association.public-ip` - The address of the Elastic IP address
-      #     bound to the network interface.
+      #     (IPv4) bound to the network interface.
       #
       #   * `association.public-dns-name` - The public DNS name for the network
-      #     interface.
+      #     interface (IPv4).
       #
       #   * `attachment.attachment-id` - The ID of the interface attachment.
       #
@@ -866,16 +921,20 @@ module Aws
       #   * `group-name` - The name of a security group associated with the
       #     network interface.
       #
+      #   * `ipv6-addresses.ipv6-address` - An IPv6 address associated with the
+      #     network interface.
+      #
       #   * `mac-address` - The MAC address of the network interface.
       #
       #   * `network-interface-id` - The ID of the network interface.
       #
       #   * `owner-id` - The AWS account ID of the network interface owner.
       #
-      #   * `private-ip-address` - The private IP address or addresses of the
+      #   * `private-ip-address` - The private IPv4 address or addresses of the
       #     network interface.
       #
-      #   * `private-dns-name` - The private DNS name of the network interface.
+      #   * `private-dns-name` - The private DNS name of the network interface
+      #     (IPv4).
       #
       #   * `requester-id` - The ID of the entity that launched the instance on
       #     your behalf (for example, AWS Management Console, Auto Scaling, and