aws-sdk-ec2 1.459.0 → 1.461.0

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

@@ -1042,6 +1042,8 @@ module Aws::EC2
     DescribeSubnetsResult = Shapes::StructureShape.new(name: 'DescribeSubnetsResult')
     DescribeTagsRequest = Shapes::StructureShape.new(name: 'DescribeTagsRequest')
     DescribeTagsResult = Shapes::StructureShape.new(name: 'DescribeTagsResult')
+    DescribeTrafficMirrorFilterRulesRequest = Shapes::StructureShape.new(name: 'DescribeTrafficMirrorFilterRulesRequest')
+    DescribeTrafficMirrorFilterRulesResult = Shapes::StructureShape.new(name: 'DescribeTrafficMirrorFilterRulesResult')
     DescribeTrafficMirrorFiltersRequest = Shapes::StructureShape.new(name: 'DescribeTrafficMirrorFiltersRequest')
     DescribeTrafficMirrorFiltersResult = Shapes::StructureShape.new(name: 'DescribeTrafficMirrorFiltersResult')
     DescribeTrafficMirrorSessionsRequest = Shapes::StructureShape.new(name: 'DescribeTrafficMirrorSessionsRequest')
@@ -2875,8 +2877,10 @@ module Aws::EC2
     TrafficMirrorFilterRule = Shapes::StructureShape.new(name: 'TrafficMirrorFilterRule')
     TrafficMirrorFilterRuleField = Shapes::StringShape.new(name: 'TrafficMirrorFilterRuleField')
     TrafficMirrorFilterRuleFieldList = Shapes::ListShape.new(name: 'TrafficMirrorFilterRuleFieldList')
+    TrafficMirrorFilterRuleIdList = Shapes::ListShape.new(name: 'TrafficMirrorFilterRuleIdList')
     TrafficMirrorFilterRuleIdWithResolver = Shapes::StringShape.new(name: 'TrafficMirrorFilterRuleIdWithResolver')
     TrafficMirrorFilterRuleList = Shapes::ListShape.new(name: 'TrafficMirrorFilterRuleList')
+    TrafficMirrorFilterRuleSet = Shapes::ListShape.new(name: 'TrafficMirrorFilterRuleSet')
     TrafficMirrorFilterSet = Shapes::ListShape.new(name: 'TrafficMirrorFilterSet')
     TrafficMirrorNetworkService = Shapes::StringShape.new(name: 'TrafficMirrorNetworkService')
     TrafficMirrorNetworkServiceList = Shapes::ListShape.new(name: 'TrafficMirrorNetworkServiceList')
@@ -5196,6 +5200,7 @@ module Aws::EC2
     CreateTrafficMirrorFilterRuleRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
     CreateTrafficMirrorFilterRuleRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     CreateTrafficMirrorFilterRuleRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    CreateTrafficMirrorFilterRuleRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateTrafficMirrorFilterRuleRequest.struct_class = Types::CreateTrafficMirrorFilterRuleRequest
 
     CreateTrafficMirrorFilterRuleResult.add_member(:traffic_mirror_filter_rule, Shapes::ShapeRef.new(shape: TrafficMirrorFilterRule, location_name: "trafficMirrorFilterRule"))
@@ -7473,6 +7478,18 @@ module Aws::EC2
     DescribeTagsResult.add_member(:tags, Shapes::ShapeRef.new(shape: TagDescriptionList, location_name: "tagSet"))
     DescribeTagsResult.struct_class = Types::DescribeTagsResult
 
+    DescribeTrafficMirrorFilterRulesRequest.add_member(:traffic_mirror_filter_rule_ids, Shapes::ShapeRef.new(shape: TrafficMirrorFilterRuleIdList, location_name: "TrafficMirrorFilterRuleId"))
+    DescribeTrafficMirrorFilterRulesRequest.add_member(:traffic_mirror_filter_id, Shapes::ShapeRef.new(shape: TrafficMirrorFilterId, location_name: "TrafficMirrorFilterId"))
+    DescribeTrafficMirrorFilterRulesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeTrafficMirrorFilterRulesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeTrafficMirrorFilterRulesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: TrafficMirroringMaxResults, location_name: "MaxResults"))
+    DescribeTrafficMirrorFilterRulesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeTrafficMirrorFilterRulesRequest.struct_class = Types::DescribeTrafficMirrorFilterRulesRequest
+
+    DescribeTrafficMirrorFilterRulesResult.add_member(:traffic_mirror_filter_rules, Shapes::ShapeRef.new(shape: TrafficMirrorFilterRuleSet, location_name: "trafficMirrorFilterRuleSet"))
+    DescribeTrafficMirrorFilterRulesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeTrafficMirrorFilterRulesResult.struct_class = Types::DescribeTrafficMirrorFilterRulesResult
+
     DescribeTrafficMirrorFiltersRequest.add_member(:traffic_mirror_filter_ids, Shapes::ShapeRef.new(shape: TrafficMirrorFilterIdList, location_name: "TrafficMirrorFilterId"))
     DescribeTrafficMirrorFiltersRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DescribeTrafficMirrorFiltersRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
