aws-sdk-ec2 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07163de11ef5213365aa653bc84227e45c9e8dd0
-  data.tar.gz: 2ad099627cc36035190e52746c3fd5612746e301
+  metadata.gz: c3d3f0801af74f08f657ce9498ab6f10f44e1d68
+  data.tar.gz: 4ae0791653759d3cfb05fdaa091ef7a8aefa04d0
 SHA512:
-  metadata.gz: 40e9acac824ed6fbddd590e09df5ffcdeecdc9f6fbcb4b3a02248a9e53e9713cfe901e583e536817f4e6e4ab2cee6fb0d57386e66a2d6900be3bc52a72ac7ace
-  data.tar.gz: c8a48061219ef257b6d2e3a5e07b26752140af8eaf6f1a418ab294b87b27deb5ab0c513ddf7f39bbc5f2845e1f48bdc9a55a8cedc530b12ae486915375fcd4b3
+  metadata.gz: 8fa44676327f15e723c32ef50d6d2245306515a6566f9047aa9c23bb56524076c10064af2337d48ab895a20777d45e7e77f47d17eb7e018edf74b4f9a55005d6
+  data.tar.gz: 49a3c4e18c355dadf6f48bcb31af422d8e5a87695b34b0b03d6d8796a43848cfb268e1fbd7418c947b2a95edc58cfa654c39efef4ceff688a6444bc81b62ae15

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.rc3'
+  GEM_VERSION = '1.0.0.rc4'
 
 end

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

@@ -18,6 +18,7 @@ require 'aws-sdk-core/plugins/regional_endpoint.rb'
 require 'aws-sdk-core/plugins/response_paging.rb'
 require 'aws-sdk-core/plugins/stub_responses.rb'
 require 'aws-sdk-core/plugins/idempotency_token.rb'
+require 'aws-sdk-core/plugins/jsonvalue_converter.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/ec2.rb'
 require 'aws-sdk-ec2/plugins/copy_encrypted_snapshot.rb'
@@ -47,6 +48,7 @@ module Aws::EC2
     add_plugin(Aws::Plugins::ResponsePaging)
     add_plugin(Aws::Plugins::StubResponses)
     add_plugin(Aws::Plugins::IdempotencyToken)
+    add_plugin(Aws::Plugins::JsonvalueConverter)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::EC2)
     add_plugin(Aws::EC2::Plugins::CopyEncryptedSnapshot)
@@ -196,9 +198,8 @@ module Aws::EC2
 
     # Accept a VPC peering connection request. To accept a request, the VPC
     # peering connection must be in the `pending-acceptance` state, and you
-    # must be the owner of the peer VPC. Use the
-    # `DescribeVpcPeeringConnections` request to view your outstanding VPC
-    # peering connection requests.
+    # must be the owner of the peer VPC. Use DescribeVpcPeeringConnections
+    # to view your outstanding VPC peering connection requests.
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -487,13 +488,18 @@ module Aws::EC2
     # \[EC2-Classic, VPC in an EC2-VPC-only account\] If the Elastic IP
     # address is already associated with a different instance, it is
     # disassociated from that instance and associated with the specified
-    # instance.
+    # instance. If you associate an Elastic IP address with an instance that
+    # has an existing Elastic IP address, the existing address is
+    # disassociated from the instance, but remains allocated to your
+    # account.
     #
     # \[VPC in an EC2-Classic account\] If you don't specify a private IP
     # address, the Elastic IP address is associated with the primary IP
     # address. If the Elastic IP address is already associated with a
     # different instance or a network interface, you get an error unless you
-    # allow reassociation.
+    # allow reassociation. You cannot associate an Elastic IP address with
+    # an instance or network interface that has an existing Elastic IP
+    # address.
     #
     # This is an idempotent operation. If you perform the operation more
     # than once, Amazon EC2 doesn't return an error, and you may be charged
@@ -1027,9 +1033,11 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Attaches a virtual private gateway to a VPC. For more information, see
-    # [Adding a Hardware Virtual Private Gateway to Your VPC][1] in the
-    # *Amazon Virtual Private Cloud User Guide*.
+    # Attaches a virtual private gateway to a VPC. You can attach one
+    # virtual private gateway to one VPC at a time.
+    #
+    # For more information, see [Adding a Hardware Virtual Private Gateway
+    # to Your VPC][1] in the *Amazon Virtual Private Cloud User Guide*.
     #
     #
     #
@@ -2133,16 +2141,16 @@ module Aws::EC2
     #   specified in `domain-name`, you must set `domain-name-servers` to a
     #   custom DNS server.
     #
