chef 18.5.0 → 18.7.3

data/lib/chef/resource/rhsm_subscription.rb

@@ -21,7 +21,7 @@ class Chef
   class Resource
     class RhsmSubscription < Chef::Resource
 
-      provides(:rhsm_subscription, target_mode: true) { true }
+      provides(:rhsm_subscription) { true }
 
       description "Use the **rhsm_subscription** resource to add or remove Red Hat Subscription Manager subscriptions from your host. This can be used when a host's activation_key does not attach all necessary subscriptions to your host."
       introduced "14.0"
@@ -50,9 +50,10 @@ class Chef
 
       action_class do
         def subscription_attached?(subscription)
-          cmd = "subscription-manager list --consumed | grep #{subscription}"
-          stdout = shell_out(cmd, env: { LANG: "en_US" }).stdout
-          !stdout.match(/Pool ID:\s+#{subscription}$/).nil?
+          # FIXME: use shell_out
+          cmd = Mixlib::ShellOut.new("subscription-manager list --consumed | grep #{subscription}", env: { LANG: "en_US" })
+          cmd.run_command
+          !cmd.stdout.match(/Pool ID:\s+#{subscription}$/).nil?
         end
 
         def serials_by_pool
@@ -60,10 +61,10 @@ class Chef
           pool = nil
           serial = nil
 
-          cmd = "subscription-manager list --consumed"
-          stdout = shell_out(cmd, env: { LANG: "en_US" }).stdout
-
-          stdout.lines.each do |line|
+          # FIXME: use shell_out
+          cmd = Mixlib::ShellOut.new("subscription-manager list --consumed", env: { LANG: "en_US" })
+          cmd.run_command
+          cmd.stdout.lines.each do |line|
             line.strip!
             key, value = line.split(/:\s+/, 2)
             next unless ["Pool ID", "Serial"].include?(key)

data/lib/chef/resource/route.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class Route < Chef::Resource
 
-      provides :route, target_mode: true
+      provides :route
 
       default_action :add
       allowed_actions :add, :delete

data/lib/chef/resource/rpm_package.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class RpmPackage < Chef::Resource::Package
 
-      provides :rpm_package, target_mode: true
+      provides :rpm_package
 
       allowed_actions :install, :upgrade, :remove
 

data/lib/chef/resource/scm/git.rb

@@ -23,7 +23,7 @@ class Chef
     class Git < Chef::Resource
       use "scm"
 
-      provides :git, target_mode: true
+      provides :git
 
       description "Use the **git** resource to manage source control resources that exist in a git repository. git version 1.6.5 (or higher) is required to use all of the functionality in the git resource."
       examples <<~DOC

data/lib/chef/resource/scm/subversion.rb

@@ -24,7 +24,7 @@ class Chef
     class Subversion < Chef::Resource
       use "scm"
 
-      provides :subversion, target_mode: true
+      provides :subversion
 
       description "Use the **subversion** resource to manage source control resources that exist in a Subversion repository. Warning: The subversion resource has known bugs and may not work as expected. For more information see Chef GitHub issues, particularly [#4050](https://github.com/chef/chef/issues/4050) and [#4257](https://github.com/chef/chef/issues/4257)."
       examples <<~DOC

data/lib/chef/resource/selinux/common_helpers.rb

@@ -40,7 +40,7 @@ class Chef
       def selinux_activate_required?
         return false unless platform_family?("debian")
 
-        !TargetIO::File.read("/etc/default/grub").match?("security=selinux")
+        !File.read("/etc/default/grub").match?("security=selinux")
       end
     end
   end

data/lib/chef/resource/selinux_boolean.rb

@@ -20,7 +20,7 @@ class Chef
     class SelinuxBoolean < Chef::Resource
       unified_mode true
 
-      provides :selinux_boolean, target_mode: true
+      provides :selinux_boolean
 
       description "Use **selinux_boolean** resource to set SELinux boolean values."
       introduced "18.0"

data/lib/chef/resource/selinux_fcontext.rb

@@ -20,7 +20,7 @@ class Chef
     class SelinuxFcontext < Chef::Resource
       unified_mode true
 
-      provides :selinux_fcontext, target_mode: true
+      provides :selinux_fcontext
 
       description "Use the **selinux_fcontext** resource to set the SELinux context of files using the `semanage fcontext` command."
       introduced "18.0"
@@ -95,7 +95,7 @@ class Chef
           # if path is not absolute, ignore it and search everything
           common = "/" if common[0] != "/"
 
-          if ::TargetIO::File.exist? common
+          if ::File.exist? common
             shell_out!("find #{common.shellescape} -ignore_readdir_race -regextype posix-egrep -regex #{spec.shellescape} -prune -print0 | xargs -0 restorecon -iRv")
           end
         end
@@ -157,4 +157,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/resource/selinux_install.rb

@@ -18,7 +18,7 @@ class Chef
     class SelinuxInstall < Chef::Resource
       unified_mode true
 
-      provides :selinux_install, target_mode: true
+      provides :selinux_install
 
       description "Use **selinux_install** resource to encapsulates the set of selinux packages to install in order to manage selinux. It also ensures the directory `/etc/selinux` is created."
       introduced "18.0"

data/lib/chef/resource/selinux_login.rb

@@ -19,7 +19,7 @@ class Chef
     class SelinuxLogin < Chef::Resource
       unified_mode true
 
-      provides :selinux_login, target_mode: true
+      provides :selinux_login
 
       description "Use the **selinux_login** resource to add, update, or remove SELinux user to OS login mappings."
       introduced "18.1"

data/lib/chef/resource/selinux_module.rb

@@ -18,7 +18,7 @@ class Chef
     class SelinuxModule < Chef::Resource
       unified_mode true
 
-      provides :selinux_module, target_mode: true
+      provides :selinux_module
 
       description "Use **selinux_module** module resource to create an SELinux policy module from a cookbook file or content provided as a string."
       introduced "18.0"
@@ -103,7 +103,7 @@ class Chef
           notifies :run, "execute[Install SELinux module '#{selinux_module_filepath("pp")}']", :immediately
         end
 
-        raise "Compilation must have failed, no 'pp' file found at: '#{selinux_module_filepath("pp")}'" unless ::TargetIO::File.exist?(selinux_module_filepath("pp"))
+        raise "Compilation must have failed, no 'pp' file found at: '#{selinux_module_filepath("pp")}'" unless ::File.exist?(selinux_module_filepath("pp"))
 
         execute "Install SELinux module '#{selinux_module_filepath("pp")}'" do
           command "semodule --install '#{selinux_module_filepath("pp")}'"
@@ -113,7 +113,7 @@ class Chef
 
       action :delete, description: "Remove module source files from `/etc/selinux/local`." do
         %w{fc if pp te}.each do |type|
-          next unless ::TargetIO::File.exist?(selinux_module_filepath(type))
+          next unless ::File.exist?(selinux_module_filepath(type))
 
           file selinux_module_filepath(type) do
             action :delete
@@ -122,7 +122,7 @@ class Chef
       end
 
       action :install, description: "Install a compiled module into the system." do
-        raise "Module must be compiled before it can be installed, no 'pp' file found at: '#{selinux_module_filepath("pp")}'" unless ::TargetIO::File.exist?(selinux_module_filepath("pp"))
+        raise "Module must be compiled before it can be installed, no 'pp' file found at: '#{selinux_module_filepath("pp")}'" unless ::File.exist?(selinux_module_filepath("pp"))
 
         unless list_installed_modules.include? new_resource.module_name
           converge_by "Install SELinux module #{selinux_module_filepath("pp")}" do
@@ -140,4 +140,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/resource/selinux_permissive.rb

@@ -18,7 +18,7 @@ class Chef
     class SelinuxPermissive < Chef::Resource
       unified_mode true
 
-      provides :selinux_permissive, target_mode: true
+      provides :selinux_permissive
 
       description "Use the **selinux_permissive** resource to allow some domains to misbehave without stopping them. This is not as good as setting specific policies, but better than disabling SELinux entirely."
       introduced "18.0"
@@ -61,4 +61,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/resource/selinux_port.rb

@@ -19,7 +19,7 @@ class Chef
     class SelinuxPort < Chef::Resource
       unified_mode true
 
-      provides :selinux_port, target_mode: true
+      provides :selinux_port
 
       description "Use the **selinux_port** resource to assign a network port to a specific SELinux context. For example, running a web server on a non-standard port."
       introduced "18.0"
@@ -115,4 +115,4 @@ class Chef
 
     end
   end
-end
+end

data/lib/chef/resource/selinux_state.rb

@@ -19,7 +19,7 @@ class Chef
     class SelinuxState < Chef::Resource
       unified_mode true
 
-      provides :selinux_state, target_mode: true
+      provides :selinux_state
 
       description "Use **selinux_state** resource to manages the SELinux state on the system. It does this by using the `setenforce` command and rendering the `/etc/selinux/config` file from a template."
       introduced "18.0"
@@ -163,4 +163,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/resource/selinux_user.rb

@@ -19,7 +19,7 @@ class Chef
     class SelinuxUser < Chef::Resource
       unified_mode true
 
-      provides :selinux_user, target_mode: true
+      provides :selinux_user
 
       description "Use the **selinux_user** resource to add, update, or remove SELinux users."
       introduced "18.1"

data/lib/chef/resource/smartos_package.rb

@@ -22,8 +22,8 @@ class Chef
   class Resource
     class SmartosPackage < Chef::Resource::Package
 
-      provides :smartos_package, target_mode: true
-      provides :package, platform_family: "smartos", target_mode: true
+      provides :smartos_package
+      provides :package, platform_family: "smartos"
 
       description "Use the **smartos_package** resource to manage packages for the SmartOS platform."
 

data/lib/chef/resource/snap_package.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class SnapPackage < Chef::Resource::Package
 
-      provides :snap_package, target_mode: true
+      provides :snap_package
 
       description "Use the **snap_package** resource to manage snap packages on Debian and Ubuntu platforms."
       introduced "15.0"

data/lib/chef/resource/solaris_package.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class SolarisPackage < Chef::Resource::Package
 
-      provides :solaris_package, target_mode: true
+      provides :solaris_package
 
       description "Use the **solaris_package** resource to manage packages on the Solaris platform."
 

data/lib/chef/resource/ssh_known_hosts_entry.rb

@@ -24,7 +24,7 @@ class Chef
   class Resource
     class SshKnownHostsEntry < Chef::Resource
 
-      provides :ssh_known_hosts_entry, target_mode: true
+      provides :ssh_known_hosts_entry
 
       description "Use the **ssh_known_hosts_entry** resource to add an entry for the specified host in /etc/ssh/ssh_known_hosts or a user's known hosts file if specified."
       introduced "14.3"

data/lib/chef/resource/sudo.rb

@@ -25,7 +25,7 @@ class Chef
   class Resource
     class Sudo < Chef::Resource
 
-      provides(:sudo, target_mode: true) { true }
+      provides(:sudo) { true }
 
       description "Use the **sudo** resource to add or remove individual sudo entries using sudoers.d files."\
                   " Sudo version 1.7.2 or newer is required to use the sudo resource, as it relies on the"\
@@ -216,11 +216,11 @@ class Chef
         target = "#{new_resource.config_prefix}/sudoers.d/"
         directory(target)
 
-        Chef::Log.warn("#{new_resource.filename} will be rendered, but will not take effect because the #{new_resource.config_prefix}/sudoers config lacks the includedir directive that loads configs from #{new_resource.config_prefix}/sudoers.d/!") if ::TargetIO::File.readlines("#{new_resource.config_prefix}/sudoers").grep(/includedir/).empty?
+        Chef::Log.warn("#{new_resource.filename} will be rendered, but will not take effect because the #{new_resource.config_prefix}/sudoers config lacks the includedir directive that loads configs from #{new_resource.config_prefix}/sudoers.d/!") if ::File.readlines("#{new_resource.config_prefix}/sudoers").grep(/includedir/).empty?
         file_path = "#{target}#{new_resource.filename}"
 
         if new_resource.template
-          Chef::Log.trace("Template property provided, all other properties ignored.")
+          logger.trace("Template property provided, all other properties ignored.")
 
           template file_path do
             source new_resource.template
@@ -279,13 +279,13 @@ class Chef
         end
 
         def visudo_present?
-          return true if ::TargetIO::File.exist?(new_resource.visudo_binary)
+          return true if ::File.exist?(new_resource.visudo_binary)
 
           Chef::Log.warn("The visudo binary cannot be found at '#{new_resource.visudo_binary}'. Skipping sudoer file validation. If visudo is on this system you can specify the path using the 'visudo_binary' property.")
         end
 
         def visudo_content(path)
-          if ::TargetIO::File.exist?(path)
+          if ::File.exist?(path)
             "cat #{new_resource.config_prefix}/sudoers | #{new_resource.visudo_binary} -cf - && #{new_resource.visudo_binary} -cf %{path}"
           else
             "cat #{new_resource.config_prefix}/sudoers %{path} | #{new_resource.visudo_binary} -cf -"

data/lib/chef/resource/support/client.erb

@@ -16,12 +16,13 @@
       @policy_group
       @policy_name
       @rubygems_url
-      @ssl_verify_mode
-      @policy_persist_run_list).each do |prop| -%>
+      @ssl_verify_mode).each do |prop| -%>
 <% next if instance_variable_get(prop).nil? || instance_variable_get(prop).empty? -%>
 <%=prop.delete_prefix("@") %> <%= instance_variable_get(prop).inspect %>
 <% end -%>
