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

Sign up to get free protection for your applications and to get access to all the features.
@@ -44,19 +44,24 @@ module Aws
44
44
  data.state
45
45
  end
46
46
 
47
- # The private DNS name assigned to the instance. This DNS name can only
48
- # be used inside the Amazon EC2 network. This name is not available
49
- # until the instance enters the `running` state. For EC2-VPC, this name
50
- # is only available if you've enabled DNS hostnames for your VPC.
47
+ # (IPv4 only) The private DNS hostname name assigned to the instance.
48
+ # This DNS hostname can only be used inside the Amazon EC2 network. This
49
+ # name is not available until the instance enters the `running` state.
50
+ #
51
+ # \[EC2-VPC\] The Amazon-provided DNS server will resolve
52
+ # Amazon-provided private DNS hostnames if you've enabled DNS
53
+ # resolution and DNS hostnames in your VPC. If you are not using the
54
+ # Amazon-provided DNS server in your VPC, your custom domain name
55
+ # servers must resolve the hostname as appropriate.
51
56
  # @return [String]
52
57
  def private_dns_name
53
58
  data.private_dns_name
54
59
  end
55
60
 
56
- # The public DNS name assigned to the instance. This name is not
57
- # available until the instance enters the `running` state. For EC2-VPC,
58
- # this name is only available if you've enabled DNS hostnames for your
59
- # VPC.
61
+ # (IPv4 only) The public DNS name assigned to the instance. This name is
62
+ # not available until the instance enters the `running` state. For
63
+ # EC2-VPC, this name is only available if you've enabled DNS hostnames
64
+ # for your VPC.
60
65
  # @return [String]
61
66
  def public_dns_name
62
67
  data.public_dns_name
@@ -125,7 +130,7 @@ module Aws
125
130
  data.platform
126
131
  end
127
132
 
128
- # The monitoring information for the instance.
133
+ # The monitoring for the instance.
129
134
  # @return [Types::Monitoring]
130
135
  def monitoring
131
136
  data.monitoring
@@ -143,13 +148,13 @@ module Aws
143
148
  data.vpc_id
144
149
  end
145
150
 
146
- # The private IP address assigned to the instance.
151
+ # The private IPv4 address assigned to the instance.
147
152
  # @return [String]
148
153
  def private_ip_address
149
154
  data.private_ip_address
150
155
  end
151
156
 
152
- # The public IP address assigned to the instance, if applicable.
157
+ # The public IPv4 address assigned to the instance, if applicable.
153
158
  # @return [String]
154
159
  def public_ip_address
155
160
  data.public_ip_address
@@ -107,7 +107,8 @@ module Aws
107
107
  # protocol: "String", # required
108
108
  # rule_action: "allow", # required, accepts allow, deny
109
109
  # egress: false, # required
110
- # cidr_block: "String", # required
110
+ # cidr_block: "String",
111
+ # ipv_6_cidr_block: "String",
111
112
  # icmp_type_code: {
112
113
  # type: 1,
113
114
  # code: 1,
@@ -130,18 +131,29 @@ module Aws
130
131
  # Constraints: Positive integer from 1 to 32766. The range 32767 to
131
132
  # 65535 is reserved for internal use.
132
133
  # @option options [required, String] :protocol
133
- # The protocol. A value of -1 means all protocols.
134
+ # The protocol. A value of `-1` or `all` means all protocols. If you
135
+ # specify `all`, `-1`, or a protocol number other than `tcp`, `udp`, or
136
+ # `icmp`, traffic on all ports is allowed, regardless of any ports or
137
+ # ICMP types or codes you specify. If you specify protocol `58` (ICMPv6)
138
+ # and specify an IPv4 CIDR block, traffic for all ICMP types and codes
139
+ # allowed, regardless of any that you specify. If you specify protocol
140
+ # `58` (ICMPv6) and specify an IPv6 CIDR block, you must specify an ICMP
141
+ # type and code.
134
142
  # @option options [required, String] :rule_action
135
143
  # Indicates whether to allow or deny the traffic that matches the rule.
136
144
  # @option options [required, Boolean] :egress
137
145
  # Indicates whether this is an egress rule (rule is applied to traffic
138
146
  # leaving the subnet).
139
- # @option options [required, String] :cidr_block
140
- # The network range to allow or deny, in CIDR notation (for example
147
+ # @option options [String] :cidr_block
148
+ # The IPv4 network range to allow or deny, in CIDR notation (for example
141
149
  # `172.16.0.0/24`).
150
+ # @option options [String] :ipv_6_cidr_block
151
+ # The IPv6 network range to allow or deny, in CIDR notation (for example
152
+ # `2001:db8:1234:1a00::/64`).
142
153
  # @option options [Types::IcmpTypeCode] :icmp_type_code
143
- # ICMP protocol: The ICMP type and code. Required if specifying ICMP for
144
- # the protocol.
154
+ # ICMP protocol: The ICMP or ICMPv6 type and code. Required if
155
+ # specifying the ICMP protocol, or protocol 58 (ICMPv6) with an IPv6
156
+ # CIDR block.
145
157
  # @option options [Types::PortRange] :port_range
146
158
  # TCP or UDP protocols: The range of ports the rule applies to.
147
159
  # @return [EmptyStructure]
@@ -260,7 +272,8 @@ module Aws
260
272
  # protocol: "String", # required
261
273
  # rule_action: "allow", # required, accepts allow, deny
262
274
  # egress: false, # required
263
- # cidr_block: "String", # required
275
+ # cidr_block: "String",
276
+ # ipv_6_cidr_block: "String",
264
277
  # icmp_type_code: {
265
278
  # type: 1,
266
279
  # code: 1,
@@ -280,20 +293,32 @@ module Aws
280
293
  # The rule number of the entry to replace.
281
294
  # @option options [required, String] :protocol
282
295
  # The IP protocol. You can specify `all` or `-1` to mean all protocols.
296
+ # If you specify `all`, `-1`, or a protocol number other than `tcp`,
297
+ # `udp`, or `icmp`, traffic on all ports is allowed, regardless of any
298
+ # ports or ICMP types or codes you specify. If you specify protocol `58`
299
+ # (ICMPv6) and specify an IPv4 CIDR block, traffic for all ICMP types
300
+ # and codes allowed, regardless of any that you specify. If you specify
301
+ # protocol `58` (ICMPv6) and specify an IPv6 CIDR block, you must
302
+ # specify an ICMP type and code.
283
303
  # @option options [required, String] :rule_action
