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

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

@@ -38,12 +38,24 @@ module Aws::EC2
       @destination_cidr_block
     end
 
+    # The IPv6 CIDR block used for the destination match.
+    # @return [String]
+    def destination_ipv_6_cidr_block
+      data.destination_ipv_6_cidr_block
+    end
+
     # The prefix of the AWS service.
     # @return [String]
     def destination_prefix_list_id
       data.destination_prefix_list_id
     end
 
+    # The ID of the egress-only Internet gateway.
+    # @return [String]
+    def egress_only_internet_gateway_id
+      data.egress_only_internet_gateway_id
+    end
+
     # The ID of a gateway attached to your VPC.
     # @return [String]
     def gateway_id
@@ -62,31 +74,16 @@ module Aws::EC2
       data.instance_owner_id
     end
 
-    # The ID of the network interface.
-    # @return [String]
-    def network_interface_id
-      data.network_interface_id
-    end
-
-    # The ID of the VPC peering connection.
-    # @return [String]
-    def vpc_peering_connection_id
-      data.vpc_peering_connection_id
-    end
-
     # The ID of a NAT gateway.
     # @return [String]
     def nat_gateway_id
       data.nat_gateway_id
     end
 
-    # The state of the route. The `blackhole` state indicates that the
-    # route's target isn't available (for example, the specified gateway
-    # isn't attached to the VPC, or the specified NAT instance has been
-    # terminated).
+    # The ID of the network interface.
     # @return [String]
-    def state
-      data.state
+    def network_interface_id
+      data.network_interface_id
     end
 
     # Describes how the route was created.
@@ -103,16 +100,19 @@ module Aws::EC2
       data.origin
     end
 
-    # The IPv6 CIDR block used for the destination match.
+    # The state of the route. The `blackhole` state indicates that the
+    # route's target isn't available (for example, the specified gateway
+    # isn't attached to the VPC, or the specified NAT instance has been
+    # terminated).
     # @return [String]
-    def destination_ipv_6_cidr_block
-      data.destination_ipv_6_cidr_block
+    def state
+      data.state
     end
 
-    # The ID of the egress-only Internet gateway.
+    # The ID of the VPC peering connection.
     # @return [String]
-    def egress_only_internet_gateway_id
-      data.egress_only_internet_gateway_id
+    def vpc_peering_connection_id
+      data.vpc_peering_connection_id
     end
 
     # @!endgroup
