chef 18.5.0 → 18.7.3

data/lib/chef/provider/mount/mount.rb

@@ -42,9 +42,9 @@ class Chef
 
         def mountable?
           # only check for existence of non-remote devices
-          if device_should_exist? && !::TargetIO::File.exist?(device_real)
+          if device_should_exist? && !::File.exist?(device_real)
             raise Chef::Exceptions::Mount, "Device #{@new_resource.device} does not exist"
-          elsif @new_resource.mount_point != "none" && !::TargetIO::File.exist?(@new_resource.mount_point)
+          elsif @new_resource.mount_point != "none" && !::File.exist?(@new_resource.mount_point)
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"
           end
 
@@ -54,11 +54,11 @@ class Chef
         def enabled?
           # Check to see if there is a entry in /etc/fstab. Last entry for a volume wins.
           enabled = false
-          unless ::TargetIO::File.exist?("/etc/fstab")
+          unless ::File.exist?("/etc/fstab")
             logger.debug "/etc/fstab not found, treating mount as not-enabled"
             return
           end
-          ::TargetIO::File.foreach("/etc/fstab") do |line|
+          ::File.foreach("/etc/fstab") do |line|
             case line
             when /^[#\s]/
               next
@@ -81,8 +81,8 @@ class Chef
           # "mount" outputs the mount points as real paths. Convert
           # the mount_point of the resource to a real path in case it
           # contains symlinks in its parents dirs.
-          real_mount_point = if ::TargetIO::File.exist? @new_resource.mount_point
-                               ::TargetIO::File.realpath(@new_resource.mount_point)
+          real_mount_point = if ::File.exist? @new_resource.mount_point
+                               ::File.realpath(@new_resource.mount_point)
                              else
                                @new_resource.mount_point
                              end
@@ -168,7 +168,7 @@ class Chef
             # and order will remain the same.
             edit_fstab
           else
-            ::TargetIO::File.open("/etc/fstab", "a") do |fstab|
+            ::File.open("/etc/fstab", "a") do |fstab|
               fstab.puts("#{device_fstab} #{@new_resource.mount_point} #{@new_resource.fstype} #{@new_resource.options.nil? ? default_mount_options : @new_resource.options.join(",")} #{@new_resource.dump} #{@new_resource.pass}")
               logger.trace("#{@new_resource} is enabled at #{@new_resource.mount_point}")
             end
@@ -229,12 +229,12 @@ class Chef
           if network_device?
             # ignore trailing slash
             Regexp.escape(device_real) + "/?"
-          elsif ::TargetIO::File.symlink?(device_real)
+          elsif ::File.symlink?(device_real)
             # This regular expression tries to match device_real. If that does not match it will try to match the target of device_real.
             # So given a symlink like this:
             # /dev/mapper/vgroot-tmp.vol -> /dev/dm-9
             # First it will try to match "/dev/mapper/vgroot-tmp.vol". If there is no match it will try matching for "/dev/dm-9".
-            "(?:#{Regexp.escape(device_real)}|#{Regexp.escape(::File.expand_path(::TargetIO::File.readlink(device_real), ::File.dirname(device_real)))})"
+            "(?:#{Regexp.escape(device_real)}|#{Regexp.escape(::File.expand_path(::File.readlink(device_real), ::File.dirname(device_real)))})"
           else
             Regexp.escape(device_real)
           end
@@ -261,7 +261,7 @@ class Chef
             contents = []
 
             found = false
-            ::TargetIO::File.readlines("/etc/fstab").reverse_each do |line|
+            ::File.readlines("/etc/fstab").reverse_each do |line|
               if !found && line =~ /^#{device_fstab_regex}\s+#{Regexp.escape(@new_resource.mount_point)}\s/
                 found = true
                 if remove
@@ -276,7 +276,7 @@ class Chef
               end
             end
 
-            ::TargetIO::File.open("/etc/fstab", "w") do |fstab|
+            ::File.open("/etc/fstab", "w") do |fstab|
               contents.reverse_each { |line| fstab.puts line }
             end
           else

data/lib/chef/provider/package/apt.rb

@@ -124,6 +124,11 @@ class Chef
 
         private
 
+        # @return [String] package name with or without anchors attached to it.
+        def resolve_package(pkg)
+          new_resource.anchor_package_regex ? "^#{pkg}$" : pkg
+        end
+
         # @return [String] version of apt-get which is installed
         def apt_version
           @apt_version ||= shell_out("apt-get --version").stdout.match(/^apt (\S+)/)[1]
@@ -174,10 +179,12 @@ class Chef
         end
 
         def resolve_package_versions(pkg)
+          # apt-cache considers package names as regex by default. The anchor_package_regex flag will decide whether to match name exact string or not
+          pkg_name = resolve_package(pkg)
           current_version = nil
           candidate_version = nil
           all_versions = []
-          run_noninteractive("apt-cache", default_release_options, "policy", pkg).stdout.each_line do |line|
+          run_noninteractive("apt-cache", default_release_options, "policy", pkg_name).stdout.each_line do |line|
             case line
             when /^\s{2}Installed: (.+)$/
               current_version = ( $1 != "(none)" ) ? $1 : nil
@@ -216,7 +223,9 @@ class Chef
         end
 
         def resolve_virtual_package_name(pkg)
-          showpkg = run_noninteractive("apt-cache", "showpkg", pkg).stdout
+          # apt-cache considers package names as regex by default. The anchor_package_regex flag will decide whether to match name exact string or not
+          pkg_name = resolve_package(pkg)
+          showpkg = run_noninteractive("apt-cache", "showpkg", pkg_name).stdout
           partitions = showpkg.rpartition(/Reverse Provides: ?#{$/}/)
           return nil if partitions[0] == "" && partitions[1] == "" # not found in output
 

data/lib/chef/provider/package/bff.rb

@@ -25,8 +25,8 @@ class Chef
     class Package
       class Bff < Chef::Provider::Package
 
-        provides :package, os: "aix", target_mode: true
-        provides :bff_package, target_mode: true
+        provides :package, os: "aix"
+        provides :bff_package
 
         include Chef::Mixin::GetSourceFromPackage
 
@@ -134,7 +134,7 @@ class Chef
         end
 
         def package_source_found?
-          @package_source_found ||= new_resource.source && ::TargetIO::File.exist?(new_resource.source)
+          @package_source_found ||= new_resource.source && ::File.exist?(new_resource.source)
         end
 
       end

data/lib/chef/provider/package/chocolatey.rb

@@ -153,7 +153,7 @@ class Chef
 
         # Choco V2 uses 'Search' for remote repositories and 'List' for local packages
         def query_command
-          return "list" if get_choco_version.match?(/^1/)
+          return "list" if Gem::Dependency.new("", "< 1.4.0").match?("", get_choco_version)
 
           "search"
         end
@@ -240,7 +240,7 @@ class Chef
           @choco_exe ||= begin
               # if this check is in #define_resource_requirements, it won't get
               # run before choco.exe gets called from #load_current_resource.
-              exe_path = ::File.join(choco_install_path, "bin", "choco.exe")
+              exe_path = ::File.join(choco_install_path, "choco.exe")
               raise Chef::Exceptions::MissingLibrary, CHOCO_MISSING_MSG unless ::File.exist?(exe_path)
 
               exe_path

data/lib/chef/provider/package/dnf/dnf_helper.py

@@ -92,6 +92,13 @@ def query(command):
     q = subj.get_best_query(sack, with_provides=True)
 
     if command['action'] == "whatinstalled":
+        # When attempting to figure out what is installed, we should ignore any
+        # excludes that are configured, otherwise the "best" query for a given
+        # subject may refer to a package that is installed that provides that
+        # subject, but we really want to know if a package by that name exists
+        # in any available repository
+        q = subj.get_best_query(sack, with_provides=True, query=sack.query(flags=hawkey.IGNORE_EXCLUDES))
+
         q = q.installed()
 
     if command['action'] == "whatavailable":

data/lib/chef/provider/package/dpkg.rb

@@ -29,7 +29,7 @@ class Chef
         DPKG_INSTALLED = /^Status: install ok installed/.freeze
         DPKG_VERSION   = /^Version: (.+)$/.freeze
 
-        provides :dpkg_package, target_mode: true
+        provides :dpkg_package
 
         use_multipackage_api
         use_package_name_for_source
@@ -146,14 +146,14 @@ class Chef
         #
         # @return [Boolean] True if all sources exist
         def source_files_exist?
-          resolved_source_array.all? { |s| s && ::TargetIO::File.exist?(s) }
+          resolved_source_array.all? { |s| s && ::File.exist?(s) }
         end
 
         # Helper to return all the names of the missing sources for error messages.
         #
         # @return [Array<String>] Array of missing sources
         def missing_sources
-          resolved_source_array.select { |s| s.nil? || !::TargetIO::File.exist?(s) }
+          resolved_source_array.select { |s| s.nil? || !::File.exist?(s) }
         end
 
         def current_package_name_array

data/lib/chef/provider/package/freebsd/base.rb

@@ -30,7 +30,7 @@ class Chef
 
         module PortsHelper
           def supports_ports?
-            ::TargetIO::File.exist?("/usr/ports/Makefile")
+            ::File.exist?("/usr/ports/Makefile")
           end
 
           def port_dir(port)

data/lib/chef/provider/package/habitat.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require_relative "../../http/simple"
 require_relative "../../json_compat"
 require_relative "../../exceptions"
 require_relative "../package"
@@ -26,7 +27,7 @@ class Chef
       class Habitat < Chef::Provider::Package
         use_multipackage_api
         use "../../resource/habitat/habitat_shared"
-        provides :habitat_package, target_mode: true
+        provides :habitat_package
 
         def load_current_resource
           @current_resource = Chef::Resource::HabitatPackage.new(new_resource.name)
@@ -39,9 +40,6 @@ class Chef
         end
 
         def install_package(names, versions)
-          # License acceptance needed outside of local Chef Client
-          shell_out!("hab license accept") if Chef::Config.target_mode?
-
           names.zip(versions).map do |n, v|
             opts = ["pkg", "install", "--channel", new_resource.channel, "--url", new_resource.bldr_url]
             opts += ["--auth", new_resource.auth_token] if new_resource.auth_token
@@ -122,7 +120,7 @@ class Chef
 
         def http
           # FIXME: use SimpleJSON when the depot mime-type is fixed
-          @http ||= TargetIO::HTTP.new(new_resource.bldr_url.to_s)
+          @http ||= Chef::HTTP::Simple.new(new_resource.bldr_url.to_s)
         end
 
         def candidate_versions

data/lib/chef/provider/package/homebrew.rb

@@ -18,7 +18,7 @@
 #
 
 require "etc" unless defined?(Etc)
-require_relative "../../mixin/homebrew_user"
+require_relative "../../mixin/homebrew"
 
 class Chef
   class Provider
@@ -30,7 +30,7 @@ class Chef
         provides :package, os: "darwin"
         provides :homebrew_package
 
-        include Chef::Mixin::HomebrewUser
+        include Chef::Mixin::Homebrew
 
         def load_current_resource
           @current_resource = Chef::Resource::HomebrewPackage.new(new_resource.name)
@@ -63,9 +63,8 @@ class Chef
         # and which packages can be upgrades. We do this by checking if brew_info has an entry
         # via the installed_version helper.
         def upgrade_package(names, versions)
-          # @todo when we no longer support Ruby 2.6 this can be simplified to be a .filter_map
-          upgrade_pkgs = names.select { |x| x if installed_version(x) }.compact
-          install_pkgs = names.select { |x| x unless installed_version(x) }.compact
+          upgrade_pkgs = names.filter_map { |x| x if installed_version(x) }
+          install_pkgs = names.filter_map { |x| x unless installed_version(x) }
 
           brew_cmd_output("upgrade", options, upgrade_pkgs) unless upgrade_pkgs.empty?
           brew_cmd_output("install", options, install_pkgs) unless install_pkgs.empty?
@@ -182,7 +181,7 @@ class Chef
           homebrew_uid = find_homebrew_uid(new_resource.respond_to?(:homebrew_user) && new_resource.homebrew_user)
           homebrew_user = Etc.getpwuid(homebrew_uid)
 
-          logger.trace "Executing 'brew #{command.join(" ")}' as user '#{homebrew_user.name}'"
+          logger.trace "Executing '#{homebrew_bin_path} #{command.join(" ")}' as user '#{homebrew_user.name}'"
 
           # allow the calling method to decide if the cmd should raise or not
           # brew_info uses this when querying out available package info since a bad
@@ -190,11 +189,9 @@ class Chef
           # the package provider can magically handle that
           shell_out_cmd = options[:allow_failure] ? :shell_out : :shell_out!
 
-          # FIXME: this 1800 second default timeout should be deprecated
-          output = send(shell_out_cmd, "brew", *command, timeout: 1800, user: homebrew_uid, environment: { "HOME" => homebrew_user.dir, "RUBYOPT" => nil, "TMPDIR" => nil })
+          output = send(shell_out_cmd, homebrew_bin_path, *command, user: homebrew_uid, login: true, environment: { "HOME" => homebrew_user.dir, "RUBYOPT" => nil, "TMPDIR" => nil })
           output.stdout.chomp
         end
-
       end
     end
   end

data/lib/chef/provider/package/ips.rb

@@ -26,8 +26,8 @@ class Chef
     class Package
       class Ips < Chef::Provider::Package
 
-        provides :package, platform: %w{openindiana omnios solaris2}, target_mode: true
-        provides :ips_package, target_mode: true
+        provides :package, platform: %w{openindiana omnios solaris2}
+        provides :ips_package
 
         attr_accessor :virtual
 

data/lib/chef/provider/package/openbsd.rb

@@ -30,8 +30,8 @@ class Chef
     class Package
       class Openbsd < Chef::Provider::Package
 
-        provides :package, os: "openbsd", target_mode: true
-        provides :openbsd_package, target_mode: true
+        provides :package, os: "openbsd"
+        provides :openbsd_package
 
         include Chef::Mixin::ShellOut
         include Chef::Mixin::GetSourceFromPackage
@@ -129,7 +129,6 @@ class Chef
           end
         end
 
-        # Target Mode limitation: ENV["PKG_PATH"] cannot be evaluated, as remote commands are not run in a standard shell
         def pkg_path
           ENV["PKG_PATH"] || "http://ftp.OpenBSD.org/pub/#{node["kernel"]["name"]}/#{node["kernel"]["release"]}/packages/#{node["kernel"]["machine"]}/"
         end

data/lib/chef/provider/package/pacman.rb

@@ -24,8 +24,8 @@ class Chef
     class Package
       class Pacman < Chef::Provider::Package
 
-        provides :package, platform: "arch", target_mode: true
-        provides :pacman_package, target_mode: true
+        provides :package, platform: "arch"
+        provides :pacman_package
 
         use_multipackage_api
         allow_nils
@@ -37,8 +37,8 @@ class Chef
 
           repos = %w{extra core community}
 
-          if ::TargetIO::File.exist?("/etc/pacman.conf")
-            pacman = ::TargetIO::File.read("/etc/pacman.conf")
+          if ::File.exist?("/etc/pacman.conf")
+            pacman = ::File.read("/etc/pacman.conf")
             repos = pacman.scan(/\[(.+)\]/).flatten
           end
 

data/lib/chef/provider/package/paludis.rb

@@ -24,8 +24,8 @@ class Chef
     class Package
       class Paludis < Chef::Provider::Package
 
-        provides :package, platform: "exherbo", target_mode: true
-        provides :paludis_package, target_mode: true
+        provides :package, platform: "exherbo"
+        provides :paludis_package
 
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(new_resource.package_name)

data/lib/chef/provider/package/portage.rb

@@ -38,7 +38,7 @@ class Chef
 
           globsafe_category = category ? Chef::Util::PathHelper.escape_glob_dir(category) : nil
           globsafe_pkg = Chef::Util::PathHelper.escape_glob_dir(pkg)
-          possibilities = TargetIO::Dir["/var/db/pkg/#{globsafe_category || "*"}/#{globsafe_pkg}-*"].map { |d| d.sub(%r{/var/db/pkg/}, "") }
+          possibilities = Dir["/var/db/pkg/#{globsafe_category || "*"}/#{globsafe_pkg}-*"].map { |d| d.sub(%r{/var/db/pkg/}, "") }
           versions = possibilities.map do |entry|
             if entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*[a-z]?((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)}
               [$&, $1]

data/lib/chef/provider/package/rpm.rb

@@ -24,7 +24,7 @@ class Chef
   class Provider
     class Package
       class Rpm < Chef::Provider::Package
-        provides :rpm_package, target_mode: true
+        provides :rpm_package
 
         include Chef::Mixin::GetSourceFromPackage
 
@@ -51,7 +51,7 @@ class Chef
           current_resource.package_name(new_resource.package_name)
 
           if new_resource.source
-            unless uri_scheme?(new_resource.source) || ::TargetIO::File.exist?(new_resource.source)
+            unless uri_scheme?(new_resource.source) || ::File.exist?(new_resource.source)
               @package_source_exists = false
               return
             end

data/lib/chef/provider/package/rubygems.rb

@@ -136,6 +136,10 @@ class Chef
             if defined?(Gem::Format) && Gem::Package.respond_to?(:open)
               Gem::Format.from_file_by_path(file).spec
             else
+              # Gem::Package is getting defined as an empty class as of bundler 2.5.23
+              # and therefore won't autoload
+              # ["bundler-2.5.23/lib/bundler/rubygems_ext.rb", 457]
+              require "rubygems/package" if Gem::Package.method(:new).source_location.nil?
               Gem::Package.new(file).spec
             end
           end

data/lib/chef/provider/package/smartos.rb

@@ -29,8 +29,8 @@ class Chef
       class SmartOS < Chef::Provider::Package
         attr_accessor :is_virtual_package
 
-        provides :package, platform: "smartos", target_mode: true
-        provides :smartos_package, target_mode: true
+        provides :package, platform: "smartos"
+        provides :smartos_package
 
         def load_current_resource
           logger.trace("#{new_resource} loading current resource")

data/lib/chef/provider/package/snap.rb

@@ -223,7 +223,7 @@ class Chef
             when "Do", "Doing", "Undoing", "Undo"
               # Continue
             when "Abort", "Hold", "Error"
-              raise result
+              raise "#{result["result"]["summary"]} - #{result["result"]["status"]} - #{result["result"]["err"]}"
             when "Done"
               waiting = false
             else
@@ -330,7 +330,7 @@ class Chef
         def generate_snap_json(snap_names, action, channel, options, revision = nil)
           request = {
               "action" => action,
-              "snaps" => Array(snap_names),
+              "snaps" => snap_names,
           }
           if %w{install refresh switch}.include?(action) && channel
             request["channel"] = channel

data/lib/chef/provider/package/solaris.rb

@@ -26,7 +26,7 @@ class Chef
 
         include Chef::Mixin::GetSourceFromPackage
 
-        provides :solaris_package, target_mode: true
+        provides :solaris_package
 
         # def initialize(*args)
         #   super
@@ -50,7 +50,7 @@ class Chef
           current_resource.package_name(new_resource.package_name)
 
           if new_resource.source
-            @package_source_found = ::TargetIO::File.exist?(new_resource.source)
+            @package_source_found = ::File.exist?(new_resource.source)
             if @package_source_found
               logger.trace("#{new_resource} checking pkg status")
               shell_out("pkginfo", "-l", "-d", new_resource.source, new_resource.package_name).stdout.each_line do |line|
@@ -101,7 +101,7 @@ class Chef
         def install_package(name, version)
           logger.trace("#{new_resource} package install options: #{options}")
           if options.nil?
-            command = if ::TargetIO::File.directory?(new_resource.source) # CHEF-4469
+            command = if ::File.directory?(new_resource.source) # CHEF-4469
                         [ "pkgadd", "-n", "-d", new_resource.source, new_resource.package_name ]
                       else
                         [ "pkgadd", "-n", "-d", new_resource.source, "all" ]
@@ -109,7 +109,7 @@ class Chef
             shell_out!(command)
             logger.trace("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
           else
-            command = if ::TargetIO::File.directory?(new_resource.source) # CHEF-4469
+            command = if ::File.directory?(new_resource.source) # CHEF-4469
                         [ "pkgadd", "-n", options, "-d", new_resource.source, new_resource.package_name ]
                       else
                         [ "pkgadd", "-n", options, "-d", new_resource.source, "all" ]

data/lib/chef/provider/package/zypper.rb

@@ -30,8 +30,8 @@ class Chef
         use_package_name_for_source
         allow_nils
 
-        provides :package, platform_family: "suse", target_mode: true
-        provides :zypper_package, target_mode: true
+        provides :package, platform_family: "suse"
+        provides :zypper_package
 
         def define_resource_requirements
           super
@@ -91,7 +91,7 @@ class Chef
         # @return [Boolean] True if all sources exist
         def source_files_exist?
           if !new_resource.source.nil?
-            resolved_source_array.all? { |s| s && ::TargetIO::File.exist?(s) }
+            resolved_source_array.all? { |s| s && ::File.exist?(s) }
           else
             true
           end
@@ -100,7 +100,7 @@ class Chef
         # Helper to return all the names of the missing sources for error messages.
         # @return [Array<String>] Array of missing sources
         def missing_sources
-          resolved_source_array.select { |s| s.nil? || !::TargetIO::File.exist?(s) }
+          resolved_source_array.select { |s| s.nil? || !::File.exist?(s) }
         end
 
         def resolve_source_to_version

data/lib/chef/provider/package.rb

@@ -648,7 +648,7 @@ class Chef
           source_array.each_with_index.map do |source, i|
             package_name = package_name_array[i]
             # we require at least one '/' in the package_name to avoid [XXX_]package 'foo' breaking due to a random 'foo' file in cwd
-            if use_package_name_for_source? && source.nil? && package_name.match(/#{::File::SEPARATOR}/) && ::TargetIO::File.exist?(package_name)
+            if use_package_name_for_source? && source.nil? && package_name.match(/#{::File::SEPARATOR}/) && ::File.exist?(package_name)
               logger.trace("No package source specified, but #{package_name} exists on filesystem, using #{package_name} as source.")
               package_name
             else

data/lib/chef/provider/registry_key.rb

@@ -51,9 +51,14 @@ class Chef
         current_resource.recursive(new_resource.recursive)
         if registry.key_exists?(new_resource.key)
           current_registry_values = registry.get_values(new_resource.key) || []
+
+          if new_resource.only_record_changes
+            current_registry_values.select! { |v| new_resource.values.any? { |nv| nv[:name] == v[:name] } }
+          end
           current_resource.values(current_registry_values)
         end
         values_to_hash(current_resource.unscrubbed_values)
+
         current_resource
       end
 
@@ -122,6 +127,7 @@ class Chef
             registry.create_key(new_resource.key, new_resource.recursive)
           end
         end
+
         new_resource.unscrubbed_values.each do |value|
           if @name_hash.key?(value[:name].downcase)
             current_value = @name_hash[value[:name].downcase]

data/lib/chef/provider/remote_directory.rb

@@ -32,7 +32,7 @@ class Chef
       extend Forwardable
       include Chef::Mixin::FileClass
 
-      provides :remote_directory, target_mode: true
+      provides :remote_directory
 
       def_delegators :new_resource, :purge, :path, :source, :cookbook, :cookbook_name
       def_delegators :new_resource, :files_rights, :files_mode, :files_group, :files_owner, :files_backup
@@ -100,7 +100,7 @@ class Chef
       #
       def purge_unmanaged_files
         if purge
-          TargetIO::Dir.glob(::File.join(Chef::Util::PathHelper.escape_glob_dir(path), "**", "*"), ::File::FNM_DOTMATCH).sort!.reverse!.each do |file|
+          Dir.glob(::File.join(Chef::Util::PathHelper.escape_glob_dir(path), "**", "*"), ::File::FNM_DOTMATCH).sort!.reverse!.each do |file|
             # skip '.' and '..'
             next if [".", ".."].include?(Pathname.new(file).basename.to_s)
 
@@ -110,7 +110,7 @@ class Chef
             # Skip files that we've sync'd and their parent dirs
             next if managed_files.include?(file)
 
-            if ::TargetIO::File.directory?(file)
+            if ::File.directory?(file)
               if !ChefUtils.windows? && file_class.symlink?(file.dup)
                 # Unix treats dir symlinks as files
                 purge_file(file)
@@ -188,7 +188,7 @@ class Chef
       def create_cookbook_file(cookbook_file_relative_path)
         full_path = ::File.join(path, cookbook_file_relative_path)
 
-        ensure_directory_exists(::TargetIO::File.dirname(full_path))
+        ensure_directory_exists(::File.dirname(full_path))
 
         res = cookbook_file_resource(full_path, cookbook_file_relative_path)
         res.run_action(action_for_cookbook_file)
@@ -228,7 +228,7 @@ class Chef
       #
       def ensure_directory_exists(dir)
         # doing the check here and skipping the resource should be more performant
-        unless ::TargetIO::File.directory?(dir)
+        unless ::File.directory?(dir)
           res = directory_resource(dir)
           res.run_action(:create)
           new_resource.updated_by_last_action(true) if res.updated?

data/lib/chef/provider/remote_file/http.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+require_relative "../../http/simple"
 require_relative "../../digester"
 require_relative "../remote_file"
 require_relative "cache_control_data"
@@ -61,7 +62,7 @@ class Chef
         end
 
         def fetch
-          http = TargetIO::HTTP.new(uri, http_client_opts)
+          http = Chef::HTTP::Simple.new(uri, http_client_opts)
           orig_tempfile = Chef::FileContentManagement::Tempfile.new(@new_resource).tempfile
           if want_progress?
             tempfile = http.streaming_request_with_progress(uri, headers, orig_tempfile) do |size, total|
@@ -96,7 +97,7 @@ class Chef
         end
 
         def want_progress?
-          !ChefConfig::Config.target_mode? && events.formatter? && (Chef::Config[:show_download_progress] || !!new_resource.show_progress)
+          events.formatter? && (Chef::Config[:show_download_progress] || !!new_resource.show_progress)
         end
 
         def progress_interval

data/lib/chef/provider/remote_file.rb

@@ -22,7 +22,7 @@ require_relative "file"
 class Chef
   class Provider
     class RemoteFile < Chef::Provider::File
-      provides :remote_file, target_mode: true
+      provides :remote_file
 
       def initialize(new_resource, run_context)
         @content_class = Chef::Provider::RemoteFile::Content