284
304
  # Indicates whether to allow or deny the traffic that matches the rule.
285
305
  # @option options [required, Boolean] :egress
286
306
  # Indicates whether to replace the egress rule.
287
307
  #
288
308
  # Default: If no value is specified, we replace the ingress rule.
289
- # @option options [required, String] :cidr_block
290
- # The network range to allow or deny, in CIDR notation.
309
+ # @option options [String] :cidr_block
310
+ # The IPv4 network range to allow or deny, in CIDR notation (for example
311
+ # `172.16.0.0/24`).
312
+ # @option options [String] :ipv_6_cidr_block
313
+ # The IPv6 network range to allow or deny, in CIDR notation (for example
314
+ # `2001:bd8:1234:1a00::/64`).
291
315
  # @option options [Types::IcmpTypeCode] :icmp_type_code
292
- # ICMP protocol: The ICMP type and code. Required if specifying 1 (ICMP)
293
- # for the protocol.
316
+ # ICMP protocol: The ICMP or ICMPv6 type and code. Required if
317
+ # specifying the ICMP (1) protocol, or protocol 58 (ICMPv6) with an IPv6
318
+ # CIDR block.
294
319
  # @option options [Types::PortRange] :port_range
295
320
  # TCP or UDP protocols: The range of ports the rule applies to. Required
296
- # if specifying 6 (TCP) or 17 (UDP) for the protocol.
321
+ # if specifying TCP (6) or UDP (17) for the protocol.
297
322
  # @return [EmptyStructure]
298
323
  def replace_entry(options = {})
299
324
  options = options.merge(network_acl_id: @id)
@@ -87,7 +87,7 @@ module Aws
87
87
  data.mac_address
88
88
  end
89
89
 
90
- # The IP address of the network interface within the subnet.
90
+ # The IPv4 address of the network interface within the subnet.
91
91
  # @return [String]
92
92
  def private_ip_address
93
93
  data.private_ip_address
@@ -123,12 +123,18 @@ module Aws
123
123
  data.tag_set
124
124
  end
125
125
 
126
- # The private IP addresses associated with the network interface.
126
+ # The private IPv4 addresses associated with the network interface.
127
127
  # @return [Array<Types::NetworkInterfacePrivateIpAddress>]
128
128
  def private_ip_addresses
129
129
  data.private_ip_addresses
130
130
  end
131
131
 
132
+ # The IPv6 addresses associated with the network interface.
133
+ # @return [Array<Types::NetworkInterfaceIpv6Address>]
134
+ def ipv_6_addresses
135
+ data.ipv_6_addresses
136
+ end
137
+
132
138
  # The type of interface.
133
139
  # @return [String]
134
140
  def interface_type
@@ -131,6 +131,18 @@ module Aws
131
131
  #
132
132
  # * `architecture` - The instance architecture (`i386` \| `x86_64`).
133
133
  #
134
+ # * `association.public-ip` - The address of the Elastic IP address
135
+ # (IPv4) bound to the network interface.
136
+ #
137
+ # * `association.ip-owner-id` - The owner of the Elastic IP address
138
+ # (IPv4) associated with the network interface.
139
+ #
140
+ # * `association.allocation-id` - The allocation ID returned when you
141
+ # allocated the Elastic IP address (IPv4) for your network interface.
142
+ #
143
+ # * `association.association-id` - The association ID returned when the
144
+ # network interface was associated with an IPv4 address.
145
+ #
134
146
  # * `availability-zone` - The Availability Zone of the instance.
135
147
  #
136
148
  # * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -191,7 +203,7 @@ module Aws
191
203
  # * `instance.group-name` - The name of the security group for the
192
204
  # instance.
193
205
  #
194
- # * `ip-address` - The public IP address of the instance.
206
+ # * `ip-address` - The public IPv4 address of the instance.
195
207
  #
196
208
  # * `kernel-id` - The kernel ID.
197
209
  #
@@ -204,8 +216,91 @@ module Aws
204
216
  #
205
217
  # * `launch-time` - The time when the instance was launched.
206
218
  #
207
- # * `monitoring-state` - Indicates whether monitoring is enabled for the
208
- # instance (`disabled` \| `enabled`).
219
+ # * `monitoring-state` - Indicates whether detailed monitoring is
220
+ # enabled (`disabled` \| `enabled`).
221
+ #
222
+ # * `network-interface.addresses.private-ip-address` - The private IPv4
223
+ # address associated with the network interface.
224
+ #
225
+ # * `network-interface.addresses.primary` - Specifies whether the IPv4
226
+ # address of the network interface is the primary private IPv4
227
+ # address.
228
+ #
229
+ # * `network-interface.addresses.association.public-ip` - The ID of the
230
+ # association of an Elastic IP address (IPv4) with a network
231
+ # interface.
232
+ #
233
+ # * `network-interface.addresses.association.ip-owner-id` - The owner ID
234
+ # of the private IPv4 address associated with the network interface.
235
+ #
236
+ # * `network-interface.attachment.attachment-id` - The ID of the
237
+ # interface attachment.
238
+ #
239
+ # * `network-interface.attachment.instance-id` - The ID of the instance
240
+ # to which the network interface is attached.
241
+ #
242
+ # * `network-interface.attachment.instance-owner-id` - The owner ID of
243
+ # the instance to which the network interface is attached.
244
+ #
245
+ # * `network-interface.attachment.device-index` - The device index to
246
+ # which the network interface is attached.
247
+ #
248
+ # * `network-interface.attachment.status` - The status of the attachment
249
+ # (`attaching` \| `attached` \| `detaching` \| `detached`).
250
+ #
251
+ # * `network-interface.attachment.attach-time` - The time that the
252
+ # network interface was attached to an instance.
253
+ #
254
+ # * `network-interface.attachment.delete-on-termination` - Specifies
255
+ # whether the attachment is deleted when an instance is terminated.
256
+ #
257
+ # * `network-interface.availability-zone` - The Availability Zone for
258
+ # the network interface.
259
+ #
260
+ # * `network-interface.description` - The description of the network
261
+ # interface.
262
+ #
263
+ # * `network-interface.group-id` - The ID of a security group associated
264
+ # with the network interface.
265
+ #
266
+ # * `network-interface.group-name` - The name of a security group
267
+ # associated with the network interface.
268
+ #
269
+ # * `network-interface.ipv6-addresses.ipv6-address` - The IPv6 address
270
+ # associated with the network interface.
271
+ #
272
+ # * `network-interface.mac-address` - The MAC address of the network
273
+ # interface.
274
+ #
275
+ # * `network-interface.network-interface-id` - The ID of the network
276
+ # interface.
277
+ #
278
+ # * `network-interface.owner-id` - The ID of the owner of the network
279
+ # interface.
280
+ #
281
+ # * `network-interface.private-dns-name` - The private DNS name of the
282
+ # network interface.
283
+ #
284
+ # * `network-interface.requester-id` - The requester ID for the network
285
+ # interface.
286
+ #
287
+ # * `network-interface.requester-managed` - Indicates whether the
288
+ # network interface is being managed by AWS.
289
+ #
290
+ # * `network-interface.status` - The status of the network interface
291
+ # (`available`) \| `in-use`).
292
+ #
293
+ # * `network-interface.source-dest-check` - Whether the network
294
+ # interface performs source/destination checking. A value of `true`
295
+ # means checking is enabled, and `false` means checking is disabled.
296
+ # The value must be `false` for the network interface to perform
297
+ # network address translation (NAT) in your VPC.
298
+ #
299
+ # * `network-interface.subnet-id` - The ID of the subnet for the network
300
+ # interface.
301
+ #
302
+ # * `network-interface.vpc-id` - The ID of the VPC for the network
303
+ # interface.
209
304
  #
