aws-sdk-ec2 1.431.0 → 1.522.0

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

@@ -68,7 +68,7 @@ module Aws::EC2
     #
     # @return [self]
     def load
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_internet_gateways(internet_gateway_ids: [@id])
       end
       @data = resp.internet_gateways[0]
@@ -185,7 +185,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -209,7 +209,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def attach_to_vpc(options = {})
       options = options.merge(internet_gateway_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.attach_internet_gateway(options)
       end
       resp.data
@@ -240,7 +240,7 @@ module Aws::EC2
     def create_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_tags(options)
       end
       options[:tags].each do |t|
@@ -287,7 +287,7 @@ module Aws::EC2
     def delete_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_tags(options)
       end
       options[:tags].each do |t|
@@ -315,7 +315,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(internet_gateway_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_internet_gateway(options)
       end
       resp.data
@@ -338,7 +338,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def detach_from_vpc(options = {})
       options = options.merge(internet_gateway_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.detach_internet_gateway(options)
       end
       resp.data

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

@@ -35,6 +35,18 @@ module Aws::EC2
     end
     alias :key_name :name
 
+    # The ID of the key pair.
+    # @return [String]
+    def key_pair_id
+      data[:key_pair_id]
+    end
+
+    # Any tags applied to the key pair.
+    # @return [Array<Types::Tag>]
+    def tags
+      data[:tags]
+    end
+
     # * For RSA key pairs, the key fingerprint is the SHA-1 digest of the
     #   DER encoded private key.
     #
@@ -52,18 +64,6 @@ module Aws::EC2
       data[:key_material]
     end
 
-    # The ID of the key pair.
-    # @return [String]
-    def key_pair_id
-      data[:key_pair_id]
-    end
-
-    # Any tags applied to the key pair.
-    # @return [Array<Types::Tag>]
-    def tags
-      data[:tags]
-    end
-
     # @!endgroup
 
     # @return [Client]
@@ -188,7 +188,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -212,7 +212,7 @@ module Aws::EC2
     # @return [Types::DeleteKeyPairResult]
     def delete(options = {})
       options = options.merge(key_name: @name)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_key_pair(options)
       end
       resp.data

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

@@ -41,33 +41,6 @@ module Aws::EC2
       data[:key_pair_id]
     end
 
-    # If you used CreateKeyPair to create the key pair:
-    #
-    # * For RSA key pairs, the key fingerprint is the SHA-1 digest of the
-    #   DER encoded private key.
-    #
-    # * For ED25519 key pairs, the key fingerprint is the base64-encoded
-    #   SHA-256 digest, which is the default for OpenSSH, starting with
-    #   [OpenSSH 6.8][1].
-    #
-    # If you used ImportKeyPair to provide Amazon Web Services the public
-    # key:
-    #
-    # * For RSA key pairs, the key fingerprint is the MD5 public key
-    #   fingerprint as specified in section 4 of RFC4716.
-    #
-    # * For ED25519 key pairs, the key fingerprint is the base64-encoded
-    #   SHA-256 digest, which is the default for OpenSSH, starting with
-    #   [OpenSSH 6.8][1].
-    #
-    #
-    #
-    # [1]: http://www.openssh.com/txt/release-6.8
-    # @return [String]
-    def key_fingerprint
-      data[:key_fingerprint]
-    end
-
     # The type of key pair.
     # @return [String]
     def key_type
@@ -102,6 +75,33 @@ module Aws::EC2
       data[:create_time]
     end
 
+    # If you used CreateKeyPair to create the key pair:
+    #
+    # * For RSA key pairs, the key fingerprint is the SHA-1 digest of the
+    #   DER encoded private key.
+    #
+    # * For ED25519 key pairs, the key fingerprint is the base64-encoded
+    #   SHA-256 digest, which is the default for OpenSSH, starting with
+    #   [OpenSSH 6.8][1].
+    #
+    # If you used ImportKeyPair to provide Amazon Web Services the public
+    # key:
+    #
+    # * For RSA key pairs, the key fingerprint is the MD5 public key
+    #   fingerprint as specified in section 4 of RFC4716.
+    #
+    # * For ED25519 key pairs, the key fingerprint is the base64-encoded
+    #   SHA-256 digest, which is the default for OpenSSH, starting with
+    #   [OpenSSH 6.8][1].
+    #
+    #
+    #
+    # [1]: http://www.openssh.com/txt/release-6.8
+    # @return [String]
+    def key_fingerprint
+      data[:key_fingerprint]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -116,7 +116,7 @@ module Aws::EC2
     #
     # @return [self]
     def load
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_key_pairs(key_names: [@name])
       end
       @data = resp.key_pairs[0]
@@ -233,7 +233,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -257,7 +257,7 @@ module Aws::EC2
     # @return [Types::DeleteKeyPairResult]
     def delete(options = {})
       options = options.merge(key_name: @name)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_key_pair(options)
       end
       resp.data

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

@@ -91,12 +91,11 @@ module Aws::EC2
     end
 
     # Reserved. If you need to sustain traffic greater than the [documented
-    # limits][1], contact us through the [Support Center][2].
+    # limits][1], contact Amazon Web Services Support.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/vpc-nat-gateway.html
-    # [2]: https://console.aws.amazon.com/support/home?
+    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html#vpc-limits-gateways
     # @return [Types::ProvisionedBandwidth]
     def provisioned_bandwidth
       data[:provisioned_bandwidth]
@@ -163,7 +162,7 @@ module Aws::EC2
     #
     # @return [self]
     def load
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_nat_gateways(nat_gateway_ids: [@id])
       end
       @data = resp.nat_gateways[0]
@@ -280,7 +279,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -312,7 +311,7 @@ module Aws::EC2
     def create_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_tags(options)
       end
       options[:tags].each do |t|
@@ -359,7 +358,7 @@ module Aws::EC2
     def delete_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_tags(options)
       end
       options[:tags].each do |t|
@@ -387,7 +386,7 @@ module Aws::EC2
     # @return [Types::DeleteNatGatewayResult]
     def delete(options = {})
       options = options.merge(nat_gateway_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_nat_gateway(options)
       end
       resp.data

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

@@ -35,7 +35,7 @@ module Aws::EC2
     end
     alias :network_acl_id :id
 
-    # Any associations between the network ACL and one or more subnets
+    # Any associations between the network ACL and your subnets
     # @return [Array<Types::NetworkAclAssociation>]
     def associations
       data[:associations]
@@ -85,7 +85,7 @@ module Aws::EC2
     #
     # @return [self]
     def load
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_network_acls(network_acl_ids: [@id])
       end
       @data = resp.network_acls[0]
@@ -202,7 +202,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -212,46 +212,34 @@ 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: {
     #       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`). We modify the specified CIDR block to its canonical
-    #   form; for example, if you specify `100.68.0.18/18`, we modify it to
-    #   `100.68.0.0/18`.
     # @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, 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 protocol 1 (ICMP) 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. Required
-    #   if specifying protocol 6 (TCP) or 17 (UDP).
+    # @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, String] :protocol
     #   The protocol number. A value of "-1" means all protocols. If you
     #   specify "-1" or a protocol number other than "6" (TCP), "17"
@@ -263,16 +251,28 @@ module Aws::EC2
     #   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 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 [String] :cidr_block
+    #   The IPv4 network range to allow or deny, in CIDR notation (for example
+    #   `172.16.0.0/24`). We modify the specified CIDR block to its canonical
+    #   form; for example, if you specify `100.68.0.18/18`, we modify it to
+    #   `100.68.0.0/18`.
+    # @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 protocol 1 (ICMP) 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. Required
+    #   if specifying protocol 6 (TCP) or 17 (UDP).
     # @return [EmptyStructure]
     def create_entry(options = {})
       options = options.merge(network_acl_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_network_acl_entry(options)
       end
       resp.data
@@ -303,7 +303,7 @@ module Aws::EC2
     def create_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_tags(options)
       end
       options[:tags].each do |t|
@@ -350,7 +350,7 @@ module Aws::EC2
     def delete_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_tags(options)
       end
       options[:tags].each do |t|
@@ -378,7 +378,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(network_acl_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_network_acl(options)
       end
       resp.data
@@ -388,8 +388,8 @@ module Aws::EC2
     #
     #   network_acl.delete_entry({
     #     dry_run: false,
-    #     egress: false, # required
     #     rule_number: 1, # required
+    #     egress: false, # required
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -397,14 +397,14 @@ 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, Boolean] :egress
-    #   Indicates whether the rule is an egress rule.
     # @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.
     # @return [EmptyStructure]
     def delete_entry(options = {})
       options = options.merge(network_acl_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_network_acl_entry(options)
       end
       resp.data
@@ -413,22 +413,22 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   network_acl.replace_association({
-    #     association_id: "NetworkAclAssociationId", # required
     #     dry_run: false,
+    #     association_id: "NetworkAclAssociationId", # required
     #   })
     # @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)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.replace_network_acl_association(options)
       end
       resp.data
@@ -437,45 +437,30 @@ 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: {
     #       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, Boolean] :egress
-    #   Indicates whether to replace the egress rule.
-    #
-    #   Default: If no value is specified, we replace the ingress rule.
-    # @option options [Types::IcmpTypeCode] :icmp_type_code
-    #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
-    #   specifying protocol 1 (ICMP) 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 protocol 6 (TCP) or 17 (UDP).
+    # @option options [required, Integer] :rule_number
+    #   The rule number of the entry to replace.
     # @option options [required, String] :protocol
     #   The protocol number. A value of "-1" means all protocols. If you
     #   specify "-1" or a protocol number other than "6" (TCP), "17"
@@ -487,12 +472,27 @@ module Aws::EC2
     #   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.
+    # @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 protocol 1 (ICMP) 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. Required
+    #   if specifying protocol 6 (TCP) or 17 (UDP).
     # @return [EmptyStructure]
     def replace_entry(options = {})
       options = options.merge(network_acl_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.replace_network_acl_entry(options)
       end
       resp.data