-    # * `domain-name` - If you're using AmazonProvidedDNS in "us-east-1",
-    #   specify "ec2.internal". If you're using AmazonProvidedDNS in
-    #   another region, specify "region.compute.internal" (for example,
-    #   "ap-northeast-1.compute.internal"). Otherwise, specify a domain
-    #   name (for example, "MyCompany.com"). This value is used to
-    #   complete unqualified DNS hostnames. **Important**\: Some Linux
-    #   operating systems accept multiple domain names separated by spaces.
-    #   However, Windows and other Linux operating systems treat the value
-    #   as a single domain, which results in unexpected behavior. If your
-    #   DHCP options set is associated with a VPC that has instances with
+    # * `domain-name` - If you're using AmazonProvidedDNS in `us-east-1`,
+    #   specify `ec2.internal`. If you're using AmazonProvidedDNS in
+    #   another region, specify `region.compute.internal` (for example,
+    #   `ap-northeast-1.compute.internal`). Otherwise, specify a domain name
+    #   (for example, `MyCompany.com`). This value is used to complete
+    #   unqualified DNS hostnames. **Important**\: Some Linux operating
+    #   systems accept multiple domain names separated by spaces. However,
+    #   Windows and other Linux operating systems treat the value as a
+    #   single domain, which results in unexpected behavior. If your DHCP
+    #   options set is associated with a VPC that has instances with
     #   multiple operating systems, specify only one domain name.
     #
     # * `ntp-servers` - The IP addresses of up to four Network Time Protocol
@@ -2344,6 +2352,85 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Creates an Amazon FPGA Image (AFI) from the specified design
+    # checkpoint (DCP).
+    #
+    # The create operation is asynchronous. To verify that the AFI is ready
+    # for use, check the output logs.
+    #
+    # An AFI contains the FPGA bitstream that is ready to download to an
+    # FPGA. You can securely deploy an AFI on one or more FPGA-accelerated
+    # instances. For more information, see the [AWS FPGA Hardware
+    # Development Kit][1].
+    #
+    #
+    #
+    # [1]: https://github.com/aws/aws-fpga/
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [required, Types::StorageLocation] :input_storage_location
+    #   The location of the encrypted design checkpoint in Amazon S3. The
+    #   input must be a tarball.
+    #
+    # @option params [Types::StorageLocation] :logs_storage_location
+    #   The location in Amazon S3 for the output logs.
+    #
+    # @option params [String] :description
+    #   A description for the AFI.
+    #
+    # @option params [String] :name
+    #   A name for the AFI.
+    #
+    # @option params [String] :client_token
+    #   Unique, case-sensitive identifier that you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensuring
+    #   Idempotency][1].
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
+    #
+    # @return [Types::CreateFpgaImageResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::CreateFpgaImageResult#fpga_image_id #fpga_image_id} => String
+    #   * {Types::CreateFpgaImageResult#fpga_image_global_id #fpga_image_global_id} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.create_fpga_image({
+    #     dry_run: false,
+    #     input_storage_location: { # required
+    #       bucket: "String",
+    #       key: "String",
+    #     },
+    #     logs_storage_location: {
+    #       bucket: "String",
+    #       key: "String",
+    #     },
+    #     description: "String",
+    #     name: "String",
+    #     client_token: "String",
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.fpga_image_id #=> String
+    #   resp.fpga_image_global_id #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFpgaImage AWS API Documentation
+    #
+    # @overload create_fpga_image(params = {})
+    # @param [Hash] params ({})
+    def create_fpga_image(params = {}, options = {})
+      req = build_request(:create_fpga_image, params)
+      req.send_request(options)
+    end
+
     # Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance
     # that is either running or stopped.
     #
@@ -3554,7 +3641,7 @@ module Aws::EC2
     # 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.
     #
-    # AWS reserves both the first four and the last IP address in each
+    # AWS reserves both the first four and the last IPv4 address in each
     # subnet's CIDR block. They're not available for use.
     #
     # If you add more than one subnet to a VPC, they're set up in a star
@@ -3711,14 +3798,18 @@ module Aws::EC2
     # [Amazon EBS Encryption][2] in the *Amazon Elastic Compute Cloud User
     # Guide*.
     #
-    # For more information, see [Creating or Restoring an Amazon EBS
-    # Volume][3] in the *Amazon Elastic Compute Cloud User Guide*.
+    # You can tag your volumes during creation. For more information, see
+    # [Tagging Your Amazon EC2 Resources][3].
+    #
+    # For more information, see [Creating an Amazon EBS Volume][4] in the
+    # *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
     # [1]: http://docs.aws.amazon.com/general/latest/gr/rande.html
     # [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
-    # [3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-creating-volume.html
+    # [3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html
+    # [4]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-creating-volume.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -3784,6 +3875,9 @@ module Aws::EC2
     #   arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
     #   If a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
     #
+    # @option params [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the volume during creation.
+    #
     # @return [Types::Volume] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::Volume#volume_id #volume_id} => String
@@ -3810,6 +3904,17 @@ module Aws::EC2
     #     iops: 1,
     #     encrypted: false,
     #     kms_key_id: "String",
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -4027,8 +4132,8 @@ module Aws::EC2
     # the peering connection. The VPC peering connection request expires
     # after 7 days, after which it cannot be accepted or rejected.
     #
-    # A `CreateVpcPeeringConnection` request between VPCs with overlapping
-    # CIDR blocks results in the VPC peering connection having a status of
+    # If you try to create a VPC peering connection between VPCs that have
+    # overlapping CIDR blocks, the VPC peering connection status goes to
     # `failed`.
     #
     # @option params [Boolean] :dry_run