+<%# boolean properties are neither .nil? nor respond to .empty? so they are included below %>
 minimal_ohai <%= @minimal_ohai.inspect %>
+policy_persist_run_list <%= @policy_persist_run_list.inspect %>
 <%# ohai_disabled_plugins and ohai_optional_plugins properties don't match the config value perfectly-%>
 <% %w(@ohai_disabled_plugins
       @ohai_optional_plugins).each do |prop| -%>

data/lib/chef/resource/swap_file.rb

@@ -21,7 +21,7 @@ class Chef
   class Resource
     class SwapFile < Chef::Resource
 
-      provides(:swap_file, target_mode: true) { true }
+      provides(:swap_file) { true }
 
       description "Use the **swap_file** resource to create or delete swap files on Linux systems, and optionally to manage the swappiness configuration for a host."
       introduced "14.0"
@@ -84,7 +84,7 @@ class Chef
 
       action :remove, description: "Remove a swapfile and disable swap." do
         swapoff if swap_enabled?
-        remove_swapfile if ::TargetIO::File.exist?(new_resource.path)
+        remove_swapfile if ::File.exist?(new_resource.path)
       end
 
       action_class do
@@ -129,7 +129,7 @@ class Chef
 
         def remove_swapfile
           converge_by "remove swap file #{new_resource.path}" do
