aws-sdk-ec2 1.0.0.rc18 → 1.0.0.rc19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96ba612ee5d0bff68d1ecc997c5797b963fc8b9
-  data.tar.gz: ded642904f38e11403b93f2174dfcbbe1a2af949
+  metadata.gz: 1ad0e1478bb85a3d9a7a4b9cae9991af58244773
+  data.tar.gz: abe5ea8ad51e742e772661f41782e3e44953bb59
 SHA512:
-  metadata.gz: 072f68c561ca355f29b581fc4206f516b84c5eda0f28fdb8f47cb8fddfe4872292c69b3f72e130e78b68b1df4f708279e69a5c55e5e0e225361a57b96adec15d
-  data.tar.gz: bc4e58883b63b0b3fdc3fbeec375311351450eea5a0a16b14e60e0775e792482ab72e64adbea4320df8e53620dbf011f2b02c12d37fb0a98ab42ced41820eea2
+  metadata.gz: 8649bf5c173b1e867dfab897130ca386c57e1f0cf00179cadc0e3abc0d5aa022b6b08a07d2fb87eb696c34d4f720f81d2ccc90282e5be5944ffd680667a7e9f8
+  data.tar.gz: b230706481fe3ed72b42a57765133ed4b78de790d13919053526a14ff5be8329cf69da50586bd371878350c509ec6faa168cc16b645e0c1ea80909fa5812102e

data/lib/aws-sdk-ec2.rb

@@ -65,6 +65,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @service
 module Aws::EC2
 
-  GEM_VERSION = '1.0.0.rc18'
+  GEM_VERSION = '1.0.0.rc19'
 
 end

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

@@ -226,6 +226,8 @@ module Aws::EC2
     #   resp.vpc_peering_connection.accepter_vpc_info.cidr_block #=> String
     #   resp.vpc_peering_connection.accepter_vpc_info.ipv_6_cidr_block_set #=> Array
     #   resp.vpc_peering_connection.accepter_vpc_info.ipv_6_cidr_block_set[0].ipv_6_cidr_block #=> String
+    #   resp.vpc_peering_connection.accepter_vpc_info.cidr_block_set #=> Array
+    #   resp.vpc_peering_connection.accepter_vpc_info.cidr_block_set[0].cidr_block #=> String
     #   resp.vpc_peering_connection.accepter_vpc_info.owner_id #=> String
     #   resp.vpc_peering_connection.accepter_vpc_info.peering_options.allow_dns_resolution_from_remote_vpc #=> Boolean
     #   resp.vpc_peering_connection.accepter_vpc_info.peering_options.allow_egress_from_local_classic_link_to_remote_vpc #=> Boolean
@@ -235,6 +237,8 @@ module Aws::EC2
     #   resp.vpc_peering_connection.requester_vpc_info.cidr_block #=> String
     #   resp.vpc_peering_connection.requester_vpc_info.ipv_6_cidr_block_set #=> Array
     #   resp.vpc_peering_connection.requester_vpc_info.ipv_6_cidr_block_set[0].ipv_6_cidr_block #=> String
+    #   resp.vpc_peering_connection.requester_vpc_info.cidr_block_set #=> Array
+    #   resp.vpc_peering_connection.requester_vpc_info.cidr_block_set[0].cidr_block #=> String
     #   resp.vpc_peering_connection.requester_vpc_info.owner_id #=> String
     #   resp.vpc_peering_connection.requester_vpc_info.peering_options.allow_dns_resolution_from_remote_vpc #=> Boolean
     #   resp.vpc_peering_connection.requester_vpc_info.peering_options.allow_egress_from_local_classic_link_to_remote_vpc #=> Boolean
@@ -896,27 +900,40 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Associates a CIDR block with your VPC. You can only associate a single
-    # Amazon-provided IPv6 CIDR block with your VPC. The IPv6 CIDR block
-    # size is fixed at /56.
+    # Associates a CIDR block with your VPC. You can associate a secondary
+    # IPv4 CIDR block, or you can associate an Amazon-provided IPv6 CIDR
+    # block. The IPv6 CIDR block size is fixed at /56.
+    #
+    # For more information about associating CIDR blocks with your VPC and
+    # applicable restrictions, see [VPC and Subnet Sizing][1] in the *Amazon
+    # Virtual Private Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Subnets.html#VPC_Sizing
     #
     # @option params [Boolean] :amazon_provided_ipv_6_cidr_block
     #   Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length
     #   for the VPC. You cannot specify the range of IPv6 addresses, or the
     #   size of the CIDR block.
     #
