aws-sdk-ec2 1.336.0 → 1.338.0

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

@@ -841,13 +841,20 @@ module Aws::EC2
     # @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.
+    #
+    #   You can't specify a count of IPv6 addresses using this parameter if
+    #   you've specified one of the following: specific IPv6 addresses,
+    #   specific IPv6 prefixes, or a count of IPv6 prefixes.
+    #
+    #   If your subnet has the `AssignIpv6AddressOnCreation` attribute set,
+    #   you can override that setting by specifying 0 as the IPv6 address
+    #   count.
     # @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.
+    #   The IPv6 addresses from the IPv6 CIDR block range of your subnet.
+    #
+    #   You can't specify IPv6 addresses using this parameter if you've
+    #   specified one of the following: a count of IPv6 addresses, specific
+    #   IPv6 prefixes, or a count of IPv6 prefixes.
     # @option options [String] :private_ip_address
     #   The primary private IPv4 address of the network interface. If you
     #   don't specify an IPv4 address, Amazon EC2 selects one for you from
@@ -855,7 +862,11 @@ module Aws::EC2
     #   cannot indicate any IP addresses specified in `privateIpAddresses` as
     #   primary (only one IP address can be designated as primary).
     # @option options [Array<Types::PrivateIpAddressSpecification>] :private_ip_addresses
-    #   One or more private IPv4 addresses.
+    #   The private IPv4 addresses.
+    #
+    #   You can't specify private IPv4 addresses if you've specified one of
+    #   the following: a count of private IPv4 addresses, specific IPv4
+    #   prefixes, or a count of IPv4 prefixes.
     # @option options [Integer] :secondary_private_ip_address_count
     #   The number of secondary private IPv4 addresses to assign to a network
     #   interface. When you specify a number of secondary IPv4 addresses,
@@ -863,28 +874,35 @@ module Aws::EC2
     #   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 [IP Addresses Per
-    #   ENI Per Instance Type][1] in the *Amazon Virtual Private Cloud User
-    #   Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
+    #   You can't specify a count of private IPv4 addresses if you've
+    #   specified one of the following: specific private IPv4 addresses,
+    #   specific IPv4 prefixes, or a count of IPv4 prefixes.
     # @option options [Array<Types::Ipv4PrefixSpecificationRequest>] :ipv_4_prefixes
-    #   One or more IPv4 prefixes assigned to the network interface. You
-    #   cannot use this option if you use the `Ipv4PrefixCount` option.
+    #   The IPv4 prefixes assigned to the network interface.
+    #
+    #   You can't specify IPv4 prefixes if you've specified one of the
+    #   following: a count of IPv4 prefixes, specific private IPv4 addresses,
+    #   or a count of private IPv4 addresses.
     # @option options [Integer] :ipv_4_prefix_count
     #   The number of IPv4 prefixes that Amazon Web Services automatically
-    #   assigns to the network interface. You cannot use this option if you
-    #   use the `Ipv4 Prefixes` option.
+    #   assigns to the network interface.
+    #
+    #   You can't specify a count of IPv4 prefixes if you've specified one
+    #   of the following: specific IPv4 prefixes, specific private IPv4
+    #   addresses, or a count of private IPv4 addresses.
     # @option options [Array<Types::Ipv6PrefixSpecificationRequest>] :ipv_6_prefixes
-    #   One or more IPv6 prefixes assigned to the network interface. You
-    #   cannot use this option if you use the `Ipv6PrefixCount` option.
+    #   The IPv6 prefixes assigned to the network interface.
+    #
+    #   You can't specify IPv6 prefixes if you've specified one of the
+    #   following: a count of IPv6 prefixes, specific IPv6 addresses, or a
+    #   count of IPv6 addresses.
     # @option options [Integer] :ipv_6_prefix_count
     #   The number of IPv6 prefixes that Amazon Web Services automatically
-    #   assigns to the network interface. You cannot use this option if you
-    #   use the `Ipv6Prefixes` option.
+    #   assigns to the network interface.
+    #
+    #   You can't specify a count of IPv6 prefixes if you've specified one
+    #   of the following: specific IPv6 prefixes, specific IPv6 addresses, or
+    #   a count of IPv6 addresses.
     # @option options [String] :interface_type
     #   The type of network interface. The default is `interface`.
     #
@@ -2135,13 +2153,12 @@ module Aws::EC2
     #   results include all images for which you have launch permissions,
     #   regardless of ownership.
     # @option options [Boolean] :include_deprecated
-    #   If `true`, all deprecated AMIs are included in the response. If
-    #   `false`, no deprecated AMIs are included in the response. If no value
-    #   is specified, the default value is `false`.
+    #   Specifies whether to include deprecated AMIs.
+    #
+    #   Default: No deprecated AMIs are included in the response.
     #
     #   <note markdown="1"> If you are the AMI owner, all deprecated AMIs appear in the response
-    #   regardless of the value (`true` or `false`) that you set for this
-    #   parameter.
+    #   regardless of what you specify for this parameter.
     #
     #    </note>
     # @option options [Boolean] :dry_run
@@ -2969,7 +2986,7 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Array<String>] :network_interface_ids
-    #   One or more network interface IDs.
+    #   The network interface IDs.
     #
     #   Default: Describes all your network interfaces.
     # @return [NetworkInterface::Collection]

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

@@ -379,7 +379,8 @@ module Aws::EC2
     # @option options [String] :group_name
     #   \[EC2-Classic, default VPC\] The name of the security group. You must
     #   specify either the security group ID or the security group name in the