@@ -14595,12 +14612,17 @@ module Aws::EC2
     TrafficMirrorFilterRule.add_member(:destination_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationCidrBlock"))
     TrafficMirrorFilterRule.add_member(:source_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "sourceCidrBlock"))
     TrafficMirrorFilterRule.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    TrafficMirrorFilterRule.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     TrafficMirrorFilterRule.struct_class = Types::TrafficMirrorFilterRule
 
     TrafficMirrorFilterRuleFieldList.member = Shapes::ShapeRef.new(shape: TrafficMirrorFilterRuleField)
 
+    TrafficMirrorFilterRuleIdList.member = Shapes::ShapeRef.new(shape: TrafficMirrorFilterRuleIdWithResolver, location_name: "item")
+
     TrafficMirrorFilterRuleList.member = Shapes::ShapeRef.new(shape: TrafficMirrorFilterRule, location_name: "item")
 
+    TrafficMirrorFilterRuleSet.member = Shapes::ShapeRef.new(shape: TrafficMirrorFilterRule, location_name: "item")
+
     TrafficMirrorFilterSet.member = Shapes::ShapeRef.new(shape: TrafficMirrorFilter, location_name: "item")
 
     TrafficMirrorNetworkServiceList.member = Shapes::ShapeRef.new(shape: TrafficMirrorNetworkService, location_name: "item")