+    # @option params [String] :cidr_block
+    #   An IPv4 CIDR block to associate with the VPC.
+    #
     # @option params [required, String] :vpc_id
     #   The ID of the VPC.
     #
     # @return [Types::AssociateVpcCidrBlockResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::AssociateVpcCidrBlockResult#ipv_6_cidr_block_association #ipv_6_cidr_block_association} => Types::VpcIpv6CidrBlockAssociation
+    #   * {Types::AssociateVpcCidrBlockResult#cidr_block_association #cidr_block_association} => Types::VpcCidrBlockAssociation
     #   * {Types::AssociateVpcCidrBlockResult#vpc_id #vpc_id} => String
     #
     # @example Request syntax with placeholder values
     #
     #   resp = client.associate_vpc_cidr_block({
     #     amazon_provided_ipv_6_cidr_block: false,
+    #     cidr_block: "String",
     #     vpc_id: "String", # required
     #   })
     #
@@ -926,6 +943,10 @@ module Aws::EC2
     #   resp.ipv_6_cidr_block_association.ipv_6_cidr_block #=> String
     #   resp.ipv_6_cidr_block_association.ipv_6_cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
     #   resp.ipv_6_cidr_block_association.ipv_6_cidr_block_state.status_message #=> String
+    #   resp.cidr_block_association.association_id #=> String
+    #   resp.cidr_block_association.cidr_block #=> String
+    #   resp.cidr_block_association.cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
+    #   resp.cidr_block_association.cidr_block_state.status_message #=> String
     #   resp.vpc_id #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociateVpcCidrBlock AWS API Documentation
@@ -2478,6 +2499,11 @@ module Aws::EC2
     #   resp.vpc.ipv_6_cidr_block_association_set[0].ipv_6_cidr_block #=> String
     #   resp.vpc.ipv_6_cidr_block_association_set[0].ipv_6_cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
     #   resp.vpc.ipv_6_cidr_block_association_set[0].ipv_6_cidr_block_state.status_message #=> String
+    #   resp.vpc.cidr_block_association_set #=> Array
+    #   resp.vpc.cidr_block_association_set[0].association_id #=> String
+    #   resp.vpc.cidr_block_association_set[0].cidr_block #=> String
+    #   resp.vpc.cidr_block_association_set[0].cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
+    #   resp.vpc.cidr_block_association_set[0].cidr_block_state.status_message #=> String
     #   resp.vpc.is_default #=> Boolean
     #   resp.vpc.tags #=> Array
     #   resp.vpc.tags[0].key #=> String
@@ -4340,15 +4366,14 @@ module Aws::EC2
 
     # Creates a subnet in an existing VPC.
     #
-    # When you create each subnet, you provide the VPC ID and the CIDR block
-    # you want for the subnet. After you create a subnet, you can't change
-    # its CIDR block. The subnet's IPv4 CIDR block can be the same as the
-    # VPC's IPv4 CIDR block (assuming you want only a single subnet in the
-    # VPC), or a subset of the VPC's IPv4 CIDR block. If you create more
-    # than one subnet in a VPC, the subnets' CIDR blocks must not overlap.
-    # The smallest IPv4 subnet (and VPC) you can create uses a /28 netmask
-    # (16 IPv4 addresses), and the largest uses a /16 netmask (65,536 IPv4
-    # addresses).
+    # When you create each subnet, you provide the VPC ID and the IPv4 CIDR
+    # block you want for the subnet. After you create a subnet, you can't
+    # change its CIDR block. The size of the subnet's IPv4 CIDR block can
+    # be the same as a VPC's IPv4 CIDR block, or a subset of a VPC's IPv4
+    # CIDR block. If you create more than one subnet in a VPC, the subnets'
+    # CIDR blocks must not overlap. The smallest IPv4 subnet (and VPC) you
+    # can create uses a /28 netmask (16 IPv4 addresses), and the largest
+    # uses a /16 netmask (65,536 IPv4 addresses).
     #
     # If you've associated an IPv6 CIDR block with your VPC, you can create
     # a subnet with an IPv6 CIDR block that uses a /64 prefix length.
@@ -4852,6 +4877,11 @@ module Aws::EC2
     #   resp.vpc.ipv_6_cidr_block_association_set[0].ipv_6_cidr_block #=> String
     #   resp.vpc.ipv_6_cidr_block_association_set[0].ipv_6_cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
     #   resp.vpc.ipv_6_cidr_block_association_set[0].ipv_6_cidr_block_state.status_message #=> String
+    #   resp.vpc.cidr_block_association_set #=> Array
+    #   resp.vpc.cidr_block_association_set[0].association_id #=> String
+    #   resp.vpc.cidr_block_association_set[0].cidr_block #=> String
+    #   resp.vpc.cidr_block_association_set[0].cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
+    #   resp.vpc.cidr_block_association_set[0].cidr_block_state.status_message #=> String
     #   resp.vpc.is_default #=> Boolean
     #   resp.vpc.tags #=> Array
     #   resp.vpc.tags[0].key #=> String