-            ::TargetIO::FileUtils.rm(new_resource.path)
+            ::FileUtils.rm(new_resource.path)
           end
         end
 
@@ -186,7 +186,7 @@ class Chef
         def compatible_kernel
           fallocate_location = shell_out("which fallocate").stdout
           Chef::Log.debug("#{new_resource} fallocate location is '#{fallocate_location}'")
-          ::TargetIO::File.exist?(fallocate_location.chomp)
+          ::File.exist?(fallocate_location.chomp)
         end
 
         def compatible_filesystem?
@@ -205,7 +205,7 @@ class Chef
 
         def persist
           fstab = "/etc/fstab"
-          contents = ::TargetIO::File.readlines(fstab)
+          contents = ::File.readlines(fstab)
           addition = "#{new_resource.path} swap swap defaults 0 0"
 
           if contents.any? { |line| line.strip == addition }
@@ -214,7 +214,7 @@ class Chef
             Chef::Log.info("#{new_resource} adding entry to #{fstab} for #{new_resource.path}")
 
             contents << "#{addition}\n"
-            ::TargetIO::File.open(fstab, "w") { |f| f.write(contents.join("")) }
+            ::File.open(fstab, "w") { |f| f.write(contents.join("")) }
           end
         end
       end

data/lib/chef/resource/sysctl.rb