210
305
  # * `owner-id` - The AWS account ID of the instance owner.
211
306
  #
@@ -215,9 +310,9 @@ module Aws
215
310
  # * `platform` - The platform. Use `windows` if you have Windows
216
311
  # instances; otherwise, leave blank.
217
312
  #
218
- # * `private-dns-name` - The private DNS name of the instance.
313
+ # * `private-dns-name` - The private IPv4 DNS name of the instance.
219
314
  #
220
- # * `private-ip-address` - The private IP address of the instance.
315
+ # * `private-ip-address` - The private IPv4 address of the instance.
221
316
  #
222
317
  # * `product-code` - The product code associated with the AMI used to
223
318
  # launch the instance.
@@ -285,96 +380,6 @@ module Aws
285
380
  # (`paravirtual` \| `hvm`).
286
381
  #
287
382
  # * `vpc-id` - The ID of the VPC that the instance is running in.
288
- #
289
- # * `network-interface.description` - The description of the network
290
- # interface.
291
- #
292
- # * `network-interface.subnet-id` - The ID of the subnet for the network
293
- # interface.
294
- #
295
- # * `network-interface.vpc-id` - The ID of the VPC for the network
296
- # interface.
297
- #
298
- # * `network-interface.network-interface-id` - The ID of the network
299
- # interface.
300
- #
301
- # * `network-interface.owner-id` - The ID of the owner of the network
302
- # interface.
303
- #
304
- # * `network-interface.availability-zone` - The Availability Zone for
305
- # the network interface.
306
- #
307
- # * `network-interface.requester-id` - The requester ID for the network
308
- # interface.
309
- #
310
- # * `network-interface.requester-managed` - Indicates whether the
311
- # network interface is being managed by AWS.
312
- #
313
- # * `network-interface.status` - The status of the network interface
314
- # (`available`) \| `in-use`).
315
- #
316
- # * `network-interface.mac-address` - The MAC address of the network
317
- # interface.
318
- #
319
- # * `network-interface.private-dns-name` - The private DNS name of the
320
- # network interface.
321
- #
322
- # * `network-interface.source-dest-check` - Whether the network
323
- # interface performs source/destination checking. A value of `true`
324
- # means checking is enabled, and `false` means checking is disabled.
325
- # The value must be `false` for the network interface to perform
326
- # network address translation (NAT) in your VPC.
327
- #
328
- # * `network-interface.group-id` - The ID of a security group associated
329
- # with the network interface.
330
- #
331
- # * `network-interface.group-name` - The name of a security group
332
- # associated with the network interface.
333
- #
334
- # * `network-interface.attachment.attachment-id` - The ID of the
335
- # interface attachment.
336
- #
337
- # * `network-interface.attachment.instance-id` - The ID of the instance
338
- # to which the network interface is attached.
339
- #
340
- # * `network-interface.attachment.instance-owner-id` - The owner ID of
341
- # the instance to which the network interface is attached.
342
- #
343
- # * `network-interface.addresses.private-ip-address` - The private IP
344
- # address associated with the network interface.
345
- #
346
- # * `network-interface.attachment.device-index` - The device index to
347
- # which the network interface is attached.
348
- #
349
- # * `network-interface.attachment.status` - The status of the attachment
350
- # (`attaching` \| `attached` \| `detaching` \| `detached`).
351
- #
352
- # * `network-interface.attachment.attach-time` - The time that the
353
- # network interface was attached to an instance.
354
- #
355
- # * `network-interface.attachment.delete-on-termination` - Specifies
356
- # whether the attachment is deleted when an instance is terminated.
357
- #
358
- # * `network-interface.addresses.primary` - Specifies whether the IP
359
- # address of the network interface is the primary private IP address.
360
- #
361
- # * `network-interface.addresses.association.public-ip` - The ID of the
362
- # association of an Elastic IP address with a network interface.
363
- #
364
- # * `network-interface.addresses.association.ip-owner-id` - The owner ID
365
- # of the private IP address associated with the network interface.
366
- #
367
- # * `association.public-ip` - The address of the Elastic IP address
368
- # bound to the network interface.
369
- #
370
- # * `association.ip-owner-id` - The owner of the Elastic IP address
371
- # associated with the network interface.
372
- #
373
- # * `association.allocation-id` - The allocation ID returned when you
374
- # allocated the Elastic IP address for your network interface.
375
- #
376
- # * `association.association-id` - The association ID returned when the
377
- # network interface was associated with an IP address.
378
383
  # @return [Instance::Collection]
379
384
  def instances(options = {})
380
385
  batches = Enumerator.new do |y|
@@ -62,7 +62,7 @@ module Aws
62
62
  # security_groups: ["String"],
63
63
  # security_group_ids: ["String"],
64
64
  # user_data: "String",
65
- # 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
65
+ # 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
66
66
  # placement: {
67
67
  # availability_zone: "String",
68
68
  # group_name: "String",