@@ -4994,6 +5024,8 @@ module Aws::EC2
     #   resp.vpc_peering_connection.accepter_vpc_info.cidr_block #=> String
     #   resp.vpc_peering_connection.accepter_vpc_info.ipv_6_cidr_block_set #=> Array
     #   resp.vpc_peering_connection.accepter_vpc_info.ipv_6_cidr_block_set[0].ipv_6_cidr_block #=> String
+    #   resp.vpc_peering_connection.accepter_vpc_info.cidr_block_set #=> Array
+    #   resp.vpc_peering_connection.accepter_vpc_info.cidr_block_set[0].cidr_block #=> String
     #   resp.vpc_peering_connection.accepter_vpc_info.owner_id #=> String
     #   resp.vpc_peering_connection.accepter_vpc_info.peering_options.allow_dns_resolution_from_remote_vpc #=> Boolean
     #   resp.vpc_peering_connection.accepter_vpc_info.peering_options.allow_egress_from_local_classic_link_to_remote_vpc #=> Boolean
@@ -5003,6 +5035,8 @@ module Aws::EC2
     #   resp.vpc_peering_connection.requester_vpc_info.cidr_block #=> String
     #   resp.vpc_peering_connection.requester_vpc_info.ipv_6_cidr_block_set #=> Array
     #   resp.vpc_peering_connection.requester_vpc_info.ipv_6_cidr_block_set[0].ipv_6_cidr_block #=> String
+    #   resp.vpc_peering_connection.requester_vpc_info.cidr_block_set #=> Array
+    #   resp.vpc_peering_connection.requester_vpc_info.cidr_block_set[0].cidr_block #=> String
     #   resp.vpc_peering_connection.requester_vpc_info.owner_id #=> String
     #   resp.vpc_peering_connection.requester_vpc_info.peering_options.allow_dns_resolution_from_remote_vpc #=> Boolean
     #   resp.vpc_peering_connection.requester_vpc_info.peering_options.allow_egress_from_local_classic_link_to_remote_vpc #=> Boolean
@@ -5969,10 +6003,10 @@ module Aws::EC2
     end
 
     # Deletes the specified set of tags from the specified set of resources.
-    # This call is designed to follow a `DescribeTags` request.
     #
-    # For more information about tags, see [Tagging Your Resources][1] in
-    # the *Amazon Elastic Compute Cloud User Guide*.
+    # To list the current tags, use DescribeTags. For more information about
+    # tags, see [Tagging Your Resources][1] in the *Amazon Elastic Compute
+    # Cloud User Guide*.
     #
     #
     #
@@ -5985,14 +6019,15 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #
     # @option params [required, Array<String>] :resources
-    #   The ID of the resource. For example, ami-1a2b3c4d. You can specify
-    #   more than one resource ID.
+    #   The IDs of one or more resources.
     #
     # @option params [Array<Types::Tag>] :tags
-    #   One or more tags to delete. If you omit the `value` parameter, we
-    #   delete the tag regardless of its value. If you specify this parameter
-    #   with an empty string as the value, we delete the key only if its value
-    #   is an empty string.
+    #   One or more tags to delete. If you omit this parameter, we delete all
+    #   tags for the specified resources. Specify a tag key and an optional
+    #   tag value to delete specific tags. If you specify a tag key without a
+    #   tag value, we delete any tag with this key regardless of its value. If
+    #   you specify a tag key with an empty string as the tag value, we delete
+    #   the tag only if its value is an empty string.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -14355,6 +14390,8 @@ module Aws::EC2
     #   resp.vpc_peering_connections[0].accepter_vpc_info.cidr_block #=> String
     #   resp.vpc_peering_connections[0].accepter_vpc_info.ipv_6_cidr_block_set #=> Array
     #   resp.vpc_peering_connections[0].accepter_vpc_info.ipv_6_cidr_block_set[0].ipv_6_cidr_block #=> String
+    #   resp.vpc_peering_connections[0].accepter_vpc_info.cidr_block_set #=> Array
+    #   resp.vpc_peering_connections[0].accepter_vpc_info.cidr_block_set[0].cidr_block #=> String
     #   resp.vpc_peering_connections[0].accepter_vpc_info.owner_id #=> String
     #   resp.vpc_peering_connections[0].accepter_vpc_info.peering_options.allow_dns_resolution_from_remote_vpc #=> Boolean
     #   resp.vpc_peering_connections[0].accepter_vpc_info.peering_options.allow_egress_from_local_classic_link_to_remote_vpc #=> Boolean