@@ -7120,18 +7225,6 @@ module Aws::EC2
     #
     #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
     #
-    #   * `association.public-ip` - The address of the Elastic IP address
-    #     (IPv4) bound to the network interface.
-    #
-    #   * `association.ip-owner-id` - The owner of the Elastic IP address
-    #     (IPv4) associated with the network interface.
-    #
-    #   * `association.allocation-id` - The allocation ID returned when you
-    #     allocated the Elastic IP address (IPv4) for your network interface.
-    #
-    #   * `association.association-id` - The association ID returned when the
-    #     network interface was associated with an IPv4 address.
-    #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -7222,6 +7315,20 @@ module Aws::EC2
     #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
     #     of the private IPv4 address associated with the network interface.
     #
+    #   * `network-interface.association.public-ip` - The address of the
+    #     Elastic IP address (IPv4) bound to the network interface.
+    #
+    #   * `network-interface.association.ip-owner-id` - The owner of the
+    #     Elastic IP address (IPv4) associated with the network interface.
+    #
+    #   * `network-interface.association.allocation-id` - The allocation ID
+    #     returned when you allocated the Elastic IP address (IPv4) for your
+    #     network interface.
+    #
+    #   * `network-interface.association.association-id` - The association ID
+    #     returned when the network interface was associated with an IPv4
+    #     address.
+    #
     #   * `network-interface.attachment.attachment-id` - The ID of the
     #     interface attachment.
     #
@@ -7952,7 +8059,7 @@ module Aws::EC2
     #   The ID of the network interface.
     #
     # @option params [String] :attribute
-    #   The attribute of the network interface.
+    #   The attribute of the network interface. This parameter is required.
     #
     # @return [Types::DescribeNetworkInterfaceAttributeResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -8827,6 +8934,9 @@ module Aws::EC2
     #   Instance with a tenancy of `dedicated` is applied to instances that
     #   run in a VPC on single-tenant hardware (i.e., Dedicated Instances).
     #
+    #   **Important:** The `host` value cannot be used with this parameter.
+    #   Use the `default` or `dedicated` values only.
+    #
     #   Default: `default`
     #
     # @option params [String] :offering_type
@@ -8971,7 +9081,8 @@ module Aws::EC2
     #     association.
     #
     #   * `association.main` - Indicates whether the route table is the main
-    #     route table for the VPC (`true` \| `false`).
+    #     route table for the VPC (`true` \| `false`). Route tables that do
+    #     not have an association ID are not returned in the response.
     #
     #   * `route-table-id` - The ID of the route table.
     #
@@ -10684,7 +10795,7 @@ module Aws::EC2
     #   The ID of the volume.
     #
     # @option params [String] :attribute
-    #   The instance attribute.
+    #   The attribute of the volume. This parameter is required.
     #
     # @return [Types::DescribeVolumeAttributeResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -11242,8 +11353,8 @@ module Aws::EC2
     # its private IP address when addressed from an instance in the VPC to
     # which it's linked. Similarly, the DNS hostname of an instance in a
     # VPC resolves to its private IP address when addressed from a linked
-    # EC2-Classic instance. For more information about ClassicLink, see
-    # [ClassicLink][1] in the Amazon Elastic Compute Cloud User Guide.
+    # EC2-Classic instance. For more information, see [ClassicLink][1] in
+    # the *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -11889,7 +12000,7 @@ module Aws::EC2
 
     # Detaches an Internet gateway from a VPC, disabling connectivity
     # between the Internet and the VPC. The VPC must not contain any running
-    # instances with Elastic IP addresses.
+    # instances with Elastic IP addresses or public IPv4 addresses.
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -12144,7 +12255,7 @@ module Aws::EC2
     # resolve to public IP addresses when addressed between a linked
     # EC2-Classic instance and instances in the VPC to which it's linked.
     # For more information about ClassicLink, see [ClassicLink][1] in the
-    # Amazon Elastic Compute Cloud User Guide.
+    # *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -12431,8 +12542,8 @@ module Aws::EC2
     # VPC's route tables have existing routes for address ranges within the
     # `10.0.0.0/8` IP address range, excluding local routes for VPCs in the
     # `10.0.0.0/16` and `10.1.0.0/16` IP address ranges. For more
-    # information, see [ClassicLink][1] in the Amazon Elastic Compute Cloud
-    # User Guide.
+    # information, see [ClassicLink][1] in the *Amazon Elastic Compute Cloud
+    # User Guide*.
     #
     #
     #
@@ -14793,8 +14904,8 @@ module Aws::EC2
     #
     # You can also use `RegisterImage` to create an Amazon EBS-backed Linux
     # AMI from a snapshot of a root device volume. You specify the snapshot
-    # using the block device mapping. For more information, see [Launching
-    # an Instance from a Snapshot][2] in the *Amazon Elastic Compute Cloud
+    # using the block device mapping. For more information, see [Launching a
+    # Linux Instance from a Backup][2] in the *Amazon Elastic Compute Cloud
     # User Guide*.
     #
     # You can't register an image where a secondary (non-root) snapshot has
@@ -14816,7 +14927,7 @@ module Aws::EC2
     #
     #
     # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami.html
