diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-10-22 14:03:16 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2021-10-27 12:38:25 -0700 |
| commit | 4600606675d223f82a763ffd6f2df01e68c54f3f (patch) | |
| tree | 87dbd9eb3ab566d078214f0db5326e1f22fb8cc7 /lib | |
| parent | d61840ae9c1d0e089e927b2761242bdf219e61cc (diff) | |
| download | chef-reporting.tar.gz | |
Fix reporting/data_collector for @recipe_filesreporting
When individual recipes are invoked like 'chef-client ./whatever.rb'
those files get a cookbook_name of `@recipe_files` which is a magic
value that nees to be handled specially to avoid the reporting
classes from blowing up.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/data_collector/run_end_message.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource_reporter.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/data_collector/run_end_message.rb b/lib/chef/data_collector/run_end_message.rb index 91cf21e643..48b1d55aff 100644 --- a/lib/chef/data_collector/run_end_message.rb +++ b/lib/chef/data_collector/run_end_message.rb @@ -128,7 +128,7 @@ class Chef if new_resource.cookbook_name hash["cookbook_name"] = new_resource.cookbook_name - hash["cookbook_version"] = new_resource.cookbook_version.version + hash["cookbook_version"] = new_resource.cookbook_version&.version hash["recipe_name"] = new_resource.recipe_name end diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 15fdd87c84..99ee1c3046 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -1513,7 +1513,7 @@ class Chef # @return Chef::CookbookVersion The cookbook in which this Resource was defined. # def cookbook_version - if cookbook_name + if cookbook_name && cookbook_name != "@recipe_files" run_context.cookbook_collection[cookbook_name] end end diff --git a/lib/chef/resource_reporter.rb b/lib/chef/resource_reporter.rb index 4051ac2f49..5fb3d4eba4 100644 --- a/lib/chef/resource_reporter.rb +++ b/lib/chef/resource_reporter.rb @@ -41,7 +41,7 @@ class Chef as_hash["result"] = action_record.action.to_s if new_resource.cookbook_name as_hash["cookbook_name"] = new_resource.cookbook_name - as_hash["cookbook_version"] = new_resource.cookbook_version.version + as_hash["cookbook_version"] = new_resource.cookbook_version&.version end as_hash |