@@ -14364,6 +14401,8 @@ module Aws::EC2
     #   resp.vpc_peering_connections[0].requester_vpc_info.cidr_block #=> String
     #   resp.vpc_peering_connections[0].requester_vpc_info.ipv_6_cidr_block_set #=> Array
     #   resp.vpc_peering_connections[0].requester_vpc_info.ipv_6_cidr_block_set[0].ipv_6_cidr_block #=> String
+    #   resp.vpc_peering_connections[0].requester_vpc_info.cidr_block_set #=> Array
+    #   resp.vpc_peering_connections[0].requester_vpc_info.cidr_block_set[0].cidr_block #=> String
     #   resp.vpc_peering_connections[0].requester_vpc_info.owner_id #=> String
     #   resp.vpc_peering_connections[0].requester_vpc_info.peering_options.allow_dns_resolution_from_remote_vpc #=> Boolean
     #   resp.vpc_peering_connections[0].requester_vpc_info.peering_options.allow_egress_from_local_classic_link_to_remote_vpc #=> Boolean
@@ -14390,10 +14429,19 @@ module Aws::EC2
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters.
     #
-    #   * `cidr` - The IPv4 CIDR block of the VPC. The CIDR block you specify
-    #     must exactly match the VPC's CIDR block for information to be
-    #     returned for the VPC. Must contain the slash followed by one or two
-    #     digits (for example, `/28`).
+    #   * `cidr` - The primary IPv4 CIDR block of the VPC. The CIDR block you
+    #     specify must exactly match the VPC's CIDR block for information to
+    #     be returned for the VPC. Must contain the slash followed by one or
+    #     two digits (for example, `/28`).
+    #
+    #   * `cidr-block-association.cidr-block` - An IPv4 CIDR block associated
+    #     with the VPC.
+    #
+    #   * `cidr-block-association.association-id` - The association ID for an
+    #     IPv4 CIDR block associated with the VPC.
+    #
+    #   * `cidr-block-association.state` - The state of an IPv4 CIDR block
+    #     associated with the VPC.
     #
     #   * `dhcp-options-id` - The ID of a set of DHCP options.
     #
@@ -14501,6 +14549,11 @@ module Aws::EC2
     #   resp.vpcs[0].ipv_6_cidr_block_association_set[0].ipv_6_cidr_block #=> String
     #   resp.vpcs[0].ipv_6_cidr_block_association_set[0].ipv_6_cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
     #   resp.vpcs[0].ipv_6_cidr_block_association_set[0].ipv_6_cidr_block_state.status_message #=> String
+    #   resp.vpcs[0].cidr_block_association_set #=> Array
+    #   resp.vpcs[0].cidr_block_association_set[0].association_id #=> String
+    #   resp.vpcs[0].cidr_block_association_set[0].cidr_block #=> String
+    #   resp.vpcs[0].cidr_block_association_set[0].cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
+    #   resp.vpcs[0].cidr_block_association_set[0].cidr_block_state.status_message #=> String
     #   resp.vpcs[0].is_default #=> Boolean
     #   resp.vpcs[0].tags #=> Array
     #   resp.vpcs[0].tags[0].key #=> String
@@ -15291,17 +15344,22 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Disassociates a CIDR block from a VPC. Currently, you can disassociate
-    # an IPv6 CIDR block only. You must detach or delete all gateways and
+    # Disassociates a CIDR block from a VPC. To disassociate the CIDR block,
+    # you must specify its association ID. You can get the association ID by
+    # using DescribeVpcs. You must detach or delete all gateways and
     # resources that are associated with the CIDR block before you can
     # disassociate it.
     #
+    # You cannot disassociate the CIDR block with which you originally
+    # created the VPC (the primary CIDR block).
+    #
     # @option params [required, String] :association_id
     #   The association ID for the CIDR block.
     #
     # @return [Types::DisassociateVpcCidrBlockResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::DisassociateVpcCidrBlockResult#ipv_6_cidr_block_association #ipv_6_cidr_block_association} => Types::VpcIpv6CidrBlockAssociation
+    #   * {Types::DisassociateVpcCidrBlockResult#cidr_block_association #cidr_block_association} => Types::VpcCidrBlockAssociation
     #   * {Types::DisassociateVpcCidrBlockResult#vpc_id #vpc_id} => String
     #
     # @example Request syntax with placeholder values
@@ -15316,6 +15374,10 @@ module Aws::EC2
     #   resp.ipv_6_cidr_block_association.ipv_6_cidr_block #=> String
     #   resp.ipv_6_cidr_block_association.ipv_6_cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
     #   resp.ipv_6_cidr_block_association.ipv_6_cidr_block_state.status_message #=> String