@@ -15714,6 +15736,7 @@ module Aws::EC2
 
       api.metadata = {
         "apiVersion" => "2016-11-15",
+        "auth" => ["aws.auth#sigv4"],
         "endpointPrefix" => "ec2",
         "protocol" => "ec2",
         "protocols" => ["query"],
@@ -18892,6 +18915,14 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_traffic_mirror_filter_rules, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeTrafficMirrorFilterRules"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeTrafficMirrorFilterRulesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeTrafficMirrorFilterRulesResult)
+      end)
+
       api.add_operation(:describe_traffic_mirror_filters, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeTrafficMirrorFilters"
         o.http_method = "POST"

data/lib/aws-sdk-ec2/customizations/instance.rb

@@ -18,7 +18,7 @@ module Aws
       private
 
       def encrypted_password
-        bytes = Aws::Plugins::UserAgent.feature('resource') do
+        bytes = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           client.get_password_data(instance_id: id).password_data
         end
         if bytes == ''

data/lib/aws-sdk-ec2/customizations/resource.rb

@@ -48,7 +48,7 @@ module Aws
     class Resource
       prepend ResourcePaginationFix
       def create_tags(options)
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.create_tags(options)
         end
         tags = []

data/lib/aws-sdk-ec2/dhcp_options.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_dhcp_options(dhcp_options_ids: [@id])
       end
       @data = resp.dhcp_options[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 associate_with_vpc(options = {})
       options = options.merge(dhcp_options_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.associate_dhcp_options(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(dhcp_options_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_dhcp_options(options)
       end
       resp.data

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

@@ -4674,6 +4674,20 @@ module Aws::EC2
       end
     end
 
+    class DescribeTrafficMirrorFilterRules
+      def self.build(context)
+        unless context.config.regional_endpoint
+          endpoint = context.config.endpoint.to_s
+        end
+        Aws::EC2::EndpointParameters.new(
+          region: context.config.region,
+          use_dual_stack: context.config.use_dualstack_endpoint,
+          use_fips: context.config.use_fips_endpoint,
+          endpoint: endpoint,
+        )
+      end
+    end
+
     class DescribeTrafficMirrorFilters
       def self.build(context)
         unless context.config.regional_endpoint

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

@@ -308,7 +308,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_images(image_ids: [@id])
       end
       @data = resp.images[0]
@@ -355,7 +355,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::ImageExists.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(image_ids: [@id]))
       end
       Image.new({
@@ -459,7 +459,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
@@ -491,7 +491,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|
@@ -538,7 +538,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|
@@ -566,7 +566,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def deregister(options = {})
       options = options.merge(image_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.deregister_image(options)
       end
       resp.data
@@ -594,7 +594,7 @@ module Aws::EC2
     # @return [Types::ImageAttribute]
     def describe_attribute(options = {})
       options = options.merge(image_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_image_attribute(options)
       end
       resp.data
@@ -686,7 +686,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def modify_attribute(options = {})
       options = options.merge(image_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.modify_image_attribute(options)
       end
       resp.data
@@ -710,7 +710,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def reset_attribute(options = {})
       options = options.merge(image_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_image_attribute(options)
       end
       resp.data

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

@@ -450,7 +450,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_instances(instance_ids: [@id])
       end
       @data = resp.reservations[0].instances[0]
@@ -497,7 +497,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceExists.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -517,7 +517,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceRunning.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -537,7 +537,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceStopped.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -557,7 +557,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceTerminated.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -661,7 +661,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
@@ -689,7 +689,7 @@ module Aws::EC2
     # @return [Types::AttachClassicLinkVpcResult]
     def attach_classic_link_vpc(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.attach_classic_link_vpc(options)
       end
       resp.data
@@ -716,7 +716,7 @@ module Aws::EC2
     # @return [Types::VolumeAttachment]
     def attach_volume(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.attach_volume(options)
       end
       resp.data
@@ -741,7 +741,7 @@ module Aws::EC2
     # @return [Types::GetConsoleOutputResult]
     def console_output(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.get_console_output(options)
       end
       resp.data
@@ -774,7 +774,7 @@ module Aws::EC2
     #     no_reboot: false,
     #     tag_specifications: [
     #       {
-    #         resource_type: "capacity-reservation", # accepts capacity-reservation, client-vpn-endpoint, customer-gateway, carrier-gateway, coip-pool, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, instance-event-window, internet-gateway, ipam, ipam-pool, ipam-scope, ipv4pool-ec2, ipv6pool-ec2, key-pair, launch-template, local-gateway, local-gateway-route-table, local-gateway-virtual-interface, local-gateway-virtual-interface-group, local-gateway-route-table-vpc-association, local-gateway-route-table-virtual-interface-group-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, network-insights-access-scope, network-insights-access-scope-analysis, placement-group, prefix-list, replace-root-volume-task, reserved-instances, route-table, security-group, security-group-rule, snapshot, spot-fleet-request, spot-instances-request, subnet, subnet-cidr-reservation, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-policy-table, transit-gateway-route-table, transit-gateway-route-table-announcement, volume, vpc, vpc-endpoint, vpc-endpoint-connection, vpc-endpoint-service, vpc-endpoint-service-permission, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log, capacity-reservation-fleet, traffic-mirror-filter-rule, vpc-endpoint-connection-device-type, verified-access-instance, verified-access-group, verified-access-endpoint, verified-access-policy, verified-access-trust-provider, vpn-connection-device-type, vpc-block-public-access-exclusion, ipam-resource-discovery, ipam-resource-discovery-association, instance-connect-endpoint
+    #         resource_type: "capacity-reservation", # accepts capacity-reservation, client-vpn-endpoint, customer-gateway, carrier-gateway, coip-pool, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, instance-event-window, internet-gateway, ipam, ipam-pool, ipam-scope, ipv4pool-ec2, ipv6pool-ec2, key-pair, launch-template, local-gateway, local-gateway-route-table, local-gateway-virtual-interface, local-gateway-virtual-interface-group, local-gateway-route-table-vpc-association, local-gateway-route-table-virtual-interface-group-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, network-insights-access-scope, network-insights-access-scope-analysis, placement-group, prefix-list, replace-root-volume-task, reserved-instances, route-table, security-group, security-group-rule, snapshot, spot-fleet-request, spot-instances-request, subnet, subnet-cidr-reservation, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-policy-table, transit-gateway-route-table, transit-gateway-route-table-announcement, volume, vpc, vpc-endpoint, vpc-endpoint-connection, vpc-endpoint-service, vpc-endpoint-service-permission, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log, capacity-reservation-fleet, traffic-mirror-filter-rule, vpc-endpoint-connection-device-type, verified-access-instance, verified-access-group, verified-access-endpoint, verified-access-policy, verified-access-trust-provider, vpn-connection-device-type, vpc-block-public-access-exclusion, vpc-encryption-control, ipam-resource-discovery, ipam-resource-discovery-association, instance-connect-endpoint
     #         tags: [
     #           {
     #             key: "String",
@@ -852,7 +852,7 @@ module Aws::EC2
     # @return [Image]
     def create_image(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_image(options)
       end
       Image.new(
@@ -886,7 +886,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|
@@ -933,7 +933,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|
@@ -966,7 +966,7 @@ module Aws::EC2
     # @return [Types::InstanceAttribute]
     def describe_attribute(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_instance_attribute(options)
       end
       resp.data
@@ -989,7 +989,7 @@ module Aws::EC2
     # @return [Types::DetachClassicLinkVpcResult]
     def detach_classic_link_vpc(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.detach_classic_link_vpc(options)
       end
       resp.data
@@ -1025,7 +1025,7 @@ module Aws::EC2
     # @return [Types::VolumeAttachment]
     def detach_volume(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.detach_volume(options)
       end
       resp.data
@@ -1179,17 +1179,17 @@ module Aws::EC2
     #   `instanceInitiatedShutdownBehavior` attribute.
     # @option options [Types::AttributeBooleanValue] :disable_api_stop
     #   Indicates whether an instance is enabled for stop protection. For more
-    #   information, see [Stop Protection][1].
+    #   information, see [Enable stop protection for your instance][1].
     #
     #
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html#Using_StopProtection
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-stop-protection.html
     # @return [EmptyStructure]
     def modify_attribute(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.modify_instance_attribute(options)
       end
       resp.data
@@ -1209,7 +1209,7 @@ module Aws::EC2
     # @return [Types::MonitorInstancesResult]
     def monitor(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.monitor_instances(options)
       end
       resp.data
@@ -1229,7 +1229,7 @@ module Aws::EC2
     # @return [Types::GetPasswordDataResult]
     def password_data(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.get_password_data(options)
       end
       resp.data
@@ -1249,7 +1249,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def reboot(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reboot_instances(options)
       end
       resp.data
@@ -1309,7 +1309,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def report_status(options = {})
       options = Aws::Util.deep_merge(options, instances: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.report_instance_status(options)
       end
       resp.data
@@ -1335,7 +1335,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def reset_attribute(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1358,7 +1358,7 @@ module Aws::EC2
         instance_id: @id,
         attribute: "kernel"
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1381,7 +1381,7 @@ module Aws::EC2
         instance_id: @id,
         attribute: "ramdisk"
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1404,7 +1404,7 @@ module Aws::EC2
         instance_id: @id,
         attribute: "sourceDestCheck"
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1427,7 +1427,7 @@ module Aws::EC2
     # @return [Types::StartInstancesResult]
     def start(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.start_instances(options)
       end
       resp.data
@@ -1467,7 +1467,7 @@ module Aws::EC2
     # @return [Types::StopInstancesResult]
     def stop(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.stop_instances(options)
       end
       resp.data
@@ -1487,7 +1487,7 @@ module Aws::EC2
     # @return [Types::TerminateInstancesResult]
     def terminate(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.terminate_instances(options)
       end
       resp.data
@@ -1507,7 +1507,7 @@ module Aws::EC2
     # @return [Types::UnmonitorInstancesResult]
     def unmonitor(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.unmonitor_instances(options)
       end
       resp.data
@@ -1669,7 +1669,7 @@ module Aws::EC2
           name: "attachment.instance-id",
           values: [@id]
         }])
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.describe_volumes(options)
         end
         resp.each_page do |page|
@@ -1766,7 +1766,7 @@ module Aws::EC2
           name: "instance-id",
           values: [@id]
         }])
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.describe_addresses(options)
         end
         resp.data.addresses.each do |a|
@@ -1861,7 +1861,7 @@ module Aws::EC2
           batch.each do |item|
             params[:resources] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.create_tags(params)
           end
         end
@@ -1905,7 +1905,7 @@ module Aws::EC2
           batch.each do |item|
             params[:resources] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.delete_tags(params)
           end
         end
@@ -1931,7 +1931,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.monitor_instances(params)
           end
         end
@@ -1957,7 +1957,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.reboot_instances(params)
           end
         end
@@ -1986,7 +1986,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.start_instances(params)
           end
         end
@@ -2032,7 +2032,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.stop_instances(params)
           end
         end
@@ -2058,7 +2058,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.terminate_instances(params)
           end
         end
@@ -2084,7 +2084,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.unmonitor_instances(params)
           end
         end