-    # [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_LaunchingInstanceFromSnapshot.html
+    # [2]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-launch-snapshot.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -14850,7 +14961,9 @@ module Aws::EC2
     #   The ID of the RAM disk.
     #
     # @option params [Array<String>] :billing_products
-    #   The billing product codes.
+    #   The billing product codes. Your account must be authorized to specify
+    #   billing product codes. Otherwise, you can use the AWS Marketplace to
+    #   bill for the use of an AMI.
     #
     # @option params [String] :root_device_name
     #   The name of the root device (for example, `/dev/sda1`, or
@@ -16337,10 +16450,10 @@ module Aws::EC2
     # 100 instances each instead of 1 launch request for 500 instances.
     #
     # An instance is ready for you to use when it's in the `running` state.
-    # You can check the state of your instance using DescribeInstances.
-    # After launch, you can apply tags to your running instance (requires a
-    # resource ID). For more information, see CreateTags and [Tagging Your
-    # Amazon EC2 Resources][4].
+    # You can check the state of your instance using DescribeInstances. You
+    # can tag instances and EBS volumes during launch, after launch, or
+    # both. For more information, see CreateTags and [Tagging Your Amazon
+    # EC2 Resources][4].
     #
     # Linux instances have access to the public key of the key pair at boot.
     # You can use this key to provide secure access to the instance. Amazon
@@ -16555,6 +16668,11 @@ module Aws::EC2
     #
     #   Default: `false`
     #
+    # @option params [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the resources during launch. You can tag
+    #   instances and volumes. The specified tags are applied to all instances
+    #   or volumes that are created during launch.
+    #
     # @return [Types::Reservation] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::Reservation#reservation_id #reservation_id} => String
@@ -16644,6 +16762,17 @@ module Aws::EC2
     #       name: "String",
     #     },
     #     ebs_optimized: false,
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -17233,7 +17362,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.0.0.rc3'
+      context[:gem_version] = '1.0.0.rc4'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -130,6 +130,8 @@ module Aws::EC2
     CreateEgressOnlyInternetGatewayResult = Shapes::StructureShape.new(name: 'CreateEgressOnlyInternetGatewayResult')
     CreateFlowLogsRequest = Shapes::StructureShape.new(name: 'CreateFlowLogsRequest')
     CreateFlowLogsResult = Shapes::StructureShape.new(name: 'CreateFlowLogsResult')
+    CreateFpgaImageRequest = Shapes::StructureShape.new(name: 'CreateFpgaImageRequest')
+    CreateFpgaImageResult = Shapes::StructureShape.new(name: 'CreateFpgaImageResult')
     CreateImageRequest = Shapes::StructureShape.new(name: 'CreateImageRequest')
     CreateImageResult = Shapes::StructureShape.new(name: 'CreateImageResult')
     CreateInstanceExportTaskRequest = Shapes::StructureShape.new(name: 'CreateInstanceExportTaskRequest')
@@ -815,6 +817,7 @@ module Aws::EC2
     StopInstancesRequest = Shapes::StructureShape.new(name: 'StopInstancesRequest')
     StopInstancesResult = Shapes::StructureShape.new(name: 'StopInstancesResult')
     Storage = Shapes::StructureShape.new(name: 'Storage')
+    StorageLocation = Shapes::StructureShape.new(name: 'StorageLocation')
     String = Shapes::StringShape.new(name: 'String')
     Subnet = Shapes::StructureShape.new(name: 'Subnet')
     SubnetCidrBlockState = Shapes::StructureShape.new(name: 'SubnetCidrBlockState')
@@ -829,6 +832,8 @@ module Aws::EC2
     TagDescription = Shapes::StructureShape.new(name: 'TagDescription')
     TagDescriptionList = Shapes::ListShape.new(name: 'TagDescriptionList')
     TagList = Shapes::ListShape.new(name: 'TagList')
+    TagSpecification = Shapes::StructureShape.new(name: 'TagSpecification')
+    TagSpecificationList = Shapes::ListShape.new(name: 'TagSpecificationList')
     TargetConfiguration = Shapes::StructureShape.new(name: 'TargetConfiguration')
     TargetConfigurationRequest = Shapes::StructureShape.new(name: 'TargetConfigurationRequest')
     TargetConfigurationRequestSet = Shapes::ListShape.new(name: 'TargetConfigurationRequestSet')
@@ -1355,6 +1360,18 @@ module Aws::EC2
     CreateFlowLogsResult.add_member(:unsuccessful, Shapes::ShapeRef.new(shape: UnsuccessfulItemSet, location_name: "unsuccessful"))
     CreateFlowLogsResult.struct_class = Types::CreateFlowLogsResult
 