@@ -94,6 +94,12 @@ module Aws
94
94
  # disable_api_termination: false,
95
95
  # instance_initiated_shutdown_behavior: "stop", # accepts stop, terminate
96
96
  # private_ip_address: "String",
97
+ # ipv_6_addresses: [
98
+ # {
99
+ # ipv_6_address: "String",
100
+ # },
101
+ # ],
102
+ # ipv_6_address_count: 1,
97
103
  # client_token: "String",
98
104
  # additional_info: "String",
99
105
  # network_interfaces: [
@@ -113,6 +119,12 @@ module Aws
113
119
  # ],
114
120
  # secondary_private_ip_address_count: 1,
115
121
  # associate_public_ip_address: false,
122
+ # ipv_6_addresses: [
123
+ # {
124
+ # ipv_6_address: "String",
125
+ # },
126
+ # ],
127
+ # ipv_6_address_count: 1,
116
128
  # },
117
129
  # ],
118
130
  # iam_instance_profile: {
@@ -231,10 +243,8 @@ module Aws
231
243
  # \[EC2-VPC\] The ID of the subnet to launch the instance into.
232
244
  # @option options [Boolean] :disable_api_termination
233
245
  # If you set this parameter to `true`, you can't terminate the instance
234
- # using the Amazon EC2 console, CLI, or API; otherwise, you can. If you
235
- # set this parameter to `true` and then later want to be able to
236
- # terminate the instance, you must first change the value of the
237
- # `disableApiTermination` attribute to `false` using
246
+ # using the Amazon EC2 console, CLI, or API; otherwise, you can. To
247
+ # change this attribute to `false` after launch, use
238
248
  # ModifyInstanceAttribute. Alternatively, if you set
239
249
  # `InstanceInitiatedShutdownBehavior` to `terminate`, you can terminate
240
250
  # the instance by running the shutdown command from the instance.
@@ -247,19 +257,27 @@ module Aws
247
257
  #
248
258
  # Default: `stop`
249
259
  # @option options [String] :private_ip_address
250
- # \[EC2-VPC\] The primary IP address. You must specify a value from the
251
- # IP address range of the subnet.
252
- #
253
- # Only one private IP address can be designated as primary. Therefore,
254
- # you can't specify this parameter if `PrivateIpAddresses.n.Primary` is
255
- # set to `true` and `PrivateIpAddresses.n.PrivateIpAddress` is set to an
256
- # IP address.
257
- #
258
- # You cannot specify this option if you're launching more than one
259
- # instance in the request.
260
- #
261
- # Default: We select an IP address from the IP address range of the
262
- # subnet.
260
+ # \[EC2-VPC\] The primary IPv4 address. You must specify a value from
261
+ # the IPv4 address range of the subnet.
262
+ #
263
+ # Only one private IP address can be designated as primary. You can't
264
+ # specify this option if you've specified the option to designate a
265
+ # private IP address as the primary IP address in a network interface
266
+ # specification. You cannot specify this option if you're launching
267
+ # more than one instance in the request.
268
+ # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
269
+ # \[EC2-VPC\] Specify one or more IPv6 addresses from the range of the
270
+ # subnet to associate with the primary network interface. You cannot
271
+ # specify this option and the option to assign a number of IPv6
272
+ # addresses in the same request. You cannot specify this option if
273
+ # you've specified a minimum number of instances to launch.
274
+ # @option options [Integer] :ipv_6_address_count
275
+ # \[EC2-VPC\] A number of IPv6 addresses to associate with the primary
276
+ # network interface. Amazon EC2 chooses the IPv6 addresses from the
277
+ # range of your subnet. You cannot specify this option and the option to
278
+ # assign specific IPv6 addresses in the same request. You can specify
279
+ # this option if you've specified a minimum number of instances to
280
+ # launch.
263
281
  # @option options [String] :client_token
264
282
  # Unique, case-sensitive identifier you provide to ensure the
265
283
  # idempotency of the request. For more information, see [Ensuring
@@ -383,6 +401,12 @@ module Aws
383
401
  # },
384
402
  # ],
385
403
  # secondary_private_ip_address_count: 1,
404
+ # ipv_6_addresses: [
405
+ # {
406
+ # ipv_6_address: "String",
407
+ # },
408
+ # ],
409
+ # ipv_6_address_count: 1,
386
410
  # dry_run: false,
387
411
  # })
388
412
  # @param [Hash] options ({})
@@ -391,30 +415,40 @@ module Aws
391
415
  # @option options [String] :description
392
416
  # A description for the network interface.
393
417
  # @option options [String] :private_ip_address
394
- # The primary private IP address of the network interface. If you don't
395
- # specify an IP address, Amazon EC2 selects one for you from the subnet
396
- # range. If you specify an IP address, you cannot indicate any IP
397
- # addresses specified in `privateIpAddresses` as primary (only one IP
398
- # address can be designated as primary).
418
+ # The primary private IPv4 address of the network interface. If you
419
+ # don't specify an IPv4 address, Amazon EC2 selects one for you from
420
+ # the subnet's IPv4 CIDR range. If you specify an IP address, you
421
+ # cannot indicate any IP addresses specified in `privateIpAddresses` as
422
+ # primary (only one IP address can be designated as primary).
399
423
  # @option options [Array<String>] :groups
400
424
  # The IDs of one or more security groups.
401
425
  # @option options [Array<Types::PrivateIpAddressSpecification>] :private_ip_addresses
402
- # One or more private IP addresses.
426
+ # One or more private IPv4 addresses.
403
427
  # @option options [Integer] :secondary_private_ip_address_count
404
- # The number of secondary private IP addresses to assign to a network
405
- # interface. When you specify a number of secondary IP addresses, Amazon
406
- # EC2 selects these IP addresses within the subnet range. You can't
407
- # specify this option and specify more than one private IP address using
408
- # `privateIpAddresses`.
428
+ # The number of secondary private IPv4 addresses to assign to a network
429
+ # interface. When you specify a number of secondary IPv4 addresses,
430
+ # Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR
431
+ # range. You can't specify this option and specify more than one
432
+ # private IP address using `privateIpAddresses`.
409
433
  #
410
434
  # The number of IP addresses you can assign to a network interface
