aws-sdk-ec2 1.431.0 → 1.522.0

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

@@ -48,7 +48,7 @@ module Aws::EC2
       data[:destination_ipv_6_cidr_block]
     end
 
-    # The prefix of the Amazon Web Service.
+    # The prefix of the Amazon Web Services service.
     # @return [String]
     def destination_prefix_list_id
       data[:destination_prefix_list_id]
@@ -267,7 +267,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
@@ -277,14 +277,11 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   route.delete({
-    #     destination_ipv_6_cidr_block: "String",
     #     destination_prefix_list_id: "PrefixListResourceId",
     #     dry_run: false,
+    #     destination_ipv_6_cidr_block: "String",
     #   })
     # @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 [String] :destination_prefix_list_id
     #   The ID of the prefix list for the route.
     # @option options [Boolean] :dry_run
@@ -292,13 +289,16 @@ 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] :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(
         route_table_id: @route_table_id,
         destination_cidr_block: @destination_cidr_block
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_route(options)
       end
       resp.data
@@ -307,67 +307,67 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   route.replace({
-    #     destination_ipv_6_cidr_block: "String",
     #     destination_prefix_list_id: "PrefixListResourceId",
-    #     dry_run: false,
     #     vpc_endpoint_id: "VpcEndpointId",
-    #     egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
-    #     gateway_id: "RouteGatewayId",
-    #     instance_id: "InstanceId",
     #     local_target: false,
-    #     nat_gateway_id: "NatGatewayId",
     #     transit_gateway_id: "TransitGatewayId",
     #     local_gateway_id: "LocalGatewayId",
     #     carrier_gateway_id: "CarrierGatewayId",
+    #     core_network_arn: "CoreNetworkArn",
+    #     dry_run: false,
+    #     gateway_id: "RouteGatewayId",
+    #     destination_ipv_6_cidr_block: "String",
+    #     egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
+    #     instance_id: "InstanceId",
     #     network_interface_id: "NetworkInterfaceId",
     #     vpc_peering_connection_id: "VpcPeeringConnectionId",
-    #     core_network_arn: "CoreNetworkArn",
+    #     nat_gateway_id: "NatGatewayId",
     #   })
     # @param [Hash] options ({})
-    # @option options [String] :destination_ipv_6_cidr_block
-    #   The IPv6 CIDR address block used for the destination match. The value
-    #   that you provide must match the CIDR of an existing route in the
-    #   table.
     # @option options [String] :destination_prefix_list_id
     #   The ID of the prefix list for the route.
-    # @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] :vpc_endpoint_id
     #   The ID of a VPC endpoint. Supported for Gateway Load Balancer
     #   endpoints only.
-    # @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 [Boolean] :local_target
     #   Specifies whether to reset the local route to its default target
     #   (`local`).
-    # @option options [String] :nat_gateway_id
-    #   \[IPv4 traffic only\] The ID of a NAT gateway.
     # @option options [String] :transit_gateway_id
     #   The ID of a transit gateway.
     # @option options [String] :local_gateway_id
     #   The ID of the local gateway.
     # @option options [String] :carrier_gateway_id
     #   \[IPv4 traffic only\] The ID of a carrier gateway.
+    # @option options [String] :core_network_arn
+    #   The Amazon Resource Name (ARN) of the core network.
+    # @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
+    #   that 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] :instance_id
+    #   The ID of a NAT instance in your VPC.
     # @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] :core_network_arn
-    #   The Amazon Resource Name (ARN) of the core network.
+    # @option options [String] :nat_gateway_id
+    #   \[IPv4 traffic only\] The ID of a NAT gateway.
     # @return [EmptyStructure]
     def replace(options = {})
       options = options.merge(
         route_table_id: @route_table_id,
         destination_cidr_block: @destination_cidr_block
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.replace_route(options)
       end
       resp.data

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

@@ -73,7 +73,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_route_tables(route_table_ids: [@id])
       end
       @data = resp.route_tables[0]
@@ -190,7 +190,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
@@ -200,11 +200,13 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   routetableassociation = route_table.associate_with_subnet({
+    #     gateway_id: "RouteGatewayId",
     #     dry_run: false,
     #     subnet_id: "SubnetId",
-    #     gateway_id: "RouteGatewayId",
     #   })
     # @param [Hash] options ({})
+    # @option options [String] :gateway_id
+    #   The ID of the internet gateway or virtual private gateway.
     # @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.
@@ -212,12 +214,10 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [String] :subnet_id
     #   The ID of the subnet.
-    # @option options [String] :gateway_id
-    #   The ID of the internet gateway or virtual private gateway.
     # @return [RouteTableAssociation]
     def associate_with_subnet(options = {})
       options = options.merge(route_table_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.associate_route_table(options)
       end
       RouteTableAssociation.new(
@@ -229,52 +229,28 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   route = route_table.create_route({
-    #     destination_cidr_block: "String",
-    #     destination_ipv_6_cidr_block: "String",
     #     destination_prefix_list_id: "PrefixListResourceId",
-    #     dry_run: false,
     #     vpc_endpoint_id: "VpcEndpointId",
-    #     egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
-    #     gateway_id: "RouteGatewayId",
-    #     instance_id: "InstanceId",
-    #     nat_gateway_id: "NatGatewayId",
     #     transit_gateway_id: "TransitGatewayId",
     #     local_gateway_id: "LocalGatewayId",
     #     carrier_gateway_id: "CarrierGatewayId",
+    #     core_network_arn: "CoreNetworkArn",
+    #     dry_run: false,
+    #     destination_cidr_block: "String",
+    #     gateway_id: "RouteGatewayId",
+    #     destination_ipv_6_cidr_block: "String",
+    #     egress_only_internet_gateway_id: "EgressOnlyInternetGatewayId",
+    #     instance_id: "InstanceId",
     #     network_interface_id: "NetworkInterfaceId",
     #     vpc_peering_connection_id: "VpcPeeringConnectionId",
-    #     core_network_arn: "CoreNetworkArn",
+    #     nat_gateway_id: "NatGatewayId",
     #   })
     # @param [Hash] options ({})
-    # @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. 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] :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 [String] :destination_prefix_list_id
     #   The ID of a prefix list used for the destination 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] :vpc_endpoint_id
     #   The ID of a VPC endpoint. Supported for Gateway Load Balancer
     #   endpoints only.
-    # @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] :transit_gateway_id
     #   The ID of a transit gateway.
     # @option options [String] :local_gateway_id
@@ -284,16 +260,40 @@ module Aws::EC2
     #
     #   You can only use this option when the VPC contains a subnet which is
     #   associated with a Wavelength Zone.
+    # @option options [String] :core_network_arn
+    #   The Amazon Resource Name (ARN) of the core network.
+    # @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. 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] :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 [String] :egress_only_internet_gateway_id
+    #   \[IPv6 traffic only\] The ID of an egress-only internet gateway.
+    # @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] :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] :core_network_arn
-    #   The Amazon Resource Name (ARN) of the core network.
+    # @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)
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_route(options)
       end
       Route.new(
@@ -328,7 +328,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|
@@ -375,7 +375,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|
@@ -403,7 +403,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(route_table_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_route_table(options)
       end
       resp.data

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

@@ -190,7 +190,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
@@ -211,7 +211,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(association_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.disassociate_route_table(options)
       end
       resp.data
@@ -234,7 +234,7 @@ module Aws::EC2
     # @return [RouteTableAssociation]
     def replace_subnet(options = {})
       options = options.merge(association_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.replace_route_table_association(options)
       end
       RouteTableAssociation.new(