1 files changed, 5 insertions, 98 deletions
diff --git a/lib/chef/resource_resolver.rb b/lib/chef/resource_resolver.rb
index c9bf2e189a..88ee218924 100644
--- a/lib/chef/resource_resolver.rb
+++ b/lib/chef/resource_resolver.rb
@@ -21,105 +21,12 @@ require 'chef/platform/resource_priority_map'
 require 'chef/mixin/convert_to_class_name'
 
 class Chef
-  class ResourceResolver
-    include Chef::Mixin::ConvertToClassName
-
-    attr_reader :node
-    attr_reader :resource
-    attr_reader :action
-
-    def initialize(node, resource)
-      @node = node
-      @resource = resource
-    end
-
-    # return a deterministically sorted list of Chef::Resource subclasses
-    def resources
-      @resources ||= Chef::Resource.descendants
-    end
-
-    def resolve
-      # log this so we know what resources will work for the generic resource on the node (early cut)
-      Chef::Log.debug "resources for generic #{resource} resource enabled on node include: #{enabled_handlers}"
-
-      # if none of the resources specifically support the resource, we still need to pick one of the resources that are
-      # enabled on the node to handle the why-run use case.
-      handlers = enabled_handlers
-
-      if handlers.size >= 2
-        # this magic stack ranks the resources by where they appear in the resource_priority_map
-        priority_list = [ get_priority_array(node, resource) ].flatten.compact
-        handlers = handlers.sort_by { |x| i = priority_list.index x; i.nil? ? Float::INFINITY : i }
-        if priority_list.index(handlers.first).nil?
-          # if we had more than one and we picked one with a precidence of infinity that means that the resource_priority_map
-          # entry for this resource is missing -- we should probably raise here and force resolution of the ambiguity.
-          Chef::Log.warn "Ambiguous resource precedence: #{handlers}, please use Chef.set_resource_priority_array to provide determinism"
-        end
-        handlers = handlers[0..0]
-      end
-
-      Chef::Log.debug "resources that survived replacement include: #{handlers}"
-
-      raise Chef::Exceptions::AmbiguousResourceResolution.new(resource, handlers) if handlers.count >= 2
-
-      Chef::Log.debug "dynamic resource resolver FAILED to resolve a resouce" if handlers.empty?
-
-      return nil if handlers.empty?
-
-      handlers[0]
-    end
-
-    # this cut looks at if the resource can handle the resource type on the node
-    def enabled_handlers
-      @enabled_handlers ||= begin
-        enabled_handlers = resources.select do |klass|
-          klass.provides?(node, resource)
-        end.sort {|a,b| a.to_s <=> b.to_s }
-
-        # Add Chef::Resource::X as a possibility if it is not a handler already
-        check_for_deprecated_chef_resource_class(enabled_handlers)
-
-        enabled_handlers
+  module Deprecated
+    class ResourceResolver < Struct[:node, :resource]
+      def resolve
+        Chef.run_context.resource_classes.public_send(resource)
       end
     end
-
-    private
-
-    #
-    # Checks if the Chef::Resource::* class corresponding to the DSL name
-    # exists, emits a deprecation warning, marks it as providing the given
-    # short name and adds it to the DSL.  This is used for method_missing
-    # deprecation and ResourceResolver checking, when people have created
-    # anonymous classes and assigned them to Chef::Resource::X.
-    #
-    # Returns the matched class, if it exists.
-    #
-    # @api private
-    def check_for_deprecated_chef_resource_class(enabled_handlers)
-      # If Chef::Resource::MyResource exists, but was not set, it won't have a
-      # DSL name.  Add the DSL method and warn about this pattern.
-      class_name = convert_to_class_name(resource.to_s)
-      if Chef::Resource.const_defined?(class_name)
-        # If Chef::Resource::X already exists, and is *not* already marked as
-        # providing this resource, mark it as providing the resource and add it
-        # to the list of handlers for next time.
-        resource_class = Chef::Resource.const_get(class_name)
-        if resource_class <= Chef::Resource && !enabled_handlers.include?(resource_class)
-          enabled_handlers << resource_class
-          Chef::Log.warn("Class Chef::Resource::#{class_name} does not declare `provides #{resource.inspect}`.")
-          Chef::Log.warn("This will no longer work in Chef 13: you must use `provides` to provide DSL.")
-          resource_class.provides resource.to_sym
-        end
-      end
-    end
-
-    # dep injection hooks
-    def get_priority_array(node, resource_name)
-      resource_priority_map.get_priority_array(node, resource_name)
-    end
-
-    def resource_priority_map
-      Chef::Platform::ResourcePriorityMap.instance
-    end
   end
+  ResourceResolver = Deprecated::ResourceResolver
 end