diff options
| -rw-r--r-- | lib/chef/resource/lwrp_base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index c0f6f835ad..ed8a3b205d 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -49,9 +49,7 @@ class Chef resource_name = filename_to_qualified_string(cookbook_name, filename) - # We load the class first to give it a chance to set its own name resource_class = Class.new(self) - resource_class.resource_name resource_name.to_sym resource_class.run_context = run_context resource_class.class_from_file(filename) @@ -67,6 +65,10 @@ class Chef LWRPBase.loaded_lwrps[filename] = true + # wire up the default resource name after the class is parsed only if we haven't declared one. + # (this ordering is important for MapCollision deprecation warnings) + resource_class.resource_name resource_name.to_sym if resource_class.resource_name.nil? + resource_class end |