+    #   resp.cidr_block_association.association_id #=> String
+    #   resp.cidr_block_association.cidr_block #=> String
+    #   resp.cidr_block_association.cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
+    #   resp.cidr_block_association.cidr_block_state.status_message #=> String
     #   resp.vpc_id #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DisassociateVpcCidrBlock AWS API Documentation
@@ -20857,7 +20919,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.0.0.rc18'
+      context[:gem_version] = '1.0.0.rc19'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -107,6 +107,8 @@ module Aws::EC2
     CancelSpotInstanceRequestsResult = Shapes::StructureShape.new(name: 'CancelSpotInstanceRequestsResult')
     CancelledSpotInstanceRequest = Shapes::StructureShape.new(name: 'CancelledSpotInstanceRequest')
     CancelledSpotInstanceRequestList = Shapes::ListShape.new(name: 'CancelledSpotInstanceRequestList')
+    CidrBlock = Shapes::StructureShape.new(name: 'CidrBlock')
+    CidrBlockSet = Shapes::ListShape.new(name: 'CidrBlockSet')
     ClassicLinkDnsSupport = Shapes::StructureShape.new(name: 'ClassicLinkDnsSupport')
     ClassicLinkDnsSupportList = Shapes::ListShape.new(name: 'ClassicLinkDnsSupportList')
     ClassicLinkInstance = Shapes::StructureShape.new(name: 'ClassicLinkInstance')
@@ -929,6 +931,8 @@ module Aws::EC2
     VpcAttachment = Shapes::StructureShape.new(name: 'VpcAttachment')
     VpcAttachmentList = Shapes::ListShape.new(name: 'VpcAttachmentList')
     VpcAttributeName = Shapes::StringShape.new(name: 'VpcAttributeName')
+    VpcCidrBlockAssociation = Shapes::StructureShape.new(name: 'VpcCidrBlockAssociation')
+    VpcCidrBlockAssociationSet = Shapes::ListShape.new(name: 'VpcCidrBlockAssociationSet')
     VpcCidrBlockState = Shapes::StructureShape.new(name: 'VpcCidrBlockState')
     VpcCidrBlockStateCode = Shapes::StringShape.new(name: 'VpcCidrBlockStateCode')
     VpcClassicLink = Shapes::StructureShape.new(name: 'VpcClassicLink')
@@ -1088,10 +1092,12 @@ module Aws::EC2
     AssociateSubnetCidrBlockResult.struct_class = Types::AssociateSubnetCidrBlockResult
 
     AssociateVpcCidrBlockRequest.add_member(:amazon_provided_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: Boolean, location_name: "amazonProvidedIpv6CidrBlock"))
+    AssociateVpcCidrBlockRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "CidrBlock"))
     AssociateVpcCidrBlockRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "vpcId"))
     AssociateVpcCidrBlockRequest.struct_class = Types::AssociateVpcCidrBlockRequest
 
     AssociateVpcCidrBlockResult.add_member(:ipv_6_cidr_block_association, Shapes::ShapeRef.new(shape: VpcIpv6CidrBlockAssociation, location_name: "ipv6CidrBlockAssociation"))
+    AssociateVpcCidrBlockResult.add_member(:cidr_block_association, Shapes::ShapeRef.new(shape: VpcCidrBlockAssociation, location_name: "cidrBlockAssociation"))
     AssociateVpcCidrBlockResult.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
     AssociateVpcCidrBlockResult.struct_class = Types::AssociateVpcCidrBlockResult
 
@@ -1293,6 +1299,11 @@ module Aws::EC2
 
     CancelledSpotInstanceRequestList.member = Shapes::ShapeRef.new(shape: CancelledSpotInstanceRequest, location_name: "item")
 
+    CidrBlock.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "cidrBlock"))
+    CidrBlock.struct_class = Types::CidrBlock
+
+    CidrBlockSet.member = Shapes::ShapeRef.new(shape: CidrBlock, location_name: "item")
+
     ClassicLinkDnsSupport.add_member(:classic_link_dns_supported, Shapes::ShapeRef.new(shape: Boolean, location_name: "classicLinkDnsSupported"))
     ClassicLinkDnsSupport.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
     ClassicLinkDnsSupport.struct_class = Types::ClassicLinkDnsSupport
@@ -2551,6 +2562,7 @@ module Aws::EC2
     DisassociateVpcCidrBlockRequest.struct_class = Types::DisassociateVpcCidrBlockRequest
 
     DisassociateVpcCidrBlockResult.add_member(:ipv_6_cidr_block_association, Shapes::ShapeRef.new(shape: VpcIpv6CidrBlockAssociation, location_name: "ipv6CidrBlockAssociation"))
