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

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

@@ -31,16 +31,10 @@ module Aws::EC2
     end
     alias :network_acl_id :id
 
-    # The ID of the VPC for the network ACL.
-    # @return [String]
-    def vpc_id
-      data.vpc_id
-    end
-
-    # Indicates whether this is the default network ACL for the VPC.
-    # @return [Boolean]
-    def is_default
-      data.is_default
+    # Any associations between the network ACL and one or more subnets
+    # @return [Array<Types::NetworkAclAssociation>]
+    def associations
+      data.associations
     end
 
     # One or more entries (rules) in the network ACL.
@@ -49,10 +43,10 @@ module Aws::EC2
       data.entries
     end
 
-    # Any associations between the network ACL and one or more subnets
-    # @return [Array<Types::NetworkAclAssociation>]
-    def associations
-      data.associations
+    # Indicates whether this is the default network ACL for the VPC.
+    # @return [Boolean]
+    def is_default
+      data.is_default
     end
 
     # Any tags assigned to the network ACL.
@@ -61,6 +55,12 @@ module Aws::EC2
       data.tags
     end
 
+    # The ID of the VPC for the network ACL.
+    # @return [String]
+    def vpc_id
+      data.vpc_id
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -101,34 +101,43 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_acl.create_entry({
+    #     cidr_block: "String",
     #     dry_run: false,
-    #     rule_number: 1, # required
-    #     protocol: "String", # required
-    #     rule_action: "allow", # required, accepts allow, deny
     #     egress: false, # required
-    #     cidr_block: "String",
-    #     ipv_6_cidr_block: "String",
     #     icmp_type_code: {
-    #       type: 1,
     #       code: 1,
+    #       type: 1,
     #     },
+    #     ipv_6_cidr_block: "String",
     #     port_range: {
     #       from: 1,
     #       to: 1,
     #     },
+    #     protocol: "String", # required
+    #     rule_action: "allow", # required, accepts allow, deny
+    #     rule_number: 1, # required
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :cidr_block
+    #   The IPv4 network range to allow or deny, in CIDR notation (for example
+    #   `172.16.0.0/24`).
     # @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, Integer] :rule_number
-    #   The rule number for the entry (for example, 100). ACL entries are
-    #   processed in ascending order by rule number.
-    #
-    #   Constraints: Positive integer from 1 to 32766. The range 32767 to
-    #   65535 is reserved for internal use.
+    # @option options [required, Boolean] :egress
+    #   Indicates whether this is an egress rule (rule is applied to traffic
+    #   leaving the subnet).
+    # @option options [Types::IcmpTypeCode] :icmp_type_code
+    #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
+    #   specifying the ICMP protocol, or protocol 58 (ICMPv6) with an IPv6
+    #   CIDR block.
+    # @option options [String] :ipv_6_cidr_block
+    #   The IPv6 network range to allow or deny, in CIDR notation (for example
+    #   `2001:db8:1234:1a00::/64`).
+    # @option options [Types::PortRange] :port_range
+    #   TCP or UDP protocols: The range of ports the rule applies to.
     # @option options [required, String] :protocol
     #   The protocol. A value of `-1` or `all` means all protocols. If you
     #   specify `all`, `-1`, or a protocol number other than `tcp`, `udp`, or
@@ -140,21 +149,12 @@ module Aws::EC2
     #   type and code.
     # @option options [required, String] :rule_action
     #   Indicates whether to allow or deny the traffic that matches the rule.
-    # @option options [required, Boolean] :egress
-    #   Indicates whether this is an egress rule (rule is applied to traffic
-    #   leaving the subnet).
-    # @option options [String] :cidr_block
-    #   The IPv4 network range to allow or deny, in CIDR notation (for example
-    #   `172.16.0.0/24`).
-    # @option options [String] :ipv_6_cidr_block
-    #   The IPv6 network range to allow or deny, in CIDR notation (for example
-    #   `2001:db8:1234:1a00::/64`).
-    # @option options [Types::IcmpTypeCode] :icmp_type_code
-    #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
-    #   specifying the ICMP protocol, or protocol 58 (ICMPv6) with an IPv6
-    #   CIDR block.
-    # @option options [Types::PortRange] :port_range
-    #   TCP or UDP protocols: The range of ports the rule applies to.
+    # @option options [required, Integer] :rule_number
+    #   The rule number for the entry (for example, 100). ACL entries are
+    #   processed in ascending order by rule number.
+    #
+    #   Constraints: Positive integer from 1 to 32766. The range 32767 to
+    #   65535 is reserved for internal use.
     # @return [EmptyStructure]
     def create_entry(options = {})
       options = options.merge(network_acl_id: @id)
@@ -221,8 +221,8 @@ module Aws::EC2
     #
     #   network_acl.delete_entry({
     #     dry_run: false,
-    #     rule_number: 1, # required
     #     egress: false, # required
+    #     rule_number: 1, # required
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -230,10 +230,10 @@ module Aws::EC2
     #   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, Integer] :rule_number
-    #   The rule number of the entry to delete.
     # @option options [required, Boolean] :egress
     #   Indicates whether the rule is an egress rule.
+    # @option options [required, Integer] :rule_number
+    #   The rule number of the entry to delete.
     # @return [EmptyStructure]
     def delete_entry(options = {})
       options = options.merge(network_acl_id: @id)
@@ -244,18 +244,18 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_acl.replace_association({
-    #     dry_run: false,
     #     association_id: "String", # required
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [required, String] :association_id
+    #   The ID of the current association between the original network ACL and
+    #   the subnet.
     # @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] :association_id
-    #   The ID of the current association between the original network ACL and
-    #   the subnet.
     # @return [Types::ReplaceNetworkAclAssociationResult]
     def replace_association(options = {})
       options = options.merge(network_acl_id: @id)
@@ -266,58 +266,58 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_acl.replace_entry({
+    #     cidr_block: "String",
     #     dry_run: false,
-    #     rule_number: 1, # required
-    #     protocol: "String", # required
-    #     rule_action: "allow", # required, accepts allow, deny
     #     egress: false, # required
-    #     cidr_block: "String",
-    #     ipv_6_cidr_block: "String",
     #     icmp_type_code: {
-    #       type: 1,
     #       code: 1,
+    #       type: 1,
     #     },
+    #     ipv_6_cidr_block: "String",
     #     port_range: {
     #       from: 1,
     #       to: 1,
     #     },
+    #     protocol: "String", # required
+    #     rule_action: "allow", # required, accepts allow, deny
+    #     rule_number: 1, # required
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :cidr_block
+    #   The IPv4 network range to allow or deny, in CIDR notation (for example
+    #   `172.16.0.0/24`).
     # @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, Integer] :rule_number
-    #   The rule number of the entry to replace.
-    # @option options [required, String] :protocol
-    #   The IP protocol. You can specify `all` or `-1` to mean all protocols.
-    #   If you specify `all`, `-1`, or a protocol number other than `tcp`,
-    #   `udp`, or `icmp`, traffic on all ports is allowed, regardless of any
-    #   ports or ICMP types or codes you specify. If you specify protocol `58`
-    #   (ICMPv6) and specify an IPv4 CIDR block, traffic for all ICMP types
-    #   and codes allowed, regardless of any that you specify. If you specify
-    #   protocol `58` (ICMPv6) and specify an IPv6 CIDR block, you must
-    #   specify an ICMP type and code.
-    # @option options [required, String] :rule_action
-    #   Indicates whether to allow or deny the traffic that matches the rule.
     # @option options [required, Boolean] :egress
     #   Indicates whether to replace the egress rule.
     #
     #   Default: If no value is specified, we replace the ingress rule.
-    # @option options [String] :cidr_block
-    #   The IPv4 network range to allow or deny, in CIDR notation (for example
-    #   `172.16.0.0/24`).
-    # @option options [String] :ipv_6_cidr_block
-    #   The IPv6 network range to allow or deny, in CIDR notation (for example
-    #   `2001:bd8:1234:1a00::/64`).
     # @option options [Types::IcmpTypeCode] :icmp_type_code
     #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
     #   specifying the ICMP (1) protocol, or protocol 58 (ICMPv6) with an IPv6
     #   CIDR block.
+    # @option options [String] :ipv_6_cidr_block
+    #   The IPv6 network range to allow or deny, in CIDR notation (for example
+    #   `2001:bd8:1234:1a00::/64`).
     # @option options [Types::PortRange] :port_range
     #   TCP or UDP protocols: The range of ports the rule applies to. Required
     #   if specifying TCP (6) or UDP (17) for the protocol.
+    # @option options [required, String] :protocol
+    #   The IP protocol. You can specify `all` or `-1` to mean all protocols.
+    #   If you specify `all`, `-1`, or a protocol number other than `tcp`,
+    #   `udp`, or `icmp`, traffic on all ports is allowed, regardless of any
+    #   ports or ICMP types or codes you specify. If you specify protocol `58`
+    #   (ICMPv6) and specify an IPv4 CIDR block, traffic for all ICMP types
+    #   and codes allowed, regardless of any that you specify. If you specify
+    #   protocol `58` (ICMPv6) and specify an IPv6 CIDR block, you must
+    #   specify an ICMP type and code.
+    # @option options [required, String] :rule_action
+    #   Indicates whether to allow or deny the traffic that matches the rule.
+    # @option options [required, Integer] :rule_number
+    #   The rule number of the entry to replace.
     # @return [EmptyStructure]
     def replace_entry(options = {})
       options = options.merge(network_acl_id: @id)

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

@@ -31,16 +31,10 @@ module Aws::EC2
     end
     alias :network_interface_id :id
 
-    # The ID of the subnet.
-    # @return [String]
-    def subnet_id
-      data.subnet_id
-    end
-
-    # The ID of the VPC.
-    # @return [String]
-    def vpc_id
-      data.vpc_id
+    # The network interface attachment.
+    # @return [Types::NetworkInterfaceAttachment]
+    def attachment
+      data.attachment
     end
 
     # The Availability Zone.
@@ -55,29 +49,22 @@ module Aws::EC2
       data.description
     end
 
-    # The AWS account ID of the owner of the network interface.
-    # @return [String]
-    def owner_id
-      data.owner_id
+    # Any security groups for the network interface.
+    # @return [Array<Types::GroupIdentifier>]
+    def groups
+      data.groups
     end
 
-    # The ID of the entity that launched the instance on your behalf (for
-    # example, AWS Management Console or Auto Scaling).
+    # The type of interface.
     # @return [String]
-    def requester_id
-      data.requester_id
-    end
-
-    # Indicates whether the network interface is being managed by AWS.
-    # @return [Boolean]
-    def requester_managed
-      data.requester_managed
+    def interface_type
+      data.interface_type
     end
 
-    # The status of the network interface.
-    # @return [String]
-    def status
-      data.status
+    # The IPv6 addresses associated with the network interface.
+    # @return [Array<Types::NetworkInterfaceIpv6Address>]
+    def ipv_6_addresses
+      data.ipv_6_addresses
     end
 
     # The MAC address.
@@ -86,10 +73,10 @@ module Aws::EC2
       data.mac_address
     end
 
-    # The IPv4 address of the network interface within the subnet.
+    # The AWS account ID of the owner of the network interface.
     # @return [String]
-    def private_ip_address
-      data.private_ip_address
+    def owner_id
+      data.owner_id
     end
 
     # The private DNS name.
@@ -98,22 +85,47 @@ module Aws::EC2
       data.private_dns_name
     end
 
+    # The IPv4 address of the network interface within the subnet.
+    # @return [String]
+    def private_ip_address
+      data.private_ip_address
+    end
+
+    # The private IPv4 addresses associated with the network interface.
+    # @return [Array<Types::NetworkInterfacePrivateIpAddress>]
+    def private_ip_addresses
+      data.private_ip_addresses
+    end
+
+    # The ID of the entity that launched the instance on your behalf (for
+    # example, AWS Management Console or Auto Scaling).
+    # @return [String]
+    def requester_id
+      data.requester_id
+    end
+
+    # Indicates whether the network interface is being managed by AWS.
+    # @return [Boolean]
+    def requester_managed
+      data.requester_managed
+    end
+
     # Indicates whether traffic to or from the instance is validated.
     # @return [Boolean]
     def source_dest_check
       data.source_dest_check
     end
 
-    # Any security groups for the network interface.
-    # @return [Array<Types::GroupIdentifier>]
-    def groups
-      data.groups
+    # The status of the network interface.
+    # @return [String]
+    def status
+      data.status
     end
 
-    # The network interface attachment.
-    # @return [Types::NetworkInterfaceAttachment]
-    def attachment
-      data.attachment
+    # The ID of the subnet.
+    # @return [String]
+    def subnet_id
+      data.subnet_id
     end
 
     # Any tags assigned to the network interface.
@@ -122,22 +134,10 @@ module Aws::EC2
       data.tag_set
     end
 
-    # The private IPv4 addresses associated with the network interface.
-    # @return [Array<Types::NetworkInterfacePrivateIpAddress>]
-    def private_ip_addresses
-      data.private_ip_addresses
-    end
-
-    # The IPv6 addresses associated with the network interface.
-    # @return [Array<Types::NetworkInterfaceIpv6Address>]
-    def ipv_6_addresses
-      data.ipv_6_addresses
-    end
-
-    # The type of interface.
+    # The ID of the VPC.
     # @return [String]
-    def interface_type
-      data.interface_type
+    def vpc_id
+      data.vpc_id
     end
 
     # @!endgroup
@@ -180,11 +180,15 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_interface.assign_private_ip_addresses({
+    #     allow_reassignment: false,
     #     private_ip_addresses: ["String"],
     #     secondary_private_ip_address_count: 1,
-    #     allow_reassignment: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [Boolean] :allow_reassignment
+    #   Indicates whether to allow an IP address that is already assigned to
+    #   another network interface or instance to be reassigned to the
+    #   specified network interface.
     # @option options [Array<String>] :private_ip_addresses
     #   One or more IP addresses to be assigned as a secondary private IP
     #   address to the network interface. You can't specify this parameter
@@ -196,10 +200,6 @@ module Aws::EC2
     #   The number of secondary IP addresses to assign to the network
     #   interface. You can't specify this parameter when also specifying
     #   private IP addresses.
-    # @option options [Boolean] :allow_reassignment
-    #   Indicates whether to allow an IP address that is already assigned to
-    #   another network interface or instance to be reassigned to the
-    #   specified network interface.
     # @return [EmptyStructure]
     def assign_private_ip_addresses(options = {})
       options = options.merge(network_interface_id: @id)
@@ -210,11 +210,13 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_interface.attach({
+    #     device_index: 1, # required
     #     dry_run: false,
     #     instance_id: "String", # required
-    #     device_index: 1, # required
     #   })
     # @param [Hash] options ({})
+    # @option options [required, Integer] :device_index
+    #   The index of the device for the network interface attachment.
     # @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.
@@ -222,8 +224,6 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [required, String] :instance_id
     #   The ID of the instance.
-    # @option options [required, Integer] :device_index
-    #   The index of the device for the network interface attachment.
     # @return [Types::AttachNetworkInterfaceResult]
     def attach(options = {})
       options = options.merge(network_interface_id: @id)
@@ -289,17 +289,17 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_interface.describe_attribute({
-    #     dry_run: false,
     #     attribute: "description", # accepts description, groupSet, sourceDestCheck, attachment
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :attribute
+    #   The attribute of the network interface. This parameter is required.
     # @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 attribute of the network interface. This parameter is required.
     # @return [Types::DescribeNetworkInterfaceAttributeResult]
     def describe_attribute(options = {})
       options = options.merge(network_interface_id: @id)
@@ -331,25 +331,34 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_interface.modify_attribute({
-    #     dry_run: false,
-    #     description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
-    #     source_dest_check: {
-    #       value: false,
-    #     },
-    #     groups: ["String"],
     #     attachment: {
     #       attachment_id: "String",
     #       delete_on_termination: false,
     #     },
+    #     description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
+    #     dry_run: false,
+    #     groups: ["String"],
+    #     source_dest_check: {
+    #       value: false,
+    #     },
     #   })
     # @param [Hash] options ({})
+    # @option options [Types::NetworkInterfaceAttachmentChanges] :attachment
+    #   Information about the interface attachment. If modifying the 'delete
+    #   on termination' attribute, you must specify the ID of the interface
+    #   attachment.
+    # @option options [Types::AttributeValue] :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 [Types::AttributeValue] :description
-    #   A description for the network interface.
+    # @option options [Array<String>] :groups
+    #   Changes the security groups for the network interface. The new set of
+    #   groups you specify replaces the current set. You must specify at least
+    #   one group, even if it's just the default security group in the VPC.
+    #   You must specify the ID of the security group, not the name.
     # @option options [Types::AttributeBooleanValue] :source_dest_check
     #   Indicates whether source/destination checking is enabled. A value of
     #   `true` means checking is enabled, and `false` means checking is
@@ -360,15 +369,6 @@ module Aws::EC2
     #
     #
     #   [1]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_NAT_Instance.html
-    # @option options [Array<String>] :groups
-    #   Changes the security groups for the network interface. The new set of
-    #   groups you specify replaces the current set. You must specify at least
-    #   one group, even if it's just the default security group in the VPC.
-    #   You must specify the ID of the security group, not the name.
-    # @option options [Types::NetworkInterfaceAttachmentChanges] :attachment
-    #   Information about the interface attachment. If modifying the 'delete
-    #   on termination' attribute, you must specify the ID of the interface
-    #   attachment.
     # @return [EmptyStructure]
     def modify_attribute(options = {})
       options = options.merge(network_interface_id: @id)