-    #   request.
+    #   request. For security groups in a nondefault VPC, you must specify the
+    #   security group ID.
     # @option options [Array<Types::IpPermission>] :ip_permissions
     #   The sets of IP permissions.
     # @option options [String] :ip_protocol
@@ -525,7 +526,9 @@ module Aws::EC2
     # @param [Hash] options ({})
     # @option options [String] :group_name
     #   \[EC2-Classic, default VPC\] The name of the security group. You can
-    #   specify either the security group name or the security group ID.
+    #   specify either the security group name or the security group ID. For
+    #   security groups in a nondefault VPC, you must specify the security
+    #   group ID.
     # @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.
@@ -678,7 +681,8 @@ module Aws::EC2
     # @option options [String] :group_name
     #   \[EC2-Classic, default VPC\] The name of the security group. You must
     #   specify either the security group ID or the security group name in the
-    #   request.
+    #   request. For security groups in a nondefault VPC, you must specify the
+    #   security group ID.
     # @option options [Array<Types::IpPermission>] :ip_permissions
     #   The sets of IP permissions. You can't specify a source security group
     #   and a CIDR IP address range in the same set of permissions.

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

@@ -880,13 +880,20 @@ module Aws::EC2
     # @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.
+    #
+    #   You can't specify a count of IPv6 addresses using this parameter if
+    #   you've specified one of the following: specific IPv6 addresses,
+    #   specific IPv6 prefixes, or a count of IPv6 prefixes.
+    #
+    #   If your subnet has the `AssignIpv6AddressOnCreation` attribute set,
+    #   you can override that setting by specifying 0 as the IPv6 address
+    #   count.
     # @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.
+    #   The IPv6 addresses from the IPv6 CIDR block range of your subnet.
+    #
+    #   You can't specify IPv6 addresses using this parameter if you've
+    #   specified one of the following: a count of IPv6 addresses, specific
+    #   IPv6 prefixes, or a count of IPv6 prefixes.
     # @option options [String] :private_ip_address
     #   The primary private IPv4 address of the network interface. If you
     #   don't specify an IPv4 address, Amazon EC2 selects one for you from
@@ -894,7 +901,11 @@ module Aws::EC2
     #   cannot indicate any IP addresses specified in `privateIpAddresses` as
     #   primary (only one IP address can be designated as primary).
     # @option options [Array<Types::PrivateIpAddressSpecification>] :private_ip_addresses
-    #   One or more private IPv4 addresses.
+    #   The private IPv4 addresses.
+    #
+    #   You can't specify private IPv4 addresses if you've specified one of
+    #   the following: a count of private IPv4 addresses, specific IPv4
+    #   prefixes, or a count of IPv4 prefixes.
     # @option options [Integer] :secondary_private_ip_address_count
     #   The number of secondary private IPv4 addresses to assign to a network
     #   interface. When you specify a number of secondary IPv4 addresses,
@@ -902,28 +913,35 @@ module Aws::EC2
     #   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 [IP Addresses Per
-    #   ENI Per Instance Type][1] in the *Amazon Virtual Private Cloud User
-    #   Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
+    #   You can't specify a count of private IPv4 addresses if you've
+    #   specified one of the following: specific private IPv4 addresses,
+    #   specific IPv4 prefixes, or a count of IPv4 prefixes.
     # @option options [Array<Types::Ipv4PrefixSpecificationRequest>] :ipv_4_prefixes
-    #   One or more IPv4 prefixes assigned to the network interface. You
-    #   cannot use this option if you use the `Ipv4PrefixCount` option.
+    #   The IPv4 prefixes assigned to the network interface.
+    #
+    #   You can't specify IPv4 prefixes if you've specified one of the
+    #   following: a count of IPv4 prefixes, specific private IPv4 addresses,
+    #   or a count of private IPv4 addresses.
     # @option options [Integer] :ipv_4_prefix_count
     #   The number of IPv4 prefixes that Amazon Web Services automatically
-    #   assigns to the network interface. You cannot use this option if you
-    #   use the `Ipv4 Prefixes` option.
+    #   assigns to the network interface.
+    #
+    #   You can't specify a count of IPv4 prefixes if you've specified one
+    #   of the following: specific IPv4 prefixes, specific private IPv4
+    #   addresses, or a count of private IPv4 addresses.
     # @option options [Array<Types::Ipv6PrefixSpecificationRequest>] :ipv_6_prefixes
-    #   One or more IPv6 prefixes assigned to the network interface. You
-    #   cannot use this option if you use the `Ipv6PrefixCount` option.
+    #   The IPv6 prefixes assigned to the network interface.
+    #
+    #   You can't specify IPv6 prefixes if you've specified one of the
+    #   following: a count of IPv6 prefixes, specific IPv6 addresses, or a
+    #   count of IPv6 addresses.
     # @option options [Integer] :ipv_6_prefix_count
     #   The number of IPv6 prefixes that Amazon Web Services automatically
-    #   assigns to the network interface. You cannot use this option if you
-    #   use the `Ipv6Prefixes` option.
+    #   assigns to the network interface.
+    #
+    #   You can't specify a count of IPv6 prefixes if you've specified one
+    #   of the following: specific IPv6 prefixes, specific IPv6 addresses, or
+    #   a count of IPv6 addresses.
     # @option options [String] :interface_type
     #   The type of network interface. The default is `interface`.
     #
@@ -1581,7 +1599,7 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Array<String>] :network_interface_ids
-    #   One or more network interface IDs.
+    #   The network interface IDs.
     #
     #   Default: Describes all your network interfaces.
     # @return [NetworkInterface::Collection]