@@ -150,18 +150,18 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   route.delete({
-    #     dry_run: false,
     #     destination_ipv_6_cidr_block: "String",
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :destination_ipv_6_cidr_block
+    #   The IPv6 CIDR range for the route. The value you specify must match
+    #   the CIDR for the route exactly.
     # @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] :destination_ipv_6_cidr_block
-    #   The IPv6 CIDR range for the route. The value you specify must match
-    #   the CIDR for the route exactly.
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(
@@ -175,36 +175,36 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   route.replace({
-    #     dry_run: false,
-    #     gateway_id: "String",
     #     destination_ipv_6_cidr_block: "String",
+    #     dry_run: false,
     #     egress_only_internet_gateway_id: "String",
+    #     gateway_id: "String",
     #     instance_id: "String",
+    #     nat_gateway_id: "String",
     #     network_interface_id: "String",
     #     vpc_peering_connection_id: "String",
-    #     nat_gateway_id: "String",
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :destination_ipv_6_cidr_block
+    #   The IPv6 CIDR address block used for the destination match. The value
+    #   you provide must match the CIDR of an existing route in the table.
     # @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] :gateway_id
-    #   The ID of an Internet gateway or virtual private gateway.
-    # @option options [String] :destination_ipv_6_cidr_block
-    #   The IPv6 CIDR address block used for the destination match. The value
-    #   you provide must match the CIDR of an existing route in the table.
     # @option options [String] :egress_only_internet_gateway_id
     #   \[IPv6 traffic only\] The ID of an egress-only Internet gateway.
+    # @option options [String] :gateway_id
+    #   The ID of an Internet gateway or virtual private gateway.
     # @option options [String] :instance_id
     #   The ID of a NAT instance in your VPC.
+    # @option options [String] :nat_gateway_id
+    #   \[IPv4 traffic only\] The ID of a NAT gateway.
     # @option options [String] :network_interface_id
     #   The ID of a network interface.
     # @option options [String] :vpc_peering_connection_id
     #   The ID of a VPC peering connection.
-    # @option options [String] :nat_gateway_id
-    #   \[IPv4 traffic only\] The ID of a NAT gateway.
     # @return [EmptyStructure]
     def replace(options = {})
       options = options.merge(

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

@@ -31,10 +31,10 @@ module Aws::EC2
     end
     alias :route_table_id :id
 
-    # The ID of the VPC.
-    # @return [String]
-    def vpc_id
-      data.vpc_id
+    # Any virtual private gateway (VGW) propagating routes.
+    # @return [Array<Types::PropagatingVgw>]
+    def propagating_vgws
+      data.propagating_vgws
     end
 
     # Any tags assigned to the route table.
@@ -43,10 +43,10 @@ module Aws::EC2
       data.tags
     end
 
-    # Any virtual private gateway (VGW) propagating routes.
-    # @return [Array<Types::PropagatingVgw>]
-    def propagating_vgws
-      data.propagating_vgws
+    # The ID of the VPC.
+    # @return [String]
+    def vpc_id
+      data.vpc_id
     end
 
     # @!endgroup
@@ -113,43 +113,43 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   route = route_table.create_route({
-    #     dry_run: false,
     #     destination_cidr_block: "String",
-    #     gateway_id: "String",
     #     destination_ipv_6_cidr_block: "String",
+    #     dry_run: false,
     #     egress_only_internet_gateway_id: "String",
+    #     gateway_id: "String",
     #     instance_id: "String",
+    #     nat_gateway_id: "String",
     #     network_interface_id: "String",
     #     vpc_peering_connection_id: "String",
-    #     nat_gateway_id: "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 [String] :destination_cidr_block
     #   The IPv4 CIDR address block used for the destination match. Routing
     #   decisions are based on the most specific match.
-    # @option options [String] :gateway_id
-    #   The ID of an Internet gateway or virtual private gateway attached to
-    #   your VPC.
     # @option options [String] :destination_ipv_6_cidr_block
     #   The IPv6 CIDR block used for the destination match. Routing decisions
     #   are based on the most specific match.
+    # @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] :egress_only_internet_gateway_id
     #   \[IPv6 traffic only\] The ID of an egress-only Internet gateway.
+    # @option options [String] :gateway_id
+    #   The ID of an Internet gateway or virtual private gateway attached to
+    #   your VPC.
     # @option options [String] :instance_id
     #   The ID of a NAT instance in your VPC. The operation fails if you
     #   specify an instance ID unless exactly one network interface is
     #   attached.
+    # @option options [String] :nat_gateway_id
+    #   \[IPv4 traffic only\] The ID of a NAT gateway.
     # @option options [String] :network_interface_id
     #   The ID of a network interface.
     # @option options [String] :vpc_peering_connection_id
     #   The ID of a VPC peering connection.
-    # @option options [String] :nat_gateway_id
-    #   \[IPv4 traffic only\] The ID of a NAT gateway.
     # @return [Route]
     def create_route(options = {})
       options = options.merge(route_table_id: @id)

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

@@ -31,6 +31,12 @@ module Aws::EC2
     end
     alias :route_table_association_id :id
 
+    # Indicates whether this is the main route table.
+    # @return [Boolean]
+    def main
+      data.main
+    end
+
     # The ID of the route table.
     # @return [String]
     def route_table_id
@@ -44,12 +50,6 @@ module Aws::EC2
       data.subnet_id
     end
 
-    # Indicates whether this is the main route table.
-    # @return [Boolean]
-    def main
-      data.main
-    end
-
     # @!endgroup
 
     # @return [Client]

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

@@ -31,10 +31,10 @@ module Aws::EC2
     end
     alias :group_id :id
 
-    # The AWS account ID of the owner of the security group.
+    # A description of the security group.
     # @return [String]
-    def owner_id
-      data.owner_id
+    def description
+      data.description
     end
 
     # The name of the security group.
@@ -43,18 +43,18 @@ module Aws::EC2
       data.group_name
     end
 
-    # A description of the security group.
-    # @return [String]
-    def description
-      data.description
-    end
-
     # One or more inbound rules associated with the security group.
     # @return [Array<Types::IpPermission>]
     def ip_permissions
       data.ip_permissions
     end
 
+    # The AWS account ID of the owner of the security group.
+    # @return [String]
+    def owner_id
+      data.owner_id
+    end
+
     # \[EC2-VPC\] One or more outbound rules associated with the security
     # group.
     # @return [Array<Types::IpPermission>]
@@ -62,18 +62,18 @@ module Aws::EC2
       data.ip_permissions_egress
     end
 
-    # \[EC2-VPC\] The ID of the VPC for the security group.
-    # @return [String]
-    def vpc_id
-      data.vpc_id
-    end
-
     # Any tags assigned to the security group.
     # @return [Array<Types::Tag>]
     def tags
       data.tags
     end
 
+    # \[EC2-VPC\] The ID of the VPC for the security group.
+    # @return [String]
+    def vpc_id
+      data.vpc_id
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -115,27 +115,10 @@ module Aws::EC2
     #
     #   security_group.authorize_egress({
     #     dry_run: false,
-    #     source_security_group_name: "String",
-    #     source_security_group_owner_id: "String",
-    #     ip_protocol: "String",
-    #     from_port: 1,
-    #     to_port: 1,
-    #     cidr_ip: "String",
     #     ip_permissions: [
     #       {
-    #         ip_protocol: "String",
     #         from_port: 1,
-    #         to_port: 1,
-    #         user_id_group_pairs: [
-    #           {
-    #             user_id: "String",
-    #             group_name: "String",
-    #             group_id: "String",
-    #             vpc_id: "String",
-    #             vpc_peering_connection_id: "String",
-    #             peering_status: "String",
-    #           },
-    #         ],
+    #         ip_protocol: "String",
     #         ip_ranges: [
     #           {
     #             cidr_ip: "String",
@@ -151,8 +134,25 @@ module Aws::EC2
     #             prefix_list_id: "String",
     #           },
     #         ],
+    #         to_port: 1,
+    #         user_id_group_pairs: [
+    #           {
+    #             group_id: "String",
+    #             group_name: "String",
+    #             peering_status: "String",
+    #             user_id: "String",
+    #             vpc_id: "String",
+    #             vpc_peering_connection_id: "String",
+    #           },
+    #         ],
     #       },
     #     ],
+    #     cidr_ip: "String",
+    #     from_port: 1,
+    #     ip_protocol: "String",
+    #     to_port: 1,
+    #     source_security_group_name: "String",
+    #     source_security_group_owner_id: "String",
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -160,31 +160,31 @@ 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 [String] :source_security_group_name
-    #   The name of a destination security group. To authorize outbound access
-    #   to a destination security group, we recommend that you use a set of IP
-    #   permissions instead.
-    # @option options [String] :source_security_group_owner_id
-    #   The AWS account number for a destination security group. To authorize
-    #   outbound access to a destination security group, we recommend that you
-    #   use a set of IP permissions instead.
-    # @option options [String] :ip_protocol
-    #   The IP protocol name or number. We recommend that you specify the
-    #   protocol in a set of IP permissions instead.
+    # @option options [Array<Types::IpPermission>] :ip_permissions
+    #   A set of IP permissions. You can't specify a destination security
+    #   group and a CIDR IP address range.
+    # @option options [String] :cidr_ip
+    #   The CIDR IPv4 address range. We recommend that you specify the CIDR
+    #   range in a set of IP permissions instead.
     # @option options [Integer] :from_port
     #   The start of port range for the TCP and UDP protocols, or an ICMP type
     #   number. We recommend that you specify the port range in a set of IP
     #   permissions instead.
+    # @option options [String] :ip_protocol
+    #   The IP protocol name or number. We recommend that you specify the
+    #   protocol in a set of IP permissions instead.
     # @option options [Integer] :to_port
     #   The end of port range for the TCP and UDP protocols, or an ICMP type
     #   number. We recommend that you specify the port range in a set of IP
     #   permissions instead.
-    # @option options [String] :cidr_ip
-    #   The CIDR IPv4 address range. We recommend that you specify the CIDR
-    #   range in a set of IP permissions instead.
-    # @option options [Array<Types::IpPermission>] :ip_permissions
-    #   A set of IP permissions. You can't specify a destination security
-    #   group and a CIDR IP address range.
+    # @option options [String] :source_security_group_name
+    #   The name of a destination security group. To authorize outbound access
+    #   to a destination security group, we recommend that you use a set of IP
+    #   permissions instead.
+    # @option options [String] :source_security_group_owner_id
+    #   The AWS account number for a destination security group. To authorize
+    #   outbound access to a destination security group, we recommend that you
+    #   use a set of IP permissions instead.
     # @return [EmptyStructure]
     def authorize_egress(options = {})
       options = options.merge(group_id: @id)
@@ -195,29 +195,13 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   security_group.authorize_ingress({
-    #     dry_run: false,
-    #     group_name: "String",
-    #     source_security_group_name: "String",
-    #     source_security_group_owner_id: "String",
-    #     ip_protocol: "String",
-    #     from_port: 1,
-    #     to_port: 1,
     #     cidr_ip: "String",
+    #     from_port: 1,
+    #     group_name: "String",
     #     ip_permissions: [
     #       {
-    #         ip_protocol: "String",
     #         from_port: 1,
-    #         to_port: 1,
-    #         user_id_group_pairs: [
-    #           {
-    #             user_id: "String",
-    #             group_name: "String",
-    #             group_id: "String",
-    #             vpc_id: "String",
-    #             vpc_peering_connection_id: "String",
-    #             peering_status: "String",
-    #           },
-    #         ],
+    #         ip_protocol: "String",
     #         ip_ranges: [
     #           {
     #             cidr_ip: "String",
@@ -233,17 +217,50 @@ module Aws::EC2
     #             prefix_list_id: "String",
     #           },
     #         ],
+    #         to_port: 1,
+    #         user_id_group_pairs: [
+    #           {
+    #             group_id: "String",
+    #             group_name: "String",
+    #             peering_status: "String",
+    #             user_id: "String",
+    #             vpc_id: "String",
+    #             vpc_peering_connection_id: "String",
+    #           },
+    #         ],
     #       },
     #     ],
+    #     ip_protocol: "String",
+    #     source_security_group_name: "String",
+    #     source_security_group_owner_id: "String",
+    #     to_port: 1,
+    #     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] :cidr_ip
+    #   The CIDR IPv4 address range. You can't specify this parameter when
+    #   specifying a source security group.
+    # @option options [Integer] :from_port
+    #   The start of port range for the TCP and UDP protocols, or an
+    #   ICMP/ICMPv6 type number. For the ICMP/ICMPv6 type number, use `-1` to
+    #   specify all types.
     # @option options [String] :group_name
     #   \[EC2-Classic, default VPC\] The name of the security group.
+    # @option options [Array<Types::IpPermission>] :ip_permissions
+    #   A set of IP permissions. Can be used to specify multiple rules in a
+    #   single command.
+    # @option options [String] :ip_protocol
+    #   The IP protocol name (`tcp`, `udp`, `icmp`) or number (see [Protocol
+    #   Numbers][1]). (VPC only) Use `-1` to specify all protocols. If you
+    #   specify `-1`, or a protocol number other than `tcp`, `udp`, `icmp`, or
+    #   `58` (ICMPv6), traffic on all ports is allowed, regardless of any
+    #   ports you specify. For `tcp`, `udp`, and `icmp`, you must specify a
+    #   port range. For protocol `58` (ICMPv6), you can optionally specify a
+    #   port range; if you don't, traffic for all types and codes is allowed.
+    #
+    #
+    #
+    #   [1]: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
     # @option options [String] :source_security_group_name
     #   \[EC2-Classic, default VPC\] The name of the source security group.
     #   You can't specify this parameter in combination with the following
@@ -260,32 +277,15 @@ module Aws::EC2
     #   range, and the end of the port range. Creates rules that grant full
     #   ICMP, UDP, and TCP access. To create a rule with a specific IP
     #   protocol and port range, use a set of IP permissions instead.
-    # @option options [String] :ip_protocol
-    #   The IP protocol name (`tcp`, `udp`, `icmp`) or number (see [Protocol
-    #   Numbers][1]). (VPC only) Use `-1` to specify all protocols. If you
-    #   specify `-1`, or a protocol number other than `tcp`, `udp`, `icmp`, or
-    #   `58` (ICMPv6), traffic on all ports is allowed, regardless of any
-    #   ports you specify. For `tcp`, `udp`, and `icmp`, you must specify a
-    #   port range. For protocol `58` (ICMPv6), you can optionally specify a
-    #   port range; if you don't, traffic for all types and codes is allowed.
-    #
-    #
-    #
-    #   [1]: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
-    # @option options [Integer] :from_port
-    #   The start of port range for the TCP and UDP protocols, or an
-    #   ICMP/ICMPv6 type number. For the ICMP/ICMPv6 type number, use `-1` to
-    #   specify all types.
     # @option options [Integer] :to_port
     #   The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6
     #   code number. For the ICMP/ICMPv6 code number, use `-1` to specify all
     #   codes.
-    # @option options [String] :cidr_ip
-    #   The CIDR IPv4 address range. You can't specify this parameter when
-    #   specifying a source security group.
-    # @option options [Array<Types::IpPermission>] :ip_permissions
-    #   A set of IP permissions. Can be used to specify multiple rules in a
-    #   single command.
+    # @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 authorize_ingress(options = {})
       options = options.merge(group_id: @id)
@@ -333,18 +333,18 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   security_group.delete({
-    #     dry_run: false,
     #     group_name: "String",
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :group_name
+    #   \[EC2-Classic, default VPC\] The name of the security group. You can
+    #   specify either the security group name or the security group ID.
     # @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] :group_name
-    #   \[EC2-Classic, default VPC\] The name of the security group. You can
-    #   specify either the security group name or the security group ID.
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(group_id: @id)
@@ -356,27 +356,10 @@ module Aws::EC2
     #
     #   security_group.revoke_egress({
     #     dry_run: false,
-    #     source_security_group_name: "String",
-    #     source_security_group_owner_id: "String",
-    #     ip_protocol: "String",
-    #     from_port: 1,
-    #     to_port: 1,
-    #     cidr_ip: "String",
     #     ip_permissions: [
     #       {
-    #         ip_protocol: "String",
     #         from_port: 1,
-    #         to_port: 1,
-    #         user_id_group_pairs: [
-    #           {
-    #             user_id: "String",
-    #             group_name: "String",
-    #             group_id: "String",
-    #             vpc_id: "String",
-    #             vpc_peering_connection_id: "String",
-    #             peering_status: "String",
-    #           },
-    #         ],
+    #         ip_protocol: "String",
     #         ip_ranges: [
     #           {
     #             cidr_ip: "String",
@@ -392,8 +375,25 @@ module Aws::EC2
     #             prefix_list_id: "String",
     #           },
     #         ],
+    #         to_port: 1,
+    #         user_id_group_pairs: [
+    #           {
+    #             group_id: "String",
+    #             group_name: "String",
+    #             peering_status: "String",
+    #             user_id: "String",
+    #             vpc_id: "String",
+    #             vpc_peering_connection_id: "String",
+    #           },
+    #         ],
     #       },
     #     ],
+    #     cidr_ip: "String",
+    #     from_port: 1,
+    #     ip_protocol: "String",
+    #     to_port: 1,
+    #     source_security_group_name: "String",
+    #     source_security_group_owner_id: "String",
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -401,31 +401,31 @@ 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 [String] :source_security_group_name
-    #   The name of a destination security group. To revoke outbound access to
-    #   a destination security group, we recommend that you use a set of IP
-    #   permissions instead.
-    # @option options [String] :source_security_group_owner_id
-    #   The AWS account number for a destination security group. To revoke
-    #   outbound access to a destination security group, we recommend that you
-    #   use a set of IP permissions instead.
-    # @option options [String] :ip_protocol
-    #   The IP protocol name or number. We recommend that you specify the
-    #   protocol in a set of IP permissions instead.
+    # @option options [Array<Types::IpPermission>] :ip_permissions
+    #   A set of IP permissions. You can't specify a destination security
+    #   group and a CIDR IP address range.
+    # @option options [String] :cidr_ip
+    #   The CIDR IP address range. We recommend that you specify the CIDR
+    #   range in a set of IP permissions instead.
     # @option options [Integer] :from_port
     #   The start of port range for the TCP and UDP protocols, or an ICMP type
     #   number. We recommend that you specify the port range in a set of IP
     #   permissions instead.
+    # @option options [String] :ip_protocol
+    #   The IP protocol name or number. We recommend that you specify the
+    #   protocol in a set of IP permissions instead.
     # @option options [Integer] :to_port
     #   The end of port range for the TCP and UDP protocols, or an ICMP type
     #   number. We recommend that you specify the port range in a set of IP
     #   permissions instead.
-    # @option options [String] :cidr_ip
-    #   The CIDR IP address range. We recommend that you specify the CIDR
-    #   range in a set of IP permissions instead.
-    # @option options [Array<Types::IpPermission>] :ip_permissions
-    #   A set of IP permissions. You can't specify a destination security
-    #   group and a CIDR IP address range.
+    # @option options [String] :source_security_group_name
+    #   The name of a destination security group. To revoke outbound access to
+    #   a destination security group, we recommend that you use a set of IP
+    #   permissions instead.
+    # @option options [String] :source_security_group_owner_id
+    #   The AWS account number for a destination security group. To revoke
+    #   outbound access to a destination security group, we recommend that you
+    #   use a set of IP permissions instead.
     # @return [EmptyStructure]
     def revoke_egress(options = {})
       options = options.merge(group_id: @id)
@@ -436,29 +436,13 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   security_group.revoke_ingress({
-    #     dry_run: false,
-    #     group_name: "String",
-    #     source_security_group_name: "String",
-    #     source_security_group_owner_id: "String",
-    #     ip_protocol: "String",
-    #     from_port: 1,
-    #     to_port: 1,
     #     cidr_ip: "String",
+    #     from_port: 1,
+    #     group_name: "String",
     #     ip_permissions: [
     #       {
-    #         ip_protocol: "String",
     #         from_port: 1,
-    #         to_port: 1,
-    #         user_id_group_pairs: [
-    #           {
-    #             user_id: "String",
-    #             group_name: "String",
-    #             group_id: "String",
-    #             vpc_id: "String",
-    #             vpc_peering_connection_id: "String",
-    #             peering_status: "String",
-    #           },
-    #         ],
+    #         ip_protocol: "String",
     #         ip_ranges: [
     #           {
     #             cidr_ip: "String",
@@ -474,17 +458,44 @@ module Aws::EC2
     #             prefix_list_id: "String",
     #           },
     #         ],
+    #         to_port: 1,
+    #         user_id_group_pairs: [
+    #           {
+    #             group_id: "String",
+    #             group_name: "String",
+    #             peering_status: "String",
+    #             user_id: "String",
+    #             vpc_id: "String",
+    #             vpc_peering_connection_id: "String",
+    #           },
+    #         ],
     #       },
     #     ],
+    #     ip_protocol: "String",
+    #     source_security_group_name: "String",
+    #     source_security_group_owner_id: "String",
+    #     to_port: 1,
+    #     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] :cidr_ip
+    #   The CIDR IP address range. You can't specify this parameter when
+    #   specifying a source security group.
+    # @option options [Integer] :from_port
+    #   The start of port range for the TCP and UDP protocols, or an ICMP type
+    #   number. For the ICMP type number, use `-1` to specify all ICMP types.
     # @option options [String] :group_name
     #   \[EC2-Classic, default VPC\] The name of the security group.
+    # @option options [Array<Types::IpPermission>] :ip_permissions
+    #   A set of IP permissions. You can't specify a source security group
+    #   and a CIDR IP address range.
+    # @option options [String] :ip_protocol
+    #   The IP protocol name (`tcp`, `udp`, `icmp`) or number (see [Protocol
+    #   Numbers][1]). Use `-1` to specify all.
+    #
+    #
+    #
+    #   [1]: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
     # @option options [String] :source_security_group_name
     #   \[EC2-Classic, default VPC\] The name of the source security group.
     #   You can't specify this parameter in combination with the following
@@ -500,26 +511,15 @@ module Aws::EC2
     #   the CIDR IP address range, the IP protocol, the start of the port
     #   range, and the end of the port range. To revoke a specific rule for an
     #   IP protocol and port range, use a set of IP permissions instead.
-    # @option options [String] :ip_protocol
-    #   The IP protocol name (`tcp`, `udp`, `icmp`) or number (see [Protocol
-    #   Numbers][1]). Use `-1` to specify all.
-    #
-    #
-    #
-    #   [1]: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
-    # @option options [Integer] :from_port
-    #   The start of port range for the TCP and UDP protocols, or an ICMP type
-    #   number. For the ICMP type number, use `-1` to specify all ICMP types.
     # @option options [Integer] :to_port
     #   The end of port range for the TCP and UDP protocols, or an ICMP code
     #   number. For the ICMP code number, use `-1` to specify all ICMP codes
     #   for the ICMP type.
-    # @option options [String] :cidr_ip
-    #   The CIDR IP address range. You can't specify this parameter when
-    #   specifying a source security group.
-    # @option options [Array<Types::IpPermission>] :ip_permissions
-    #   A set of IP permissions. You can't specify a source security group
-    #   and a CIDR IP address range.
+    # @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 revoke_ingress(options = {})
       options = options.merge(group_id: @id)