+    CreateFpgaImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateFpgaImageRequest.add_member(:input_storage_location, Shapes::ShapeRef.new(shape: StorageLocation, required: true, location_name: "InputStorageLocation"))
+    CreateFpgaImageRequest.add_member(:logs_storage_location, Shapes::ShapeRef.new(shape: StorageLocation, location_name: "LogsStorageLocation"))
+    CreateFpgaImageRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    CreateFpgaImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "Name"))
+    CreateFpgaImageRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
+    CreateFpgaImageRequest.struct_class = Types::CreateFpgaImageRequest
+
+    CreateFpgaImageResult.add_member(:fpga_image_id, Shapes::ShapeRef.new(shape: String, location_name: "fpgaImageId"))
+    CreateFpgaImageResult.add_member(:fpga_image_global_id, Shapes::ShapeRef.new(shape: String, location_name: "fpgaImageGlobalId"))
+    CreateFpgaImageResult.struct_class = Types::CreateFpgaImageResult
+
     CreateImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateImageRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "instanceId"))
     CreateImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "name"))
@@ -1518,6 +1535,7 @@ module Aws::EC2
     CreateVolumeRequest.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "Iops"))
     CreateVolumeRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
     CreateVolumeRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "KmsKeyId"))
+    CreateVolumeRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateVolumeRequest.struct_class = Types::CreateVolumeRequest
 
     CreateVpcEndpointRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -4008,6 +4026,7 @@ module Aws::EC2
     RunInstancesRequest.add_member(:network_interfaces, Shapes::ShapeRef.new(shape: InstanceNetworkInterfaceSpecificationList, location_name: "networkInterface"))
     RunInstancesRequest.add_member(:iam_instance_profile, Shapes::ShapeRef.new(shape: IamInstanceProfileSpecification, location_name: "iamInstanceProfile"))
     RunInstancesRequest.add_member(:ebs_optimized, Shapes::ShapeRef.new(shape: Boolean, location_name: "ebsOptimized"))
+    RunInstancesRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     RunInstancesRequest.struct_class = Types::RunInstancesRequest
 
     RunScheduledInstancesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -4374,6 +4393,10 @@ module Aws::EC2
     Storage.add_member(:s3, Shapes::ShapeRef.new(shape: S3Storage, location_name: "S3"))
     Storage.struct_class = Types::Storage
 
+    StorageLocation.add_member(:bucket, Shapes::ShapeRef.new(shape: String, location_name: "Bucket"))
+    StorageLocation.add_member(:key, Shapes::ShapeRef.new(shape: String, location_name: "Key"))
+    StorageLocation.struct_class = Types::StorageLocation
+
     Subnet.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
     Subnet.add_member(:state, Shapes::ShapeRef.new(shape: SubnetState, location_name: "state"))
     Subnet.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
@@ -4416,6 +4439,12 @@ module Aws::EC2
 
     TagList.member = Shapes::ShapeRef.new(shape: Tag, location_name: "item")
 
+    TagSpecification.add_member(:resource_type, Shapes::ShapeRef.new(shape: ResourceType, location_name: "resourceType"))
+    TagSpecification.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tag"))
+    TagSpecification.struct_class = Types::TagSpecification
+
+    TagSpecificationList.member = Shapes::ShapeRef.new(shape: TagSpecification, location_name: "item")
+
     TargetConfiguration.add_member(:offering_id, Shapes::ShapeRef.new(shape: String, location_name: "offeringId"))
     TargetConfiguration.add_member(:instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "instanceCount"))
     TargetConfiguration.struct_class = Types::TargetConfiguration
@@ -4997,6 +5026,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateFlowLogsResult)
       end)
 
