aws-sdk-ec2 1.0.0.rc7 → 1.0.0.rc8

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

@@ -31,29 +31,48 @@ module Aws::EC2
     end
     alias :snapshot_id :id
 
-    # The ID of the volume that was used to create the snapshot. Snapshots
-    # created by the CopySnapshot action have an arbitrary volume ID that
-    # should not be used for any purpose.
+    # The data encryption key identifier for the snapshot. This value is a
+    # unique identifier that corresponds to the data encryption key that was
+    # used to encrypt the original volume or snapshot copy. Because data
+    # encryption keys are inherited by volumes created from snapshots, and
+    # vice versa, if snapshots share the same data encryption key
+    # identifier, then they belong to the same volume/snapshot lineage. This
+    # parameter is only returned by the DescribeSnapshots API operation.
     # @return [String]
-    def volume_id
-      data.volume_id
+    def data_encryption_key_id
+      data.data_encryption_key_id
     end
 
-    # The snapshot state.
+    # The description for the snapshot.
     # @return [String]
-    def state
-      data.state
+    def description
+      data.description
     end
 
-    # Encrypted Amazon EBS snapshots are copied asynchronously. If a
-    # snapshot copy operation fails (for example, if the proper AWS Key
-    # Management Service (AWS KMS) permissions are not obtained) this field
-    # displays error state details to help you diagnose why the error
-    # occurred. This parameter is only returned by the DescribeSnapshots API
-    # operation.
+    # Indicates whether the snapshot is encrypted.
+    # @return [Boolean]
+    def encrypted
+      data.encrypted
+    end
+
+    # The full ARN of the AWS Key Management Service (AWS KMS) customer
+    # master key (CMK) that was used to protect the volume encryption key
+    # for the parent volume.
     # @return [String]
-    def state_message
-      data.state_message
+    def kms_key_id
+      data.kms_key_id
+    end
+
+    # The AWS account ID of the EBS snapshot owner.
+    # @return [String]
+    def owner_id
+      data.owner_id
+    end
+
+    # The progress of the snapshot, as a percentage.
+    # @return [String]
+    def progress
+      data.progress
     end
 
     # The time stamp when the snapshot was initiated.
@@ -62,22 +81,29 @@ module Aws::EC2
       data.start_time
     end
 
-    # The progress of the snapshot, as a percentage.
+    # The snapshot state.
     # @return [String]
-    def progress
-      data.progress
+    def state
+      data.state
     end
 
-    # The AWS account ID of the EBS snapshot owner.
+    # Encrypted Amazon EBS snapshots are copied asynchronously. If a
+    # snapshot copy operation fails (for example, if the proper AWS Key
+    # Management Service (AWS KMS) permissions are not obtained) this field
+    # displays error state details to help you diagnose why the error
+    # occurred. This parameter is only returned by the DescribeSnapshots API
+    # operation.
     # @return [String]
-    def owner_id
-      data.owner_id
+    def state_message
+      data.state_message
     end
 
-    # The description for the snapshot.
+    # The ID of the volume that was used to create the snapshot. Snapshots
+    # created by the CopySnapshot action have an arbitrary volume ID that
+    # should not be used for any purpose.
     # @return [String]
-    def description
-      data.description
+    def volume_id
+      data.volume_id
     end
 
     # The size of the volume, in GiB.
@@ -100,32 +126,6 @@ module Aws::EC2
       data.tags
     end
 
-    # Indicates whether the snapshot is encrypted.
-    # @return [Boolean]
-    def encrypted
-      data.encrypted
-    end
-
-    # The full ARN of the AWS Key Management Service (AWS KMS) customer
-    # master key (CMK) that was used to protect the volume encryption key
-    # for the parent volume.
-    # @return [String]
-    def kms_key_id
-      data.kms_key_id
-    end
-
-    # The data encryption key identifier for the snapshot. This value is a
-    # unique identifier that corresponds to the data encryption key that was
-    # used to encrypt the original volume or snapshot copy. Because data
-    # encryption keys are inherited by volumes created from snapshots, and
-    # vice versa, if snapshots share the same data encryption key
-    # identifier, then they belong to the same volume/snapshot lineage. This
-    # parameter is only returned by the DescribeSnapshots API operation.
-    # @return [String]
-    def data_encryption_key_id
-      data.data_encryption_key_id
-    end
-
     # @!endgroup
 
     # @return [Client]