411
- # varies by instance type. For more information, see [Private IP
412
- # Addresses Per ENI Per Instance Type][1] in the *Amazon Elastic Compute
413
- # Cloud User Guide*.
435
+ # varies by instance type. For more information, see [IP Addresses Per
436
+ # ENI Per Instance Type][1] in the *Amazon Virtual Private Cloud User
437
+ # Guide*.
414
438
  #
415
439
  #
416
440
  #
417
441
  # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
442
+ # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
443
+ # One or more specific IPv6 addresses from the IPv6 CIDR block range of
444
+ # your subnet. You can't use this option if you're specifying a number
445
+ # of IPv6 addresses.
446
+ # @option options [Integer] :ipv_6_address_count
447
+ # The number of IPv6 addresses to assign to a network interface. Amazon
448
+ # EC2 automatically selects the IPv6 addresses from the subnet range.
449
+ # You can't use this option if specifying specific IPv6 addresses. If
450
+ # your subnet has the `AssignIpv6AddressOnCreation` attribute set to
451
+ # `true`, you can specify `0` to override this setting.
418
452
  # @option options [Boolean] :dry_run
419
453
  # Checks whether you have the required permissions for the action,
420
454
  # without actually making the request, and provides an error response.
@@ -558,6 +592,7 @@ module Aws
558
592
  # dry_run: false,
559
593
  # vpc_id: "String", # required
560
594
  # cidr_block: "String", # required
595
+ # ipv_6_cidr_block: "String",
561
596
  # availability_zone: "String",
562
597
  # })
563
598
  # @param [Hash] options ({})
@@ -569,8 +604,11 @@ module Aws
569
604
  # @option options [required, String] :vpc_id
570
605
  # The ID of the VPC.
571
606
  # @option options [required, String] :cidr_block
572
- # The network range for the subnet, in CIDR notation. For example,
607
+ # The IPv4 network range for the subnet, in CIDR notation. For example,
573
608
  # `10.0.0.0/24`.
609
+ # @option options [String] :ipv_6_cidr_block
610
+ # The IPv6 network range for the subnet, in CIDR notation. The subnet
611
+ # size must use a /64 prefix length.
574
612
  # @option options [String] :availability_zone
575
613
  # The Availability Zone for the subnet.
576
614
  #
@@ -660,7 +698,7 @@ module Aws
660
698
  # @option options [Integer] :iops
661
699
  # Only valid for Provisioned IOPS SSD volumes. The number of I/O
662
700
  # operations per second (IOPS) to provision for the volume, with a
663
- # maximum ratio of 30 IOPS/GiB.
701
+ # maximum ratio of 50 IOPS/GiB.
664
702
  #
665
703
  # Constraint: Range is 100 to 20000 for Provisioned IOPS SSD volumes
666
704
  # @option options [Boolean] :encrypted
@@ -702,6 +740,7 @@ module Aws
702
740
  # dry_run: false,
703
741
  # cidr_block: "String", # required
704
742
  # instance_tenancy: "default", # accepts default, dedicated, host
743
+ # amazon_provided_ipv_6_cidr_block: false,
705
744
  # })
706
745
  # @param [Hash] options ({})
707
746
  # @option options [Boolean] :dry_run
@@ -710,7 +749,7 @@ module Aws
710
749
  # If you have the required permissions, the error response is
711
750
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
712
751
  # @option options [required, String] :cidr_block
713
- # The network range for the VPC, in CIDR notation. For example,
752
+ # The IPv4 network range for the VPC, in CIDR notation. For example,
714
753
  # `10.0.0.0/16`.
715
754
  # @option options [String] :instance_tenancy
716
755
  # The tenancy options for instances launched into the VPC. For
@@ -724,6 +763,10 @@ module Aws
724
763
  # Use the `default` or `dedicated` values only.
725
764
  #
726
765
  # Default: `default`
766
+ # @option options [Boolean] :amazon_provided_ipv_6_cidr_block
767
+ # Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length
768
+ # for the VPC. You cannot specify the range of IP addresses, or the size
769
+ # of the CIDR block.
727
770
  # @return [Vpc]
728
771
  def create_vpc(options = {})
729
772
  resp = @client.create_vpc(options)
@@ -1112,6 +1155,9 @@ module Aws
1112
1155
  # * `description` - The description of the image (provided during image
1113
1156
  # creation).
1114
1157
  #
1158
+ # * `ena-support` - A Boolean that indicates whether enhanced networking
1159
+ # with ENA is enabled.
1160
+ #
1115
1161
  # * `hypervisor` - The hypervisor type (`ovm` \| `xen`).
1116
1162
  #
1117
1163
  # * `image-id` - The ID of the image.
@@ -1228,6 +1274,18 @@ module Aws
1228
1274
  #
1229
1275
  # * `architecture` - The instance architecture (`i386` \| `x86_64`).
1230
1276
  #
1277
+ # * `association.public-ip` - The address of the Elastic IP address
1278
+ # (IPv4) bound to the network interface.
1279
+ #
1280
+ # * `association.ip-owner-id` - The owner of the Elastic IP address
1281
+ # (IPv4) associated with the network interface.
1282
+ #
1283
+ # * `association.allocation-id` - The allocation ID returned when you
1284
+ # allocated the Elastic IP address (IPv4) for your network interface.
1285
+ #
1286
+ # * `association.association-id` - The association ID returned when the
1287
+ # network interface was associated with an IPv4 address.
1288
+ #
1231
1289
  # * `availability-zone` - The Availability Zone of the instance.
1232
1290
  #
1233
1291
  # * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -1288,7 +1346,7 @@ module Aws
1288
1346
  # * `instance.group-name` - The name of the security group for the
1289
1347
  # instance.
1290
1348
  #
1291
- # * `ip-address` - The public IP address of the instance.
1349
+ # * `ip-address` - The public IPv4 address of the instance.
1292
1350
  #
1293
1351
  # * `kernel-id` - The kernel ID.
1294
1352
  #
@@ -1301,8 +1359,91 @@ module Aws
1301
1359
  #
1302
1360
  # * `launch-time` - The time when the instance was launched.
1303
1361
  #
