diff options
| author | John Keiser <john@johnkeiser.com> | 2015-06-30 10:18:15 -0600 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2015-06-30 11:18:42 -0600 |
| commit | 5bb507836095585274d5a9bb2802bf662fab4195 (patch) | |
| tree | 30dbb8b5b2b2330dc6d6fbc4f6046d456461000e | |
| parent | e2b79fd7e2e54cc063f6d4977bef3051ce8b08cf (diff) | |
| download | chef-5bb507836095585274d5a9bb2802bf662fab4195.tar.gz | |
Code review comments
| -rw-r--r-- | lib/chef/node_map.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider_resolver.rb | 6 | ||||
| -rw-r--r-- | lib/chef/resource_resolver.rb | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/chef/node_map.rb b/lib/chef/node_map.rb index 1ce52818b2..d905c8779e 100644 --- a/lib/chef/node_map.rb +++ b/lib/chef/node_map.rb @@ -58,7 +58,6 @@ class Chef else map[key] << new_matcher end - insert_at ||= map[key].size - 1 map end diff --git a/lib/chef/provider_resolver.rb b/lib/chef/provider_resolver.rb index 6c49a39ba4..8e731ff96a 100644 --- a/lib/chef/provider_resolver.rb +++ b/lib/chef/provider_resolver.rb @@ -88,7 +88,7 @@ class Chef private def potential_handlers - priority_map.list_handlers(node, resource.resource_name).flatten(1).uniq + priority_map.list_handlers(node, resource.resource_name) end # if resource.provider is set, just return one of those objects @@ -126,11 +126,11 @@ class Chef end def self.priority_map - Chef::Platform::ProviderPriorityMap.instance + Chef.provider_priority_map end def priority_map - Chef::Platform::ProviderPriorityMap.instance + Chef.provider_priority_map end def overrode_provides?(handler) diff --git a/lib/chef/resource_resolver.rb b/lib/chef/resource_resolver.rb index e138ad0d51..2f27e93a3b 100644 --- a/lib/chef/resource_resolver.rb +++ b/lib/chef/resource_resolver.rb @@ -56,7 +56,6 @@ class Chef attr_reader :resource_name # @api private def resource - raise 'omg' Chef::Log.deprecation("Chef::ResourceResolver.resource deprecated. Use resource_name instead.") resource_name end @@ -125,16 +124,16 @@ class Chef protected def self.priority_map - Chef::Platform::ResourcePriorityMap.instance + Chef.resource_priority_map end def priority_map - Chef::Platform::ResourcePriorityMap.instance + Chef.resource_priority_map end # @api private def potential_handlers - priority_map.list_handlers(node, resource_name, canonical: canonical).flatten(1).uniq + priority_map.list_handlers(node, resource_name, canonical: canonical) end def enabled_handlers |