+      api.add_operation(:create_fpga_image, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateFpgaImage"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateFpgaImageRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateFpgaImageResult)
+      end)
+
       api.add_operation(:create_image, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateImage"
         o.http_method = "POST"

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

@@ -299,7 +299,7 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [String] :attribute
-    #   The attribute of the network interface.
+    #   The attribute of the network interface. This parameter is required.
     # @return [Types::DescribeNetworkInterfaceAttributeResult]
     def describe_attribute(options = {})
       options = options.merge(network_interface_id: @id)

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

@@ -130,18 +130,6 @@ module Aws::EC2
     #
     #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
     #
-    #   * `association.public-ip` - The address of the Elastic IP address
-    #     (IPv4) bound to the network interface.
-    #
-    #   * `association.ip-owner-id` - The owner of the Elastic IP address
-    #     (IPv4) associated with the network interface.
-    #
-    #   * `association.allocation-id` - The allocation ID returned when you
-    #     allocated the Elastic IP address (IPv4) for your network interface.
-    #
-    #   * `association.association-id` - The association ID returned when the
-    #     network interface was associated with an IPv4 address.
-    #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -232,6 +220,20 @@ module Aws::EC2
     #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
     #     of the private IPv4 address associated with the network interface.
     #
+    #   * `network-interface.association.public-ip` - The address of the
+    #     Elastic IP address (IPv4) bound to the network interface.
+    #
+    #   * `network-interface.association.ip-owner-id` - The owner of the
+    #     Elastic IP address (IPv4) associated with the network interface.
+    #
+    #   * `network-interface.association.allocation-id` - The allocation ID
+    #     returned when you allocated the Elastic IP address (IPv4) for your
+    #     network interface.
+    #
+    #   * `network-interface.association.association-id` - The association ID
+    #     returned when the network interface was associated with an IPv4
+    #     address.
+    #
     #   * `network-interface.attachment.attachment-id` - The ID of the
     #     interface attachment.
     #

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

@@ -131,6 +131,17 @@ module Aws::EC2
     #       name: "String",
     #     },
     #     ebs_optimized: false,
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -301,6 +312,10 @@ module Aws::EC2
     #   usage charges apply when using an EBS-optimized instance.
     #
     #   Default: `false`
+    # @option options [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the resources during launch. You can tag
+    #   instances and volumes. The specified tags are applied to all instances
+    #   or volumes that are created during launch.
     # @return [Instance::Collection]
     def create_instances(options = {})
       batch = []
@@ -665,6 +680,17 @@ module Aws::EC2
     #     iops: 1,
     #     encrypted: false,
     #     kms_key_id: "String",
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -723,6 +749,8 @@ module Aws::EC2
     #   then the CMK ID. For example,
     #   arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
     #   If a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    # @option options [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the volume during creation.
     # @return [Volume]
     def create_volume(options = {})
       resp = @client.create_volume(options)
@@ -914,7 +942,9 @@ module Aws::EC2
     # @option options [String] :ramdisk_id
     #   The ID of the RAM disk.
     # @option options [Array<String>] :billing_products
-    #   The billing product codes.
+    #   The billing product codes. Your account must be authorized to specify
+    #   billing product codes. Otherwise, you can use the AWS Marketplace to
+    #   bill for the use of an AMI.
     # @option options [String] :root_device_name
     #   The name of the root device (for example, `/dev/sda1`, or
     #   `/dev/xvda`).
@@ -1282,18 +1312,6 @@ module Aws::EC2
     #
     #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
     #
-    #   * `association.public-ip` - The address of the Elastic IP address
-    #     (IPv4) bound to the network interface.
-    #
-    #   * `association.ip-owner-id` - The owner of the Elastic IP address
-    #     (IPv4) associated with the network interface.
-    #
-    #   * `association.allocation-id` - The allocation ID returned when you
-    #     allocated the Elastic IP address (IPv4) for your network interface.
-    #
-    #   * `association.association-id` - The association ID returned when the
-    #     network interface was associated with an IPv4 address.
-    #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -1384,6 +1402,20 @@ module Aws::EC2
     #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
     #     of the private IPv4 address associated with the network interface.
     #
+    #   * `network-interface.association.public-ip` - The address of the
+    #     Elastic IP address (IPv4) bound to the network interface.
+    #
+    #   * `network-interface.association.ip-owner-id` - The owner of the
+    #     Elastic IP address (IPv4) associated with the network interface.
+    #
+    #   * `network-interface.association.allocation-id` - The allocation ID
+    #     returned when you allocated the Elastic IP address (IPv4) for your
+    #     network interface.
+    #
+    #   * `network-interface.association.association-id` - The association ID
+    #     returned when the network interface was associated with an IPv4
+    #     address.
+    #
     #   * `network-interface.attachment.attachment-id` - The ID of the
     #     interface attachment.
     #
@@ -2071,7 +2103,8 @@ module Aws::EC2
     #     association.
     #
     #   * `association.main` - Indicates whether the route table is the main
-    #     route table for the VPC (`true` \| `false`).
+    #     route table for the VPC (`true` \| `false`). Route tables that do
+    #     not have an association ID are not returned in the response.
     #
     #   * `route-table-id` - The ID of the route table.
     #

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

@@ -214,6 +214,17 @@ module Aws::EC2
     #       name: "String",
     #     },
     #     ebs_optimized: false,
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -382,6 +393,10 @@ module Aws::EC2
     #   usage charges apply when using an EBS-optimized instance.
     #
     #   Default: `false`
+    # @option options [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the resources during launch. You can tag
+    #   instances and volumes. The specified tags are applied to all instances
+    #   or volumes that are created during launch.
     # @return [Instance::Collection]
     def create_instances(options = {})
       batch = []
@@ -559,18 +574,6 @@ module Aws::EC2
     #
     #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
     #
-    #   * `association.public-ip` - The address of the Elastic IP address
-    #     (IPv4) bound to the network interface.
-    #
-    #   * `association.ip-owner-id` - The owner of the Elastic IP address
-    #     (IPv4) associated with the network interface.
-    #
-    #   * `association.allocation-id` - The allocation ID returned when you
-    #     allocated the Elastic IP address (IPv4) for your network interface.
-    #
-    #   * `association.association-id` - The association ID returned when the
-    #     network interface was associated with an IPv4 address.
-    #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -661,6 +664,20 @@ module Aws::EC2
     #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
     #     of the private IPv4 address associated with the network interface.
     #
+    #   * `network-interface.association.public-ip` - The address of the
+    #     Elastic IP address (IPv4) bound to the network interface.
+    #
+    #   * `network-interface.association.ip-owner-id` - The owner of the
+    #     Elastic IP address (IPv4) associated with the network interface.
+    #
+    #   * `network-interface.association.allocation-id` - The allocation ID
+    #     returned when you allocated the Elastic IP address (IPv4) for your
+    #     network interface.
+    #
+    #   * `network-interface.association.association-id` - The association ID
+    #     returned when the network interface was associated with an IPv4
+    #     address.
+    #
     #   * `network-interface.attachment.attachment-id` - The ID of the
     #     interface attachment.
     #

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

@@ -151,8 +151,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] instance_health
-    #   The health status of the instance. If the status of both the
-    #   instance status check and the system status check is `impaired`, the
+    #   The health status of the instance. If the status of either the
+    #   instance status check or the system status check is `impaired`, the
     #   health status of the instance is `unhealthy`. Otherwise, the health
     #   status is `healthy`.
     #   @return [String]