1304
- # * `monitoring-state` - Indicates whether monitoring is enabled for the
1305
- # instance (`disabled` \| `enabled`).
1362
+ # * `monitoring-state` - Indicates whether detailed monitoring is
1363
+ # enabled (`disabled` \| `enabled`).
1364
+ #
1365
+ # * `network-interface.addresses.private-ip-address` - The private IPv4
1366
+ # address associated with the network interface.
1367
+ #
1368
+ # * `network-interface.addresses.primary` - Specifies whether the IPv4
1369
+ # address of the network interface is the primary private IPv4
1370
+ # address.
1371
+ #
1372
+ # * `network-interface.addresses.association.public-ip` - The ID of the
1373
+ # association of an Elastic IP address (IPv4) with a network
1374
+ # interface.
1375
+ #
1376
+ # * `network-interface.addresses.association.ip-owner-id` - The owner ID
1377
+ # of the private IPv4 address associated with the network interface.
1378
+ #
1379
+ # * `network-interface.attachment.attachment-id` - The ID of the
1380
+ # interface attachment.
1381
+ #
1382
+ # * `network-interface.attachment.instance-id` - The ID of the instance
1383
+ # to which the network interface is attached.
1384
+ #
1385
+ # * `network-interface.attachment.instance-owner-id` - The owner ID of
1386
+ # the instance to which the network interface is attached.
1387
+ #
1388
+ # * `network-interface.attachment.device-index` - The device index to
1389
+ # which the network interface is attached.
1390
+ #
1391
+ # * `network-interface.attachment.status` - The status of the attachment
1392
+ # (`attaching` \| `attached` \| `detaching` \| `detached`).
1393
+ #
1394
+ # * `network-interface.attachment.attach-time` - The time that the
1395
+ # network interface was attached to an instance.
1396
+ #
1397
+ # * `network-interface.attachment.delete-on-termination` - Specifies
1398
+ # whether the attachment is deleted when an instance is terminated.
1399
+ #
1400
+ # * `network-interface.availability-zone` - The Availability Zone for
1401
+ # the network interface.
1402
+ #
1403
+ # * `network-interface.description` - The description of the network
1404
+ # interface.
1405
+ #
1406
+ # * `network-interface.group-id` - The ID of a security group associated
1407
+ # with the network interface.
1408
+ #
1409
+ # * `network-interface.group-name` - The name of a security group
1410
+ # associated with the network interface.
1411
+ #
1412
+ # * `network-interface.ipv6-addresses.ipv6-address` - The IPv6 address
1413
+ # associated with the network interface.
1414
+ #
1415
+ # * `network-interface.mac-address` - The MAC address of the network
1416
+ # interface.
1417
+ #
1418
+ # * `network-interface.network-interface-id` - The ID of the network
1419
+ # interface.
1420
+ #
1421
+ # * `network-interface.owner-id` - The ID of the owner of the network
1422
+ # interface.
1423
+ #
1424
+ # * `network-interface.private-dns-name` - The private DNS name of the
1425
+ # network interface.
1426
+ #
1427
+ # * `network-interface.requester-id` - The requester ID for the network
1428
+ # interface.
1429
+ #
1430
+ # * `network-interface.requester-managed` - Indicates whether the
1431
+ # network interface is being managed by AWS.
1432
+ #
1433
+ # * `network-interface.status` - The status of the network interface
1434
+ # (`available`) \| `in-use`).
1435
+ #
1436
+ # * `network-interface.source-dest-check` - Whether the network
1437
+ # interface performs source/destination checking. A value of `true`
1438
+ # means checking is enabled, and `false` means checking is disabled.
1439
+ # The value must be `false` for the network interface to perform
1440
+ # network address translation (NAT) in your VPC.
1441
+ #
1442
+ # * `network-interface.subnet-id` - The ID of the subnet for the network
1443
+ # interface.
1444
+ #
1445
+ # * `network-interface.vpc-id` - The ID of the VPC for the network
1446
+ # interface.
1306
1447
  #
1307
1448
  # * `owner-id` - The AWS account ID of the instance owner.
1308
1449
  #
@@ -1312,9 +1453,9 @@ module Aws
1312
1453
  # * `platform` - The platform. Use `windows` if you have Windows
1313
1454
  # instances; otherwise, leave blank.
1314
1455
  #
1315
- # * `private-dns-name` - The private DNS name of the instance.
1456
+ # * `private-dns-name` - The private IPv4 DNS name of the instance.
1316
1457
  #
1317
- # * `private-ip-address` - The private IP address of the instance.
1458
+ # * `private-ip-address` - The private IPv4 address of the instance.
1318
1459
  #
1319
1460
  # * `product-code` - The product code associated with the AMI used to
1320
1461
  # launch the instance.
@@ -1382,96 +1523,6 @@ module Aws
1382
1523
  # (`paravirtual` \| `hvm`).
1383
1524
  #
1384
1525
  # * `vpc-id` - The ID of the VPC that the instance is running in.