+    DisassociateVpcCidrBlockResult.add_member(:cidr_block_association, Shapes::ShapeRef.new(shape: VpcCidrBlockAssociation, location_name: "cidrBlockAssociation"))
     DisassociateVpcCidrBlockResult.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
     DisassociateVpcCidrBlockResult.struct_class = Types::DisassociateVpcCidrBlockResult
 
@@ -4804,6 +4816,7 @@ module Aws::EC2
     Vpc.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
     Vpc.add_member(:instance_tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "instanceTenancy"))
     Vpc.add_member(:ipv_6_cidr_block_association_set, Shapes::ShapeRef.new(shape: VpcIpv6CidrBlockAssociationSet, location_name: "ipv6CidrBlockAssociationSet"))
+    Vpc.add_member(:cidr_block_association_set, Shapes::ShapeRef.new(shape: VpcCidrBlockAssociationSet, location_name: "cidrBlockAssociationSet"))
     Vpc.add_member(:is_default, Shapes::ShapeRef.new(shape: Boolean, location_name: "isDefault"))
     Vpc.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     Vpc.struct_class = Types::Vpc
@@ -4814,6 +4827,13 @@ module Aws::EC2
 
     VpcAttachmentList.member = Shapes::ShapeRef.new(shape: VpcAttachment, location_name: "item")
 
+    VpcCidrBlockAssociation.add_member(:association_id, Shapes::ShapeRef.new(shape: String, location_name: "associationId"))
+    VpcCidrBlockAssociation.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "cidrBlock"))
+    VpcCidrBlockAssociation.add_member(:cidr_block_state, Shapes::ShapeRef.new(shape: VpcCidrBlockState, location_name: "cidrBlockState"))
+    VpcCidrBlockAssociation.struct_class = Types::VpcCidrBlockAssociation
+
+    VpcCidrBlockAssociationSet.member = Shapes::ShapeRef.new(shape: VpcCidrBlockAssociation, location_name: "item")
+
     VpcCidrBlockState.add_member(:state, Shapes::ShapeRef.new(shape: VpcCidrBlockStateCode, location_name: "state"))
     VpcCidrBlockState.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
     VpcCidrBlockState.struct_class = Types::VpcCidrBlockState
@@ -4870,6 +4890,7 @@ module Aws::EC2
 
     VpcPeeringConnectionVpcInfo.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "cidrBlock"))
     VpcPeeringConnectionVpcInfo.add_member(:ipv_6_cidr_block_set, Shapes::ShapeRef.new(shape: Ipv6CidrBlockSet, location_name: "ipv6CidrBlockSet"))
+    VpcPeeringConnectionVpcInfo.add_member(:cidr_block_set, Shapes::ShapeRef.new(shape: CidrBlockSet, location_name: "cidrBlockSet"))
     VpcPeeringConnectionVpcInfo.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
     VpcPeeringConnectionVpcInfo.add_member(:peering_options, Shapes::ShapeRef.new(shape: VpcPeeringConnectionOptionsDescription, location_name: "peeringOptions"))
     VpcPeeringConnectionVpcInfo.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))

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

@@ -2780,10 +2780,19 @@ module Aws::EC2
     # @option options [Array<Types::Filter>] :filters
     #   One or more filters.
     #
-    #   * `cidr` - The IPv4 CIDR block of the VPC. The CIDR block you specify
-    #     must exactly match the VPC's CIDR block for information to be
-    #     returned for the VPC. Must contain the slash followed by one or two
-    #     digits (for example, `/28`).
+    #   * `cidr` - The primary IPv4 CIDR block of the VPC. The CIDR block you
+    #     specify must exactly match the VPC's CIDR block for information to
+    #     be returned for the VPC. Must contain the slash followed by one or
+    #     two digits (for example, `/28`).
+    #
+    #   * `cidr-block-association.cidr-block` - An IPv4 CIDR block associated
+    #     with the VPC.
+    #
+    #   * `cidr-block-association.association-id` - The association ID for an
+    #     IPv4 CIDR block associated with the VPC.
+    #
+    #   * `cidr-block-association.state` - The state of an IPv4 CIDR block
+    #     associated with the VPC.
     #
     #   * `dhcp-options-id` - The ID of a set of DHCP options.
     #

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