@@ -2555,6 +2555,86 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateFpgaImageRequest
+    #   data as a hash:
+    #
+    #       {
+    #         dry_run: false,
+    #         input_storage_location: { # required
+    #           bucket: "String",
+    #           key: "String",
+    #         },
+    #         logs_storage_location: {
+    #           bucket: "String",
+    #           key: "String",
+    #         },
+    #         description: "String",
+    #         name: "String",
+    #         client_token: "String",
+    #       }
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] input_storage_location
+    #   The location of the encrypted design checkpoint in Amazon S3. The
+    #   input must be a tarball.
+    #   @return [Types::StorageLocation]
+    #
+    # @!attribute [rw] logs_storage_location
+    #   The location in Amazon S3 for the output logs.
+    #   @return [Types::StorageLocation]
+    #
+    # @!attribute [rw] description
+    #   A description for the AFI.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   A name for the AFI.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_token
+    #   Unique, case-sensitive identifier that you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensuring
+    #   Idempotency][1].
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFpgaImageRequest AWS API Documentation
+    #
+    class CreateFpgaImageRequest < Struct.new(
+      :dry_run,
+      :input_storage_location,
+      :logs_storage_location,
+      :description,
+      :name,
+      :client_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] fpga_image_id
+    #   The FPGA image identifier (AFI ID).
+    #   @return [String]
+    #
+    # @!attribute [rw] fpga_image_global_id
+    #   The global FPGA image identifier (AGFI ID).
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFpgaImageResult AWS API Documentation
+    #
+    class CreateFpgaImageResult < Struct.new(
+      :fpga_image_id,
+      :fpga_image_global_id)
+      include Aws::Structure
+    end
+
     # Contains the parameters for CreateImage.
     #
     # @note When making an API call, you may pass CreateImageRequest
@@ -3670,6 +3750,17 @@ module Aws::EC2
     #         iops: 1,
     #         encrypted: false,
     #         kms_key_id: "String",
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] dry_run
@@ -3744,6 +3835,10 @@ module Aws::EC2
     #   If a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
     #   @return [String]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the volume during creation.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateVolumeRequest AWS API Documentation
     #
     class CreateVolumeRequest < Struct.new(
@@ -3754,7 +3849,8 @@ module Aws::EC2
       :volume_type,
       :iops,
       :encrypted,
-      :kms_key_id)
+      :kms_key_id,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -6681,19 +6777,6 @@ module Aws::EC2
     #
     #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
     #
-    #   * `association.public-ip` - The address of the Elastic IP address
-    #     (IPv4) bound to the network interface.
-    #
-    #   * `association.ip-owner-id` - The owner of the Elastic IP address
-    #     (IPv4) associated with the network interface.
-    #
-    #   * `association.allocation-id` - The allocation ID returned when you
-    #     allocated the Elastic IP address (IPv4) for your network
-    #     interface.
-    #
-    #   * `association.association-id` - The association ID returned when
-    #     the network interface was associated with an IPv4 address.
-    #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -6789,6 +6872,20 @@ module Aws::EC2
     #     ID of the private IPv4 address associated with the network
     #     interface.
     #
+    #   * `network-interface.association.public-ip` - The address of the
+    #     Elastic IP address (IPv4) bound to the network interface.
+    #
+    #   * `network-interface.association.ip-owner-id` - The owner of the
+    #     Elastic IP address (IPv4) associated with the network interface.
+    #
+    #   * `network-interface.association.allocation-id` - The allocation ID
+    #     returned when you allocated the Elastic IP address (IPv4) for your
+    #     network interface.
+    #
+    #   * `network-interface.association.association-id` - The association
+    #     ID returned when the network interface was associated with an IPv4
+    #     address.
+    #
     #   * `network-interface.attachment.attachment-id` - The ID of the
     #     interface attachment.
     #
@@ -7423,7 +7520,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] attribute
-    #   The attribute of the network interface.
+    #   The attribute of the network interface. This parameter is required.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeNetworkInterfaceAttributeRequest AWS API Documentation
@@ -8107,6 +8204,9 @@ module Aws::EC2
     #   Instance with a tenancy of `dedicated` is applied to instances that
     #   run in a VPC on single-tenant hardware (i.e., Dedicated Instances).
     #
+    #   **Important:** The `host` value cannot be used with this parameter.
+    #   Use the `default` or `dedicated` values only.
+    #
     #   Default: `default`
     #   @return [String]
     #
@@ -8370,7 +8470,8 @@ module Aws::EC2
     #     association.
     #
     #   * `association.main` - Indicates whether the route table is the main