1385
- #
1386
- # * `network-interface.description` - The description of the network
1387
- # interface.
1388
- #
1389
- # * `network-interface.subnet-id` - The ID of the subnet for the network
1390
- # interface.
1391
- #
1392
- # * `network-interface.vpc-id` - The ID of the VPC for the network
1393
- # interface.
1394
- #
1395
- # * `network-interface.network-interface-id` - The ID of the network
1396
- # interface.
1397
- #
1398
- # * `network-interface.owner-id` - The ID of the owner of the network
1399
- # interface.
1400
- #
1401
- # * `network-interface.availability-zone` - The Availability Zone for
1402
- # the network interface.
1403
- #
1404
- # * `network-interface.requester-id` - The requester ID for the network
1405
- # interface.
1406
- #
1407
- # * `network-interface.requester-managed` - Indicates whether the
1408
- # network interface is being managed by AWS.
1409
- #
1410
- # * `network-interface.status` - The status of the network interface
1411
- # (`available`) \| `in-use`).
1412
- #
1413
- # * `network-interface.mac-address` - The MAC address of the network
1414
- # interface.
1415
- #
1416
- # * `network-interface.private-dns-name` - The private DNS name of the
1417
- # network interface.
1418
- #
1419
- # * `network-interface.source-dest-check` - Whether the network
1420
- # interface performs source/destination checking. A value of `true`
1421
- # means checking is enabled, and `false` means checking is disabled.
1422
- # The value must be `false` for the network interface to perform
1423
- # network address translation (NAT) in your VPC.
1424
- #
1425
- # * `network-interface.group-id` - The ID of a security group associated
1426
- # with the network interface.
1427
- #
1428
- # * `network-interface.group-name` - The name of a security group
1429
- # associated with the network interface.
1430
- #
1431
- # * `network-interface.attachment.attachment-id` - The ID of the
1432
- # interface attachment.
1433
- #
1434
- # * `network-interface.attachment.instance-id` - The ID of the instance
1435
- # to which the network interface is attached.
1436
- #
1437
- # * `network-interface.attachment.instance-owner-id` - The owner ID of
1438
- # the instance to which the network interface is attached.
1439
- #
1440
- # * `network-interface.addresses.private-ip-address` - The private IP
1441
- # address associated with the network interface.
1442
- #
1443
- # * `network-interface.attachment.device-index` - The device index to
1444
- # which the network interface is attached.
1445
- #
1446
- # * `network-interface.attachment.status` - The status of the attachment
1447
- # (`attaching` \| `attached` \| `detaching` \| `detached`).
1448
- #
1449
- # * `network-interface.attachment.attach-time` - The time that the
1450
- # network interface was attached to an instance.
1451
- #
1452
- # * `network-interface.attachment.delete-on-termination` - Specifies
1453
- # whether the attachment is deleted when an instance is terminated.
1454
- #
1455
- # * `network-interface.addresses.primary` - Specifies whether the IP
1456
- # address of the network interface is the primary private IP address.
1457
- #
1458
- # * `network-interface.addresses.association.public-ip` - The ID of the
1459
- # association of an Elastic IP address with a network interface.
1460
- #
1461
- # * `network-interface.addresses.association.ip-owner-id` - The owner ID
1462
- # of the private IP address associated with the network interface.
1463
- #
1464
- # * `association.public-ip` - The address of the Elastic IP address
1465
- # bound to the network interface.
1466
- #
1467
- # * `association.ip-owner-id` - The owner of the Elastic IP address
1468
- # associated with the network interface.
1469
- #
1470
- # * `association.allocation-id` - The allocation ID returned when you
1471
- # allocated the Elastic IP address for your network interface.
1472
- #
1473
- # * `association.association-id` - The association ID returned when the
1474
- # network interface was associated with an IP address.
1475
1526
  # @return [Instance::Collection]
1476
1527
  def instances(options = {})
1477
1528
  batches = Enumerator.new do |y|
@@ -1665,7 +1716,7 @@ module Aws
1665
1716
  # * `default` - Indicates whether the ACL is the default network ACL for
1666
1717
  # the VPC.
1667
1718
  #
1668
- # * `entry.cidr` - The CIDR range specified in the entry.
1719
+ # * `entry.cidr` - The IPv4 CIDR range specified in the entry.
1669
1720
  #
1670
1721
  # * `entry.egress` - Indicates whether the entry applies to egress
1671
1722
  # traffic.
@@ -1674,6 +1725,8 @@ module Aws
1674
1725
  #
1675
1726
  # * `entry.icmp.type` - The ICMP type specified in the entry, if any.
1676
1727
  #
1728
+ # * `entry.ipv6-cidr` - The IPv6 CIDR range specified in the entry.
1729
+ #
1677
1730
  # * `entry.port-range.from` - The start of the port range specified in
1678
1731
  # the entry.
1679
1732
  #
@@ -1757,32 +1810,33 @@ module Aws
1757
1810
  # @option options [Array<Types::Filter>] :filters
1758
1811
  # One or more filters.
1759
1812
  #
1760
- # * `addresses.private-ip-address` - The private IP addresses associated
1761
- # with the network interface.
1813
+ # * `addresses.private-ip-address` - The private IPv4 addresses
1814
+ # associated with the network interface.
1762
1815
  #
1763
- # * `addresses.primary` - Whether the private IP address is the primary
1764
- # IP address associated with the network interface.
1816
+ # * `addresses.primary` - Whether the private IPv4 address is the
1817
+ # primary IP address associated with the network interface.
1765
1818
  #
1766
1819
  # * `addresses.association.public-ip` - The association ID returned when
1767
- # the network interface was associated with the Elastic IP address.
1820
+ # the network interface was associated with the Elastic IP address
1821
+ # (IPv4).
1768
1822
  #
1769
1823
  # * `addresses.association.owner-id` - The owner ID of the addresses
1770
1824
  # associated with the network interface.
1771
1825
  #
1772
1826
  # * `association.association-id` - The association ID returned when the
1773
- # network interface was associated with an IP address.
1827
+ # network interface was associated with an IPv4 address.
1774
1828
  #
1775
1829
  # * `association.allocation-id` - The allocation ID returned when you
1776
- # allocated the Elastic IP address for your network interface.
1830
+ # allocated the Elastic IP address (IPv4) for your network interface.
1777
1831
  #
1778
1832
  # * `association.ip-owner-id` - The owner of the Elastic IP address
1779
- # associated with the network interface.
1833
+ # (IPv4) associated with the network interface.
1780
1834
  #
1781
1835
  # * `association.public-ip` - The address of the Elastic IP address
1782
- # bound to the network interface.
1836
+ # (IPv4) bound to the network interface.
1783
1837
  #
1784
1838
  # * `association.public-dns-name` - The public DNS name for the network
1785
- # interface.
1839
+ # interface (IPv4).
1786
1840
  #
1787
1841
  # * `attachment.attachment-id` - The ID of the interface attachment.
1788
1842
  #
@@ -1818,16 +1872,20 @@ module Aws
1818
1872
  # * `group-name` - The name of a security group associated with the
1819
1873
  # network interface.
1820
1874
  #
1875
+ # * `ipv6-addresses.ipv6-address` - An IPv6 address associated with the
1876
+ # network interface.
1877
+ #
1821
1878
  # * `mac-address` - The MAC address of the network interface.
1822
1879
  #
1823
1880
  # * `network-interface-id` - The ID of the network interface.
1824
1881
  #
1825
1882
  # * `owner-id` - The AWS account ID of the network interface owner.
1826
1883
  #
1827
- # * `private-ip-address` - The private IP address or addresses of the
1884
+ # * `private-ip-address` - The private IPv4 address or addresses of the
1828
1885
  # network interface.
1829
1886
  #
1830
- # * `private-dns-name` - The private DNS name of the network interface.
1887
+ # * `private-dns-name` - The private DNS name of the network interface
1888
+ # (IPv4).
1831
1889
  #
1832
1890
  # * `requester-id` - The ID of the entity that launched the instance on
1833
1891
  # your behalf (for example, AWS Management Console, Auto Scaling, and
@@ -1997,12 +2055,18 @@ module Aws
1997
2055
  #