@@ -116,10 +116,12 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Array<Types::Tag>] :tags
-    #   One or more tags to delete. If you omit the `value` parameter, we
-    #   delete the tag regardless of its value. If you specify this parameter
-    #   with an empty string as the value, we delete the key only if its value
-    #   is an empty string.
+    #   One or more tags to delete. If you omit this parameter, we delete all
+    #   tags for the specified resources. Specify a tag key and an optional
+    #   tag value to delete specific tags. If you specify a tag key without a
+    #   tag value, we delete any tag with this key regardless of its value. If
+    #   you specify a tag key with an empty string as the tag value, we delete
+    #   the tag only if its value is an empty string.
     # @return [EmptyStructure]
     def delete(options = {})
       options = Aws::Util.deep_merge(options,

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

@@ -706,6 +706,7 @@ module Aws::EC2
     #
     #       {
     #         amazon_provided_ipv_6_cidr_block: false,
+    #         cidr_block: "String",
     #         vpc_id: "String", # required
     #       }
     #
@@ -715,6 +716,10 @@ module Aws::EC2
     #   size of the CIDR block.
     #   @return [Boolean]
     #
+    # @!attribute [rw] cidr_block
+    #   An IPv4 CIDR block to associate with the VPC.
+    #   @return [String]
+    #
     # @!attribute [rw] vpc_id
     #   The ID of the VPC.
     #   @return [String]
@@ -723,6 +728,7 @@ module Aws::EC2
     #
     class AssociateVpcCidrBlockRequest < Struct.new(
       :amazon_provided_ipv_6_cidr_block,
+      :cidr_block,
       :vpc_id)
       include Aws::Structure
     end
@@ -731,6 +737,10 @@ module Aws::EC2
     #   Information about the IPv6 CIDR block association.
     #   @return [Types::VpcIpv6CidrBlockAssociation]
     #
+    # @!attribute [rw] cidr_block_association
+    #   Information about the IPv4 CIDR block association.
+    #   @return [Types::VpcCidrBlockAssociation]
+    #
     # @!attribute [rw] vpc_id
     #   The ID of the VPC.
     #   @return [String]
@@ -739,6 +749,7 @@ module Aws::EC2
     #
     class AssociateVpcCidrBlockResult < Struct.new(
       :ipv_6_cidr_block_association,
+      :cidr_block_association,
       :vpc_id)
       include Aws::Structure
     end
@@ -1902,6 +1913,19 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes an IPv4 CIDR block.
+    #
+    # @!attribute [rw] cidr_block
+    #   The IPv4 CIDR block.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CidrBlock AWS API Documentation
+    #
+    class CidrBlock < Struct.new(
+      :cidr_block)
+      include Aws::Structure
+    end
+
     # Describes the ClassicLink DNS support status of a VPC.
     #
     # @!attribute [rw] classic_link_dns_supported
@@ -4958,15 +4982,16 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] resources
-    #   The ID of the resource. For example, ami-1a2b3c4d. You can specify
-    #   more than one resource ID.
+    #   The IDs of one or more resources.
     #   @return [Array<String>]
     #
     # @!attribute [rw] tags
-    #   One or more tags to delete. If you omit the `value` parameter, we
-    #   delete the tag regardless of its value. If you specify this
-    #   parameter with an empty string as the value, we delete the key only
-    #   if its value is an empty string.
+    #   One or more tags to delete. If you omit this parameter, we delete
+    #   all tags for the specified resources. Specify a tag key and an
+    #   optional tag value to delete specific tags. If you specify a tag key
+    #   without a tag value, we delete any tag with this key regardless of
+    #   its value. If you specify a tag key with an empty string as the tag
+    #   value, we delete the tag only if its value is an empty string.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteTagsRequest AWS API Documentation
@@ -11205,10 +11230,19 @@ module Aws::EC2
     # @!attribute [rw] filters
     #   One or more filters.
     #
-    #   * `cidr` - The IPv4 CIDR block of the VPC. The CIDR block you
-    #     specify must exactly match the VPC's CIDR block for information
-    #     to be returned for the VPC. Must contain the slash followed by one
-    #     or two digits (for example, `/28`).
+    #   * `cidr` - The primary IPv4 CIDR block of the VPC. The CIDR block
+    #     you specify must exactly match the VPC's CIDR block for
+    #     information to be returned for the VPC. Must contain the slash
+    #     followed by one or two digits (for example, `/28`).
+    #
+    #   * `cidr-block-association.cidr-block` - An IPv4 CIDR block
+    #     associated with the VPC.
+    #
+    #   * `cidr-block-association.association-id` - The association ID for
+    #     an IPv4 CIDR block associated with the VPC.
+    #
+    #   * `cidr-block-association.state` - The state of an IPv4 CIDR block
+    #     associated with the VPC.
     #
     #   * `dhcp-options-id` - The ID of a set of DHCP options.
     #