-    #     route table for the VPC (`true` \| `false`).
+    #     route table for the VPC (`true` \| `false`). Route tables that do
+    #     not have an association ID are not returned in the response.
     #
     #   * `route-table-id` - The ID of the route table.
     #
@@ -9847,7 +9948,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] attribute
-    #   The instance attribute.
+    #   The attribute of the volume. This parameter is required.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeVolumeAttributeRequest AWS API Documentation
@@ -17826,7 +17927,9 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] billing_products
-    #   The billing product codes.
+    #   The billing product codes. Your account must be authorized to
+    #   specify billing product codes. Otherwise, you can use the AWS
+    #   Marketplace to bill for the use of an AMI.
     #   @return [Array<String>]
     #
     # @!attribute [rw] root_device_name
@@ -20120,6 +20223,17 @@ module Aws::EC2
     #           name: "String",
     #         },
     #         ebs_optimized: false,
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] dry_run
@@ -20342,6 +20456,12 @@ module Aws::EC2
     #   Default: `false`
     #   @return [Boolean]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the resources during launch. You can tag
+    #   instances and volumes. The specified tags are applied to all
+    #   instances or volumes that are created during launch.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RunInstancesRequest AWS API Documentation
     #
     class RunInstancesRequest < Struct.new(
@@ -20369,7 +20489,8 @@ module Aws::EC2
       :additional_info,
       :network_interfaces,
       :iam_instance_profile,
-      :ebs_optimized)
+      :ebs_optimized,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -22689,6 +22810,32 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes a storage location in Amazon S3.
+    #
+    # @note When making an API call, you may pass StorageLocation
+    #   data as a hash:
+    #
+    #       {
+    #         bucket: "String",
+    #         key: "String",
+    #       }
+    #
+    # @!attribute [rw] bucket
+    #   The name of the S3 bucket.
+    #   @return [String]
+    #
+    # @!attribute [rw] key
+    #   The key.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/StorageLocation AWS API Documentation
+    #
+    class StorageLocation < Struct.new(
+      :bucket,
+      :key)
+      include Aws::Structure
+    end
+
     # Describes a subnet.
     #
     # @!attribute [rw] subnet_id
@@ -22859,6 +23006,38 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The tags to apply to a resource when the resource is being created.
+    #
+    # @note When making an API call, you may pass TagSpecification
+    #   data as a hash:
+    #
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] resource_type
+    #   The type of resource to tag. Currently, the resource types that
+    #   support tagging on creation are `instance` and `volume`.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   The tags to apply to the resource.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/TagSpecification AWS API Documentation
+    #
+    class TagSpecification < Struct.new(
+      :resource_type,
+      :tags)
+      include Aws::Structure
+    end
+
     # Information about the Convertible Reserved Instance offering.
     #
     # @!attribute [rw] offering_id

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

@@ -274,7 +274,7 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [String] :attribute
-    #   The instance attribute.
+    #   The attribute of the volume. This parameter is required.
     # @return [Types::DescribeVolumeAttributeResult]
     def describe_attribute(options = {})
       options = options.merge(volume_id: @id)

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

@@ -705,18 +705,6 @@ module Aws::EC2
     #
     #   * `architecture` - The instance architecture (`i386` \| `x86_64`).
     #
-    #   * `association.public-ip` - The address of the Elastic IP address
-    #     (IPv4) bound to the network interface.
-    #
-    #   * `association.ip-owner-id` - The owner of the Elastic IP address
-    #     (IPv4) associated with the network interface.
-    #
-    #   * `association.allocation-id` - The allocation ID returned when you
-    #     allocated the Elastic IP address (IPv4) for your network interface.
-    #
-    #   * `association.association-id` - The association ID returned when the
-    #     network interface was associated with an IPv4 address.
-    #
     #   * `availability-zone` - The Availability Zone of the instance.
     #
     #   * `block-device-mapping.attach-time` - The attach time for an EBS
@@ -807,6 +795,20 @@ module Aws::EC2
     #   * `network-interface.addresses.association.ip-owner-id` - The owner ID
     #     of the private IPv4 address associated with the network interface.
     #
+    #   * `network-interface.association.public-ip` - The address of the
+    #     Elastic IP address (IPv4) bound to the network interface.
+    #
+    #   * `network-interface.association.ip-owner-id` - The owner of the
+    #     Elastic IP address (IPv4) associated with the network interface.
+    #
+    #   * `network-interface.association.allocation-id` - The allocation ID
+    #     returned when you allocated the Elastic IP address (IPv4) for your
+    #     network interface.
+    #
+    #   * `network-interface.association.association-id` - The association ID
+    #     returned when the network interface was associated with an IPv4
+    #     address.
+    #
     #   * `network-interface.attachment.attachment-id` - The ID of the
     #     interface attachment.
     #
@@ -1443,7 +1445,8 @@ module Aws::EC2
     #     association.
     #
     #   * `association.main` - Indicates whether the route table is the main
-    #     route table for the VPC (`true` \| `false`).
+    #     route table for the VPC (`true` \| `false`). Route tables that do
+    #     not have an association ID are not returned in the response.
     #
     #   * `route-table-id` - The ID of the route table.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core