@@ -21,8 +21,8 @@ class Chef
   class Resource
     class Sysctl < Chef::Resource
 
-      provides(:sysctl, target_mode: true) { true }
-      provides(:sysctl_param, target_mode: true) { true }
+      provides(:sysctl) { true }
+      provides(:sysctl_param) { true }
 
       description "Use the **sysctl** resource to set or remove kernel parameters using the `sysctl` command line tool and configuration files in the system's `sysctl.d` directory. Configuration files managed by this resource are named `99-chef-KEYNAME.conf`."
       examples <<~DOC
@@ -152,7 +152,7 @@ class Chef
 
       action :remove, description: "Remove the kernel parameter and update the `sysctl` settings." do
         # only converge the resource if the file actually exists to delete
-        if ::TargetIO::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf")
+        if ::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf")
           converge_by "removing sysctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf" do
             file "#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf" do
               action :delete
@@ -216,9 +216,9 @@ class Chef
       # return the value. Raise in case this conf file needs to be created
       # or updated
       def get_sysctld_value(key)
-        raise unless ::TargetIO::File.exist?("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf")
+        raise unless ::File.exist?("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf")
 
-        k, v = ::Target_IO::File.read("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf").match(/(.*) = (.*)/).captures
+        k, v = ::File.read("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf").match(/(.*) = (.*)/).captures
         raise "Unknown sysctl key!" if k.nil?
         raise "Unknown sysctl value!" if v.nil?
 