@@ -11973,6 +12007,10 @@ module Aws::EC2
     #   Information about the IPv6 CIDR block association.
     #   @return [Types::VpcIpv6CidrBlockAssociation]
     #
+    # @!attribute [rw] cidr_block_association
+    #   Information about the IPv4 CIDR block association.
+    #   @return [Types::VpcCidrBlockAssociation]
+    #
     # @!attribute [rw] vpc_id
     #   The ID of the VPC.
     #   @return [String]
@@ -11981,6 +12019,7 @@ module Aws::EC2
     #
     class DisassociateVpcCidrBlockResult < Struct.new(
       :ipv_6_cidr_block_association,
+      :cidr_block_association,
       :vpc_id)
       include Aws::Structure
     end
@@ -23534,6 +23573,9 @@ module Aws::EC2
     #   * `Client.InstanceInitiatedShutdown`\: The instance was shut down
     #     using the `shutdown -h` command from the instance.
     #
+    #   * `Client.InstanceTerminated`\: The instance was terminated or
+    #     rebooted during AMI creation.
+    #
     #   * `Client.UserInitiatedShutdown`\: The instance was shut down using
     #     the Amazon EC2 API.
     #
@@ -24636,7 +24678,7 @@ module Aws::EC2
     # Describes a VPC.
     #
     # @!attribute [rw] cidr_block
-    #   The IPv4 CIDR block for the VPC.
+    #   The primary IPv4 CIDR block for the VPC.
     #   @return [String]
     #
     # @!attribute [rw] dhcp_options_id
@@ -24660,6 +24702,10 @@ module Aws::EC2
     #   Information about the IPv6 CIDR blocks associated with the VPC.
     #   @return [Array<Types::VpcIpv6CidrBlockAssociation>]
     #
+    # @!attribute [rw] cidr_block_association_set
+    #   Information about the IPv4 CIDR blocks associated with the VPC.
+    #   @return [Array<Types::VpcCidrBlockAssociation>]
+    #
     # @!attribute [rw] is_default
     #   Indicates whether the VPC is the default VPC.
     #   @return [Boolean]
@@ -24677,6 +24723,7 @@ module Aws::EC2
       :vpc_id,
       :instance_tenancy,
       :ipv_6_cidr_block_association_set,
+      :cidr_block_association_set,
       :is_default,
       :tags)
       include Aws::Structure
@@ -24700,6 +24747,29 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes an IPv4 CIDR block associated with a VPC.
+    #
+    # @!attribute [rw] association_id
+    #   The association ID for the IPv4 CIDR block.
+    #   @return [String]
+    #
+    # @!attribute [rw] cidr_block
+    #   The IPv4 CIDR block.
+    #   @return [String]
+    #
+    # @!attribute [rw] cidr_block_state
+    #   Information about the state of the CIDR block.
+    #   @return [Types::VpcCidrBlockState]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VpcCidrBlockAssociation AWS API Documentation
+    #
+    class VpcCidrBlockAssociation < Struct.new(
+      :association_id,
+      :cidr_block,
+      :cidr_block_state)
+      include Aws::Structure
+    end
+
     # Describes the state of a CIDR block.
     #
     # @!attribute [rw] state
@@ -24902,6 +24972,10 @@ module Aws::EC2
     #   The IPv6 CIDR block for the VPC.
     #   @return [Array<Types::Ipv6CidrBlock>]
     #
+    # @!attribute [rw] cidr_block_set
+    #   Information about the IPv4 CIDR blocks for the VPC.
+    #   @return [Array<Types::CidrBlock>]
+    #
     # @!attribute [rw] owner_id
     #   The AWS account ID of the VPC owner.
     #   @return [String]
@@ -24920,6 +24994,7 @@ module Aws::EC2
     class VpcPeeringConnectionVpcInfo < Struct.new(
       :cidr_block,
       :ipv_6_cidr_block_set,
+      :cidr_block_set,
       :owner_id,
       :peering_options,
       :vpc_id)

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

@@ -31,7 +31,7 @@ module Aws::EC2
     end
     alias :vpc_id :id
 
-    # The IPv4 CIDR block for the VPC.
+    # The primary IPv4 CIDR block for the VPC.
     # @return [String]
     def cidr_block
       data.cidr_block
@@ -62,6 +62,12 @@ module Aws::EC2
       data.ipv_6_cidr_block_association_set
     end
 
+    # Information about the IPv4 CIDR blocks associated with the VPC.
+    # @return [Array<Types::VpcCidrBlockAssociation>]
+    def cidr_block_association_set
+      data.cidr_block_association_set
+    end
+
     # Indicates whether the VPC is the default VPC.
     # @return [Boolean]
     def is_default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc18
+  version: 1.0.0.rc19
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4