Only automatically set resources that do class X < Chef::Resource,jk/3524

not X = Class.new(Chef::Resource)

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index e89dede609..a85d07df2d 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -924,11 +924,6 @@ class Chef
         else
           @resource_name = nil
         end
-      else
-        # set resource_name automatically if it's not set
-        if !instance_variable_defined?(:@resource_name) && self.name
-          resource_name convert_to_snake_case(self.name.split('::')[-1])
-        end
       end
 
       @resource_name
@@ -1111,7 +1106,10 @@ class Chef
     def self.inherited(child)
       super
       @sorted_descendants = nil
-      child.resource_name
+      # set resource_name automatically if it's not set
+      if child.name && !child.resource_name
+        child.resource_name(convert_to_snake_case(child.name.split('::')[-1]))
+      end
     end