data/lib/chef/resource/systemd_unit.rb

@@ -24,7 +24,7 @@ class Chef
   class Resource
     class SystemdUnit < Chef::Resource
 
-      provides(:systemd_unit, target_mode: true) { true }
+      provides(:systemd_unit) { true }
 
       description "Use the **systemd_unit** resource to create, manage, and run [systemd units](https://www.freedesktop.org/software/systemd/man/systemd.html#Concepts)."
       introduced "12.11"

data/lib/chef/resource/template.rb

@@ -35,7 +35,7 @@ class Chef
     # template resource follow the same file specificity rules as the remote_file and file resources.
     class Template < Chef::Resource::File
 
-      provides :template, target_mode: true
+      provides :template
 
       include Chef::Mixin::Securable
 

data/lib/chef/resource/timezone.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class Timezone < Chef::Resource
 
-      provides :timezone, target_mode: true
+      provides :timezone
 
       description "Use the **timezone** resource to change the system timezone on Windows, Linux, and macOS hosts. Timezones are specified in tz database format, with a complete list of available TZ values for Linux and macOS here: <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>. On Windows systems run `tzutil /l` for a complete list of valid timezones."
       introduced "14.6"
@@ -96,10 +96,10 @@ class Chef
       # @since 16.5
       # @return [String] timezone id
       def current_rhel_tz
-        return nil unless ::TargetIO::File.exist?("/etc/sysconfig/clock")
+        return nil unless ::File.exist?("/etc/sysconfig/clock")
 
         # https://rubular.com/r/aoj01L3bKBM7wh
-        /ZONE="(.*)"/.match(::TargetIO::File.read("/etc/sysconfig/clock"))[1]
+        /ZONE="(.*)"/.match(::File.read("/etc/sysconfig/clock"))[1]
       end
 
       load_current_value do
@@ -155,13 +155,13 @@ class Chef
                 execute "tzdata-update" do
                   command "/usr/sbin/tzdata-update"
                   action :nothing
-                  only_if { ::TargetIO::File.executable?("/usr/sbin/tzdata-update") }
+                  only_if { ::File.executable?("/usr/sbin/tzdata-update") }
                   subscribes :run, "file[/etc/sysconfig/clock]", :immediately
                 end
 
                 link "/etc/localtime" do
                   to "/usr/share/zoneinfo/#{new_resource.timezone}"
-                  not_if { ::TargetIO::File.executable?("/usr/sbin/tzdata-update") }
+                  not_if { ::File.executable?("/usr/sbin/tzdata-update") }
                 end
               when "mac_os_x"
                 shell_out!(["sudo", "systemsetup", "-settimezone", new_resource.timezone])

data/lib/chef/resource/user/aix_user.rb

@@ -22,8 +22,8 @@ class Chef
     class User
       class AixUser < Chef::Resource::User
 
-        provides :aix_user, target_mode: true
-        provides :user, os: "aix", target_mode: true
+        provides :aix_user
+        provides :user, os: "aix"
       end
     end
   end

data/lib/chef/resource/user/linux_user.rb

@@ -22,8 +22,8 @@ class Chef
     class User
       class LinuxUser < Chef::Resource::User
 
-        provides :linux_user, target_mode: true
-        provides :user, os: "linux", target_mode: true
+        provides :linux_user
+        provides :user, os: "linux"
 
       end
     end

data/lib/chef/resource/user/pw_user.rb

@@ -22,8 +22,8 @@ class Chef
     class User
       class PwUser < Chef::Resource::User
 
-        provides :pw_user, target_mode: true
-        provides :user, os: "freebsd", target_mode: true
+        provides :pw_user
+        provides :user, os: "freebsd"
       end
     end
   end

data/lib/chef/resource/user/solaris_user.rb

@@ -22,8 +22,8 @@ class Chef
     class User
       class SolarisUser < Chef::Resource::User
 
-        provides :solaris_user, target_mode: true
-        provides :user, os: %w{omnios solaris2}, target_mode: true
+        provides :solaris_user
+        provides :user, os: %w{omnios solaris2}
       end
     end
   end

data/lib/chef/resource/user_ulimit.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class UserUlimit < Chef::Resource
 
