From 6bd16a6933cd6a1dc7e881e651b00786dc5b9510 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 30 Jun 2020 14:55:05 -0700 Subject: Add resource_name_without_provides deprecation Signed-off-by: Lamont Granquist --- lib/chef/deprecated.rb | 4 ++++ lib/chef/resource/lwrp_base.rb | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/lib/chef/deprecated.rb b/lib/chef/deprecated.rb index d67cee8153..4a2ac69b04 100644 --- a/lib/chef/deprecated.rb +++ b/lib/chef/deprecated.rb @@ -241,6 +241,10 @@ class Chef target 30 end + class ResourceNameWithoutProvides < Base + target 31 + end + class Generic < Base def url "https://docs.chef.io/chef_deprecations_client/" diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index cd8086d0ce..3c0da3f422 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -65,6 +65,12 @@ class Chef LWRPBase.loaded_lwrps[filename] = true + unless resource_class.resource_name.nil? + if Chef.resource_handler_map.get(node, resource_class.resource_name, canonical: true) == resource_class + Chef.deprecated(:resource_name_without_provides, "Resource #{resource_class.resource_name} needs `provides :#{resource_class.resource_name}` in addition to `resource_name :#{resource_class.resource_name}` declaration") + end + end + # 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? -- cgit v1.2.1