@@ -184,22 +184,15 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   snapshot.copy({
-    #     dry_run: false,
-    #     source_region: "String", # required
     #     description: "String",
     #     destination_region: "String",
-    #     presigned_url: "String",
     #     encrypted: false,
     #     kms_key_id: "String",
+    #     presigned_url: "String",
+    #     source_region: "String", # required
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-    # @option options [required, String] :source_region
-    #   The ID of the region that contains the snapshot to be copied.
     # @option options [String] :description
     #   A description for the EBS snapshot.
     # @option options [String] :destination_region
@@ -214,25 +207,6 @@ module Aws::EC2
     #   the default region in your AWS configuration file).
     #
     #    </note>
-    # @option options [String] :presigned_url
-    #   The pre-signed URL that facilitates copying an encrypted snapshot.
-    #   This parameter is only required when copying an encrypted snapshot
-    #   with the Amazon EC2 Query API; it is available as an optional
-    #   parameter in all other cases. The `PresignedUrl` should use the
-    #   snapshot source endpoint, the `CopySnapshot` action, and include the
-    #   `SourceRegion`, `SourceSnapshotId`, and `DestinationRegion`
-    #   parameters. The `PresignedUrl` must be signed using AWS Signature
-    #   Version 4. Because EBS snapshots are stored in Amazon S3, the signing
-    #   algorithm for this parameter uses the same logic that is described in
-    #   [Authenticating Requests by Using Query Parameters (AWS Signature
-    #   Version 4)][1] in the *Amazon Simple Storage Service API Reference*.
-    #   An invalid or improperly signed `PresignedUrl` will cause the copy
-    #   operation to fail asynchronously, and the snapshot will move to an
-    #   `error` state.
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html
     # @option options [Boolean] :encrypted
     #   Specifies whether the destination snapshot should be encrypted. You
     #   can encrypt a copy of an unencrypted snapshot using this flag, but you
@@ -256,6 +230,32 @@ module Aws::EC2
     #   The specified CMK must exist in the region that the snapshot is being
     #   copied to. If a `KmsKeyId` is specified, the `Encrypted` flag must
     #   also be set.
+    # @option options [String] :presigned_url
+    #   The pre-signed URL that facilitates copying an encrypted snapshot.
+    #   This parameter is only required when copying an encrypted snapshot
+    #   with the Amazon EC2 Query API; it is available as an optional
+    #   parameter in all other cases. The `PresignedUrl` should use the
+    #   snapshot source endpoint, the `CopySnapshot` action, and include the
+    #   `SourceRegion`, `SourceSnapshotId`, and `DestinationRegion`
+    #   parameters. The `PresignedUrl` must be signed using AWS Signature
+    #   Version 4. Because EBS snapshots are stored in Amazon S3, the signing
+    #   algorithm for this parameter uses the same logic that is described in
+    #   [Authenticating Requests by Using Query Parameters (AWS Signature
+    #   Version 4)][1] in the *Amazon Simple Storage Service API Reference*.
+    #   An invalid or improperly signed `PresignedUrl` will cause the copy
+    #   operation to fail asynchronously, and the snapshot will move to an
+    #   `error` state.
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html
+    # @option options [required, String] :source_region
+    #   The ID of the region that contains the snapshot to be copied.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::CopySnapshotResult]
     def copy(options = {})
       options = options.merge(source_snapshot_id: @id)
@@ -321,17 +321,17 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   snapshot.describe_attribute({
-    #     dry_run: false,
     #     attribute: "productCodes", # required, accepts productCodes, createVolumePermission
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [required, String] :attribute
+    #   The snapshot attribute you would like to view.
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-    # @option options [required, String] :attribute
-    #   The snapshot attribute you would like to view.
     # @return [Types::DescribeSnapshotAttributeResult]
     def describe_attribute(options = {})
       options = options.merge(snapshot_id: @id)
@@ -342,32 +342,27 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   snapshot.modify_attribute({
-    #     dry_run: false,
     #     attribute: "productCodes", # accepts productCodes, createVolumePermission
-    #     operation_type: "add", # accepts add, remove
-    #     user_ids: ["String"],
-    #     group_names: ["String"],
     #     create_volume_permission: {
     #       add: [
     #         {
-    #           user_id: "String",
     #           group: "all", # accepts all
+    #           user_id: "String",
     #         },
     #       ],
     #       remove: [
     #         {
-    #           user_id: "String",
     #           group: "all", # accepts all
+    #           user_id: "String",
     #         },
     #       ],
     #     },
+    #     group_names: ["String"],
+    #     operation_type: "add", # accepts add, remove
+    #     user_ids: ["String"],
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [String] :attribute
     #   The snapshot attribute to modify.
     #
@@ -375,14 +370,19 @@ module Aws::EC2
     #   level.
     #
     #    </note>
+    # @option options [Types::CreateVolumePermissionModifications] :create_volume_permission
+    #   A JSON representation of the snapshot attribute modification.
+    # @option options [Array<String>] :group_names
+    #   The group to modify for the snapshot.
     # @option options [String] :operation_type
     #   The type of operation to perform to the attribute.
     # @option options [Array<String>] :user_ids
     #   The account ID to modify for the snapshot.
-    # @option options [Array<String>] :group_names
-    #   The group to modify for the snapshot.
-    # @option options [Types::CreateVolumePermissionModifications] :create_volume_permission
-    #   A JSON representation of the snapshot attribute modification.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [EmptyStructure]
     def modify_attribute(options = {})
       options = options.merge(snapshot_id: @id)
@@ -393,18 +393,18 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   snapshot.reset_attribute({
-    #     dry_run: false,
     #     attribute: "productCodes", # required, accepts productCodes, createVolumePermission
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [required, String] :attribute
+    #   The attribute to reset. Currently, only the attribute for permission
+    #   to create volumes can be reset.
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-    # @option options [required, String] :attribute
-    #   The attribute to reset. Currently, only the attribute for permission
-    #   to create volumes can be reset.
     # @return [EmptyStructure]
     def reset_attribute(options = {})
       options = options.merge(snapshot_id: @id)

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

@@ -31,36 +31,10 @@ module Aws::EC2
     end
     alias :subnet_id :id
 
-    # The current state of the subnet.
-    # @return [String]
-    def state
-      data.state
-    end
-
-    # The ID of the VPC the subnet is in.
-    # @return [String]
-    def vpc_id
-      data.vpc_id
-    end
-
-    # The IPv4 CIDR block assigned to the subnet.
+    # The Availability Zone of the subnet.
     # @return [String]
-    def cidr_block
-      data.cidr_block
-    end
-
-    # Information about the IPv6 CIDR blocks associated with the subnet.
-    # @return [Array<Types::SubnetIpv6CidrBlockAssociation>]
-    def ipv_6_cidr_block_association_set
-      data.ipv_6_cidr_block_association_set
-    end
-
-    # Indicates whether a network interface created in this subnet
-    # (including a network interface created by RunInstances) receives an
-    # IPv6 address.
-    # @return [Boolean]
-    def assign_ipv_6_address_on_creation
-      data.assign_ipv_6_address_on_creation
+    def availability_zone
+      data.availability_zone
     end
 
     # The number of unused private IPv4 addresses in the subnet. Note that
@@ -71,10 +45,10 @@ module Aws::EC2
       data.available_ip_address_count
     end
 
-    # The Availability Zone of the subnet.
+    # The IPv4 CIDR block assigned to the subnet.
     # @return [String]
-    def availability_zone
-      data.availability_zone
+    def cidr_block
+      data.cidr_block
     end
 
     # Indicates whether this is the default subnet for the Availability
@@ -91,6 +65,32 @@ module Aws::EC2
       data.map_public_ip_on_launch
     end
 
+    # The current state of the subnet.
+    # @return [String]
+    def state
+      data.state
+    end
+
+    # The ID of the VPC the subnet is in.
+    # @return [String]
+    def vpc_id
+      data.vpc_id
+    end
+
+    # Indicates whether a network interface created in this subnet
+    # (including a network interface created by RunInstances) receives an
+    # IPv6 address.
+    # @return [Boolean]
+    def assign_ipv_6_address_on_creation
+      data.assign_ipv_6_address_on_creation
+    end
+
+    # Information about the IPv6 CIDR blocks associated with the subnet.
+    # @return [Array<Types::SubnetIpv6CidrBlockAssociation>]
+    def ipv_6_cidr_block_association_set
+      data.ipv_6_cidr_block_association_set
+    end
+
     # Any tags assigned to the subnet.
     # @return [Array<Types::Tag>]
     def tags
@@ -137,83 +137,84 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instance = subnet.create_instances({
-    #     dry_run: false,
-    #     image_id: "String", # required
-    #     min_count: 1, # required
-    #     max_count: 1, # required
-    #     key_name: "String",
-    #     security_groups: ["String"],
-    #     security_group_ids: ["String"],
-    #     user_data: "String",
-    #     instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, x1.16xlarge, x1.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, f1.2xlarge, f1.16xlarge
-    #     placement: {
-    #       availability_zone: "String",
-    #       group_name: "String",
-    #       tenancy: "default", # accepts default, dedicated, host
-    #       host_id: "String",
-    #       affinity: "String",
-    #     },
-    #     kernel_id: "String",
-    #     ramdisk_id: "String",
     #     block_device_mappings: [
     #       {
-    #         virtual_name: "String",
     #         device_name: "String",
+    #         virtual_name: "String",
     #         ebs: {
+    #           encrypted: false,
+    #           delete_on_termination: false,
+    #           iops: 1,
     #           snapshot_id: "String",
     #           volume_size: 1,
-    #           delete_on_termination: false,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           iops: 1,
-    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
     #     ],
-    #     monitoring: {
-    #       enabled: false, # required
-    #     },
-    #     disable_api_termination: false,
-    #     instance_initiated_shutdown_behavior: "stop", # accepts stop, terminate
-    #     private_ip_address: "String",
+    #     image_id: "String", # required
+    #     instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, x1.16xlarge, x1.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, f1.2xlarge, f1.16xlarge
+    #     ipv_6_address_count: 1,
     #     ipv_6_addresses: [
     #       {
     #         ipv_6_address: "String",
     #       },
     #     ],
-    #     ipv_6_address_count: 1,
-    #     client_token: "String",
+    #     kernel_id: "String",
+    #     key_name: "String",
+    #     max_count: 1, # required
+    #     min_count: 1, # required
+    #     monitoring: {
+    #       enabled: false, # required
+    #     },
+    #     placement: {
+    #       availability_zone: "String",
+    #       affinity: "String",
+    #       group_name: "String",
+    #       host_id: "String",
+    #       tenancy: "default", # accepts default, dedicated, host
+    #       spread_domain: "String",
+    #     },
+    #     ramdisk_id: "String",
+    #     security_group_ids: ["String"],
+    #     security_groups: ["String"],
+    #     user_data: "String",
     #     additional_info: "String",
+    #     client_token: "String",
+    #     disable_api_termination: false,
+    #     dry_run: false,
+    #     ebs_optimized: false,
+    #     iam_instance_profile: {
+    #       arn: "String",
+    #       name: "String",
+    #     },
+    #     instance_initiated_shutdown_behavior: "stop", # accepts stop, terminate
     #     network_interfaces: [
     #       {
-    #         network_interface_id: "String",
-    #         device_index: 1,
-    #         subnet_id: "String",
+    #         associate_public_ip_address: false,
+    #         delete_on_termination: false,
     #         description: "String",
-    #         private_ip_address: "String",
+    #         device_index: 1,
     #         groups: ["String"],
-    #         delete_on_termination: false,
-    #         private_ip_addresses: [
+    #         ipv_6_address_count: 1,
+    #         ipv_6_addresses: [
     #           {
-    #             private_ip_address: "String", # required
-    #             primary: false,
+    #             ipv_6_address: "String",
     #           },
     #         ],
-    #         secondary_private_ip_address_count: 1,
-    #         associate_public_ip_address: false,
-    #         ipv_6_addresses: [
+    #         network_interface_id: "String",
+    #         private_ip_address: "String",
+    #         private_ip_addresses: [
     #           {
-    #             ipv_6_address: "String",
+    #             primary: false,
+    #             private_ip_address: "String", # required
     #           },
     #         ],
-    #         ipv_6_address_count: 1,
+    #         secondary_private_ip_address_count: 1,
+    #         subnet_id: "String",
     #       },
     #     ],
-    #     iam_instance_profile: {
-    #       arn: "String",
-    #       name: "String",
-    #     },
-    #     ebs_optimized: false,
+    #     private_ip_address: "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
@@ -227,26 +228,56 @@ module Aws::EC2
     #     ],
     #   })
     # @param [Hash] options ({})
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
+    #   The block device mapping.
+    #
+    #   Supplying both a snapshot ID and an encryption value as arguments for
+    #   block-device mapping results in an error. This is because only blank
+    #   volumes can be encrypted on start, and these are not created from a
+    #   snapshot. If a snapshot is the basis for the volume, it contains data
+    #   by definition and its encryption status cannot be changed using this
+    #   action.
     # @option options [required, String] :image_id
     #   The ID of the AMI, which you can get by calling DescribeImages.
-    # @option options [required, Integer] :min_count
-    #   The minimum number of instances to launch. If you specify a minimum
-    #   that is more instances than Amazon EC2 can launch in the target
-    #   Availability Zone, Amazon EC2 launches no instances.
+    # @option options [String] :instance_type
+    #   The instance type. For more information, see [Instance Types][1] in
+    #   the *Amazon Elastic Compute Cloud User Guide*.
     #
-    #   Constraints: Between 1 and the maximum number you're allowed for the
-    #   specified instance type. For more information about the default
-    #   limits, and how to request an increase, see [How many instances can I
-    #   run in Amazon EC2][1] in the Amazon EC2 General FAQ.
+    #   Default: `m1.small`
     #
     #
     #
-    #   [1]: http://aws.amazon.com/ec2/faqs/#How_many_instances_can_I_run_in_Amazon_EC2
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
+    # @option options [Integer] :ipv_6_address_count
+    #   \[EC2-VPC\] A number of IPv6 addresses to associate with the primary
+    #   network interface. Amazon EC2 chooses the IPv6 addresses from the
+    #   range of your subnet. You cannot specify this option and the option to
+    #   assign specific IPv6 addresses in the same request. You can specify
+    #   this option if you've specified a minimum number of instances to
+    #   launch.
+    # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
+    #   \[EC2-VPC\] Specify one or more IPv6 addresses from the range of the
+    #   subnet to associate with the primary network interface. You cannot
+    #   specify this option and the option to assign a number of IPv6
+    #   addresses in the same request. You cannot specify this option if
+    #   you've specified a minimum number of instances to launch.
+    # @option options [String] :kernel_id
+    #   The ID of the kernel.
+    #
+    #   We recommend that you use PV-GRUB instead of kernels and RAM disks.
+    #   For more information, see [ PV-GRUB][1] in the *Amazon Elastic Compute
+    #   Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html
+    # @option options [String] :key_name
+    #   The name of the key pair. You can create a key pair using
+    #   CreateKeyPair or ImportKeyPair.
+    #
+    #   If you do not specify a key pair, you can't connect to the instance
+    #   unless you choose an AMI that is configured to allow users another way
+    #   to log in.
     # @option options [required, Integer] :max_count
     #   The maximum number of instances to launch. If you specify more
     #   instances than Amazon EC2 can launch in the target Availability Zone,
@@ -261,23 +292,43 @@ module Aws::EC2
     #
     #
     #   [1]: http://aws.amazon.com/ec2/faqs/#How_many_instances_can_I_run_in_Amazon_EC2
-    # @option options [String] :key_name
-    #   The name of the key pair. You can create a key pair using
-    #   CreateKeyPair or ImportKeyPair.
+    # @option options [required, Integer] :min_count
+    #   The minimum number of instances to launch. If you specify a minimum
+    #   that is more instances than Amazon EC2 can launch in the target
+    #   Availability Zone, Amazon EC2 launches no instances.
     #
-    #   If you do not specify a key pair, you can't connect to the instance
-    #   unless you choose an AMI that is configured to allow users another way
-    #   to log in.
-    # @option options [Array<String>] :security_groups
-    #   \[EC2-Classic, default VPC\] One or more security group names. For a
-    #   nondefault VPC, you must use security group IDs instead.
+    #   Constraints: Between 1 and the maximum number you're allowed for the
+    #   specified instance type. For more information about the default
+    #   limits, and how to request an increase, see [How many instances can I
+    #   run in Amazon EC2][1] in the Amazon EC2 General FAQ.
     #
-    #   Default: Amazon EC2 uses the default security group.
+    #
+    #
+    #   [1]: http://aws.amazon.com/ec2/faqs/#How_many_instances_can_I_run_in_Amazon_EC2
+    # @option options [Types::RunInstancesMonitoringEnabled] :monitoring
+    #   The monitoring for the instance.
+    # @option options [Types::Placement] :placement
+    #   The placement for the instance.
+    # @option options [String] :ramdisk_id
+    #   The ID of the RAM disk.
+    #
+    #   We recommend that you use PV-GRUB instead of kernels and RAM disks.
+    #   For more information, see [ PV-GRUB][1] in the *Amazon Elastic Compute
+    #   Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html
     # @option options [Array<String>] :security_group_ids
     #   One or more security group IDs. You can create a security group using
     #   CreateSecurityGroup.
     #
     #   Default: Amazon EC2 uses the default security group.
+    # @option options [Array<String>] :security_groups
+    #   \[EC2-Classic, default VPC\] One or more security group names. For a
+    #   nondefault VPC, you must use security group IDs instead.
+    #
+    #   Default: Amazon EC2 uses the default security group.
     # @option options [String] :user_data
     #   The user data to make available to the instance. For more information,
     #   see [Running Commands on Your Linux Instance at Launch][1] (Linux) and
@@ -290,48 +341,18 @@ module Aws::EC2
     #
     #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html
     #   [2]: http://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-instance-metadata.html#instancedata-add-user-data
-    # @option options [String] :instance_type
-    #   The instance type. For more information, see [Instance Types][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
-    #
-    #   Default: `m1.small`
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
-    # @option options [Types::Placement] :placement
-    #   The placement for the instance.
-    # @option options [String] :kernel_id
-    #   The ID of the kernel.
-    #
-    #   We recommend that you use PV-GRUB instead of kernels and RAM disks.
-    #   For more information, see [ PV-GRUB][1] in the *Amazon Elastic Compute
-    #   Cloud User Guide*.
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html
-    # @option options [String] :ramdisk_id
-    #   The ID of the RAM disk.
-    #
-    #   We recommend that you use PV-GRUB instead of kernels and RAM disks.
-    #   For more information, see [ PV-GRUB][1] in the *Amazon Elastic Compute
-    #   Cloud User Guide*.
+    # @option options [String] :additional_info
+    #   Reserved.
+    # @option options [String] :client_token
+    #   Unique, case-sensitive identifier you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensuring
+    #   Idempotency][1].
     #
+    #   Constraints: Maximum 64 ASCII characters
     #
     #
-    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html
-    # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
-    #   The block device mapping.
     #
-    #   Supplying both a snapshot ID and an encryption value as arguments for
-    #   block-device mapping results in an error. This is because only blank
-    #   volumes can be encrypted on start, and these are not created from a
-    #   snapshot. If a snapshot is the basis for the volume, it contains data
-    #   by definition and its encryption status cannot be changed using this
-    #   action.
-    # @option options [Types::RunInstancesMonitoringEnabled] :monitoring
-    #   The monitoring for the instance.
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
     # @option options [Boolean] :disable_api_termination
     #   If you set this parameter to `true`, you can't terminate the instance
     #   using the Amazon EC2 console, CLI, or API; otherwise, you can. To
@@ -341,12 +362,29 @@ module Aws::EC2
     #   the instance by running the shutdown command from the instance.
     #
     #   Default: `false`
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Boolean] :ebs_optimized
+    #   Indicates whether the instance is optimized for EBS I/O. This
+    #   optimization provides dedicated throughput to Amazon EBS and an
+    #   optimized configuration stack to provide optimal EBS I/O performance.
+    #   This optimization isn't available with all instance types. Additional
+    #   usage charges apply when using an EBS-optimized instance.
+    #
+    #   Default: `false`
+    # @option options [Types::IamInstanceProfileSpecification] :iam_instance_profile
+    #   The IAM instance profile.
     # @option options [String] :instance_initiated_shutdown_behavior
     #   Indicates whether an instance stops or terminates when you initiate
     #   shutdown from the instance (using the operating system command for
     #   system shutdown).
     #
     #   Default: `stop`
+    # @option options [Array<Types::InstanceNetworkInterfaceSpecification>] :network_interfaces
+    #   One or more network interfaces.
     # @option options [String] :private_ip_address
     #   \[EC2-VPC\] The primary IPv4 address. You must specify a value from
     #   the IPv4 address range of the subnet.
@@ -356,43 +394,6 @@ module Aws::EC2
     #   private IP address as the primary IP address in a network interface
     #   specification. You cannot specify this option if you're launching
     #   more than one instance in the request.
-    # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
-    #   \[EC2-VPC\] Specify one or more IPv6 addresses from the range of the
-    #   subnet to associate with the primary network interface. You cannot
-    #   specify this option and the option to assign a number of IPv6
-    #   addresses in the same request. You cannot specify this option if
-    #   you've specified a minimum number of instances to launch.
-    # @option options [Integer] :ipv_6_address_count
-    #   \[EC2-VPC\] A number of IPv6 addresses to associate with the primary
-    #   network interface. Amazon EC2 chooses the IPv6 addresses from the
-    #   range of your subnet. You cannot specify this option and the option to
-    #   assign specific IPv6 addresses in the same request. You can specify
-    #   this option if you've specified a minimum number of instances to
-    #   launch.
-    # @option options [String] :client_token
-    #   Unique, case-sensitive identifier you provide to ensure the
-    #   idempotency of the request. For more information, see [Ensuring
-    #   Idempotency][1].
-    #
-    #   Constraints: Maximum 64 ASCII characters
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
-    # @option options [String] :additional_info
-    #   Reserved.
-    # @option options [Array<Types::InstanceNetworkInterfaceSpecification>] :network_interfaces
-    #   One or more network interfaces.
-    # @option options [Types::IamInstanceProfileSpecification] :iam_instance_profile
-    #   The IAM instance profile.
-    # @option options [Boolean] :ebs_optimized
-    #   Indicates whether the instance is optimized for EBS I/O. This
-    #   optimization provides dedicated throughput to Amazon EBS and an
-    #   optimized configuration stack to provide optimal EBS I/O performance.
-    #   This optimization isn't available with all instance types. Additional
-    #   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
@@ -416,34 +417,49 @@ module Aws::EC2
     #
     #   networkinterface = subnet.create_network_interface({
     #     description: "String",
-    #     private_ip_address: "String",
+    #     dry_run: false,
     #     groups: ["String"],
-    #     private_ip_addresses: [
+    #     ipv_6_address_count: 1,
+    #     ipv_6_addresses: [
     #       {
-    #         private_ip_address: "String", # required
-    #         primary: false,
+    #         ipv_6_address: "String",
     #       },
     #     ],
-    #     secondary_private_ip_address_count: 1,
-    #     ipv_6_addresses: [
+    #     private_ip_address: "String",
+    #     private_ip_addresses: [
     #       {
-    #         ipv_6_address: "String",
+    #         primary: false,
+    #         private_ip_address: "String", # required
     #       },
     #     ],
-    #     ipv_6_address_count: 1,
-    #     dry_run: false,
+    #     secondary_private_ip_address_count: 1,
     #   })
     # @param [Hash] options ({})
     # @option options [String] :description
     #   A description for the network interface.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<String>] :groups
+    #   The IDs of one or more security groups.
+    # @option options [Integer] :ipv_6_address_count
+    #   The number of IPv6 addresses to assign to a network interface. Amazon
+    #   EC2 automatically selects the IPv6 addresses from the subnet range.
+    #   You can't use this option if specifying specific IPv6 addresses. If
+    #   your subnet has the `AssignIpv6AddressOnCreation` attribute set to
+    #   `true`, you can specify `0` to override this setting.
+    # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
+    #   One or more specific IPv6 addresses from the IPv6 CIDR block range of
+    #   your subnet. You can't use this option if you're specifying a number
+    #   of IPv6 addresses.
     # @option options [String] :private_ip_address
     #   The primary private IPv4 address of the network interface. If you
     #   don't specify an IPv4 address, Amazon EC2 selects one for you from
     #   the subnet's IPv4 CIDR range. If you specify an IP address, you
     #   cannot indicate any IP addresses specified in `privateIpAddresses` as
     #   primary (only one IP address can be designated as primary).
-    # @option options [Array<String>] :groups
-    #   The IDs of one or more security groups.
     # @option options [Array<Types::PrivateIpAddressSpecification>] :private_ip_addresses
     #   One or more private IPv4 addresses.
     # @option options [Integer] :secondary_private_ip_address_count
@@ -461,21 +477,6 @@ module Aws::EC2
     #
     #
     #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
-    # @option options [Array<Types::InstanceIpv6Address>] :ipv_6_addresses
-    #   One or more specific IPv6 addresses from the IPv6 CIDR block range of
-    #   your subnet. You can't use this option if you're specifying a number
-    #   of IPv6 addresses.
-    # @option options [Integer] :ipv_6_address_count
-    #   The number of IPv6 addresses to assign to a network interface. Amazon
-    #   EC2 automatically selects the IPv6 addresses from the subnet range.
-    #   You can't use this option if specifying specific IPv6 addresses. If
-    #   your subnet has the `AssignIpv6AddressOnCreation` attribute set to
-    #   `true`, you can specify `0` to override this setting.
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [NetworkInterface]
     def create_network_interface(options = {})
       options = options.merge(subnet_id: @id)
@@ -547,25 +548,16 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instances = subnet.instances({
-    #     dry_run: false,
-    #     instance_ids: ["String"],
     #     filters: [
     #       {
     #         name: "String",
     #         values: ["String"],
     #       },
     #     ],
+    #     instance_ids: ["String"],
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-    # @option options [Array<String>] :instance_ids
-    #   One or more instance IDs.
-    #
-    #   Default: Describes all your instances.
     # @option options [Array<Types::Filter>] :filters
     #   One or more filters.
     #
@@ -828,6 +820,15 @@ module Aws::EC2
     #     (`paravirtual` \| `hvm`).
     #
     #   * `vpc-id` - The ID of the VPC that the instance is running in.
+    # @option options [Array<String>] :instance_ids
+    #   One or more instance IDs.
+    #
+    #   Default: Describes all your instances.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Instance::Collection]
     def instances(options = {})
       batches = Enumerator.new do |y|
@@ -856,25 +857,16 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_interfaces = subnet.network_interfaces({
-    #     dry_run: false,
-    #     network_interface_ids: ["String"],
     #     filters: [
     #       {
     #         name: "String",
     #         values: ["String"],
     #       },
     #     ],
+    #     dry_run: false,
+    #     network_interface_ids: ["String"],
     #   })
     # @param [Hash] options ({})
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-    # @option options [Array<String>] :network_interface_ids
-    #   One or more network interface IDs.
-    #
-    #   Default: Describes all your network interfaces.
     # @option options [Array<Types::Filter>] :filters
     #   One or more filters.
     #
@@ -994,6 +986,15 @@ module Aws::EC2
     #     filter is independent of the `tag-key` filter.
     #
     #   * `vpc-id` - The ID of the VPC for the network interface.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<String>] :network_interface_ids
+    #   One or more network interface IDs.
+    #
+    #   Default: Describes all your network interfaces.
     # @return [NetworkInterface::Collection]
     def network_interfaces(options = {})
       batches = Enumerator.new do |y|