-      provides :user_ulimit, target_mode: true
+      provides :user_ulimit
 
       description "Use the **user_ulimit** resource to create individual ulimit files that are installed into the `/etc/security/limits.d/` directory."
       introduced "16.0"

data/lib/chef/resource/yum_repository.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class YumRepository < Chef::Resource
 
-      provides(:yum_repository, target_mode: true) { true }
+      provides(:yum_repository) { true }
 
       description "Use the **yum_repository** resource to manage a Yum repository configuration file located at `/etc/yum.repos.d/repositoryid.repo` on the local machine. This configuration file specifies which repositories to reference, how to handle cached data, etc."
       introduced "12.14"

data/lib/chef/resource/zypper_package.rb

@@ -22,8 +22,8 @@ class Chef
   class Resource
     class ZypperPackage < Chef::Resource::Package
 
-      provides :zypper_package, target_mode: true
-      provides :package, platform_family: "suse", target_mode: true
+      provides :zypper_package
+      provides :package, platform_family: "suse"
 
       description "Use the **zypper_package** resource to install, upgrade, and remove packages with Zypper for the SUSE Enterprise and openSUSE platforms."
       examples <<~DOC

data/lib/chef/resource/zypper_repository.rb

@@ -22,8 +22,8 @@ class Chef
   class Resource
     class ZypperRepository < Chef::Resource
 
-      provides(:zypper_repository, target_mode: true) { true }
-      provides(:zypper_repo, target_mode: true) { true } # legacy cookbook compatibility
+      provides(:zypper_repository) { true }
+      provides(:zypper_repo) { true } # legacy cookbook compatibility
 
       description "Use the **zypper_repository** resource to create Zypper package repositories on SUSE Enterprise Linux and openSUSE systems. This resource maintains full compatibility with the **zypper_repository** resource in the existing **zypper** cookbook."
       introduced "13.3"

data/lib/chef/resource.rb

@@ -620,6 +620,7 @@ class Chef
       # Reporting endpoint doesn't accept a negative resource duration so set it to 0.
       # A negative value can occur when a resource changes the system time backwards
       @elapsed_time = 0 if @elapsed_time < 0
+
       events.resource_completed(self)
     end
 

data/lib/chef/resource_inspector.rb

@@ -79,19 +79,37 @@ class Chef
       Array(equal_to).map(&:inspect)
     end
 
+    def self.load_from_resources(resources, complete)
+      resources.each_with_object({}) do |r, res|
+        pth = r["full_path"]
+        # Here we do some magic to extract resources from files where there are multiple resources
+        # in a file - to do this, we load the file, and take the delta of which resources
+        # exist in object space
+        existing_classes = []
+        ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each { |klass| existing_classes << klass }
+        # Load the set of resources from this file
+        Chef::Resource::LWRPBase.build_from_file(name, pth, Chef::RunContext.new(Chef::Node.new, nil, nil))
+        # Finally, process every new class added to the object space by that
+        ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each do |klass|
+          unless existing_classes.include?(klass)
+            # Skip over anything which creates resources that start with exactly this - that happens
+            # because if there is no non-classed resource in here, LWRPBase.build_from_file builds a
+            # dummy object from it - we don't need that polluting out output!
+            next if klass.resource_name.start_with?("Chef__ResourceInspector")
+
+            res[klass.resource_name] = extract_resource(klass, complete)
+          end
+        end
+      end
+    end
+
     def self.extract_cookbook(path, complete)
       path = File.expand_path(path)
       dir, name = File.split(path)
       Chef::Cookbook::FileVendor.fetch_from_disk(path)
       loader = Chef::CookbookLoader.new(dir)
       cookbook = loader.load_cookbook(name)
-      resources = cookbook.files_for(:resources)
-
-      resources.each_with_object({}) do |r, res|
-        pth = r["full_path"]
-        cur = Chef::Resource::LWRPBase.build_from_file(name, pth, Chef::RunContext.new(Chef::Node.new, nil, nil))
-        res[cur.resource_name] = extract_resource(cur, complete)
-      end
+      load_from_resources(cookbook.files_for(:resources), complete)
     end
 
     # If we're given no resources, dump all of Chef's built ins

data/lib/chef/resource_reporter.rb

@@ -190,6 +190,7 @@ class Chef
     def prepare_run_data
       run_data = {}
       run_data["action"] = "end"
+
       run_data["resources"] = updated_resources.map do |action_record|
         for_json(action_record)
       end