1998
2056
  # * `route-table-id` - The ID of the route table.
1999
2057
  #
2000
- # * `route.destination-cidr-block` - The CIDR range specified in a route
2001
- # in the table.
2058
+ # * `route.destination-cidr-block` - The IPv4 CIDR range specified in a
2059
+ # route in the table.
2060
+ #
2061
+ # * `route.destination-ipv6-cidr-block` - The IPv6 CIDR range specified
2062
+ # in a route in the route table.
2002
2063
  #
2003
2064
  # * `route.destination-prefix-list-id` - The ID (prefix) of the AWS
2004
2065
  # service specified in a route in the table.
2005
2066
  #
2067
+ # * `route.egress-only-internet-gateway-id` - The ID of an egress-only
2068
+ # Internet gateway specified in a route in the route table.
2069
+ #
2006
2070
  # * `route.gateway-id` - The ID of a gateway specified in a route in the
2007
2071
  # table.
2008
2072
  #
@@ -2113,8 +2177,8 @@ module Aws
2113
2177
  #
2114
2178
  # * `group-name` - The name of the security group.
2115
2179
  #
2116
- # * `ip-permission.cidr` - A CIDR range that has been granted
2117
- # permission.
2180
+ # * `ip-permission.cidr` - An IPv4 CIDR range that has been granted
2181
+ # permission in a security group rule.
2118
2182
  #
2119
2183
  # * `ip-permission.from-port` - The start of port range for the TCP and
2120
2184
  # UDP protocols, or an ICMP type number.
@@ -2125,6 +2189,9 @@ module Aws
2125
2189
  # * `ip-permission.group-name` - The name of a security group that has
2126
2190
  # been granted permission.
2127
2191
  #
2192
+ # * `ip-permission.ipv6-cidr` - An IPv6 CIDR range that has been granted
2193
+ # permission in a security group rule.
2194
+ #
2128
2195
  # * `ip-permission.protocol` - The IP protocol for the permission (`tcp`
2129
2196
  # \| `udp` \| `icmp` or a protocol number).
2130
2197
  #
@@ -2293,10 +2360,10 @@ module Aws
2293
2360
  # * `availabilityZone` - The Availability Zone for the subnet. You can
2294
2361
  # also use `availability-zone` as the filter name.
2295
2362
  #
2296
- # * `available-ip-address-count` - The number of IP addresses in the
2363
+ # * `available-ip-address-count` - The number of IPv4 addresses in the
2297
2364
  # subnet that are available.
2298
2365
  #
2299
- # * `cidrBlock` - The CIDR block of the subnet. The CIDR block you
2366
+ # * `cidrBlock` - The IPv4 CIDR block of the subnet. The CIDR block you
2300
2367
  # specify must exactly match the subnet's CIDR block for information
2301
2368
  # to be returned for the subnet. You can also use `cidr` or
2302
2369
  # `cidr-block` as the filter names.
@@ -2305,6 +2372,15 @@ module Aws
2305
2372
  # the Availability Zone. You can also use `default-for-az` as the
2306
2373
  # filter name.
2307
2374
  #
2375
+ # * `ipv6-cidr-block-association.ipv6-cidr-block` - An IPv6 CIDR block
2376
+ # associated with the subnet.
2377
+ #
2378
+ # * `ipv6-cidr-block-association.association-id` - An association ID for
2379
+ # an IPv6 CIDR block associated with the subnet.
2380
+ #
2381
+ # * `ipv6-cidr-block-association.state` - The state of an IPv6 CIDR
2382
+ # block associated with the subnet.
2383
+ #
2308
2384
  # * `state` - The state of the subnet (`pending` \| `available`).
2309
2385
  #
2310
2386
  # * `subnet-id` - The ID of the subnet.
@@ -2554,7 +2630,8 @@ module Aws
2554
2630
  # @option options [Array<Types::Filter>] :filters
2555
2631
  # One or more filters.
2556
2632
  #
2557
- # * `accepter-vpc-info.cidr-block` - The CIDR block of the peer VPC.
2633
+ # * `accepter-vpc-info.cidr-block` - The IPv4 CIDR block of the peer
2634
+ # VPC.
2558
2635
  #
2559
2636
  # * `accepter-vpc-info.owner-id` - The AWS account ID of the owner of
2560
2637
  # the peer VPC.
@@ -2564,8 +2641,8 @@ module Aws
2564
2641
  # * `expiration-time` - The expiration date and time for the VPC peering
2565
2642
  # connection.
2566
2643
  #
2567
- # * `requester-vpc-info.cidr-block` - The CIDR block of the requester's
2568
- # VPC.
2644
+ # * `requester-vpc-info.cidr-block` - The IPv4 CIDR block of the
2645
+ # requester's VPC.
2569
2646
  #
2570
2647
  # * `requester-vpc-info.owner-id` - The AWS account ID of the owner of
2571
2648
  # the requester VPC.
@@ -2636,13 +2713,22 @@ module Aws
2636
2713
  # @option options [Array<Types::Filter>] :filters
2637
2714
  # One or more filters.
2638
2715
  #
2639
- # * `cidr` - The CIDR block of the VPC. The CIDR block you specify must
2640
- # exactly match the VPC's CIDR block for information to be returned
2641
- # for the VPC. Must contain the slash followed by one or two digits
2642
- # (for example, `/28`).
2716
+ # * `cidr` - The IPv4 CIDR block of the VPC. The CIDR block you specify
2717
+ # must exactly match the VPC's CIDR block for information to be
2718
+ # returned for the VPC. Must contain the slash followed by one or two
2719
+ # digits (for example, `/28`).
2643
2720
  #
2644
2721
  # * `dhcp-options-id` - The ID of a set of DHCP options.
2645
2722
  #
2723
+ # * `ipv6-cidr-block-association.ipv6-cidr-block` - An IPv6 CIDR block
2724
+ # associated with the VPC.
2725
+ #
2726
+ # * `ipv6-cidr-block-association.association-id` - The association ID
2727
+ # for an IPv6 CIDR block associated with the VPC.
2728
+ #
2729
+ # * `ipv6-cidr-block-association.state` - The state of an IPv6 CIDR
2730
+ # block associated with the VPC.
2731
+ #
2646
2732
  # * `isDefault` - Indicates whether the VPC is the default VPC.
2647
2733
  #
2648
2734
  # * `state` - The state of the VPC (`pending` \| `available`).