chef 18.5.0 → 18.7.3

data/lib/chef/provider/route.rb

@@ -25,7 +25,7 @@ class Chef
   class Provider
     class Route < Chef::Provider
 
-      provides :route, target_mode: true
+      provides :route
 
       attr_accessor :is_running
 
@@ -98,7 +98,7 @@ class Chef
         # For linux, we use /proc/net/route file to read proc table info
         return unless linux?
 
-        route_file = ::TargetIO::File.open("/proc/net/route", "r")
+        route_file = ::File.open("/proc/net/route", "r")
 
         # Read all routes
         while (line = route_file.gets)
@@ -186,24 +186,24 @@ class Chef
               network_file_name = "/etc/sysconfig/network"
               converge_by("write route default route to #{network_file_name}") do
                 logger.trace("#{new_resource} writing default route #{new_resource.gateway} to #{network_file_name}")
-                if ::TargetIO::File.exist?(network_file_name)
+                if ::File.exist?(network_file_name)
                   network_file = ::Chef::Util::FileEdit.new(network_file_name)
                   network_file.search_file_replace_line(/^GATEWAY=/, "GATEWAY=#{new_resource.gateway}")
                   network_file.insert_line_if_no_match(/^GATEWAY=/, "GATEWAY=#{new_resource.gateway}")
                   network_file.write_file
                 else
-                  ::TargetIO::File.open(network_file_name, "w") do |network_file|
-                    network_file.puts("GATEWAY=#{new_resource.gateway}")
-                  end
+                  network_file = ::File.new(network_file_name, "w")
+                  network_file.puts("GATEWAY=#{new_resource.gateway}")
+                  network_file.close
                 end
               end
             else
               network_file_name = "/etc/sysconfig/network-scripts/route-#{k}"
               converge_by("write route route.#{k}\n#{conf[k]} to #{network_file_name}") do
-                ::TargetIO::File.open(network_file_name, "w") do |network_file|
-                  network_file.puts(conf[k])
-                end
+                network_file = ::File.new(network_file_name, "w")
+                network_file.puts(conf[k])
                 logger.trace("#{new_resource} writing route.#{k}\n#{conf[k]}")
+                network_file.close
               end
             end
           end

data/lib/chef/provider/service/aix.rb

@@ -24,7 +24,7 @@ class Chef
       class Aix < Chef::Provider::Service
         attr_reader :status_load_success
 
-        provides :service, os: "aix", target_mode: true
+        provides :service, os: "aix"
 
         def initialize(new_resource, run_context)
           super

data/lib/chef/provider/service/aixinit.rb

@@ -57,7 +57,7 @@ class Chef
         end
 
         def enable_service
-          TargetIO::Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).each { |f| ::File.delete(f) }
+          Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).each { |f| ::File.delete(f) }
 
           if @new_resource.priority.is_a? Integer
             create_symlink(2, "S", @new_resource.priority)
@@ -72,7 +72,7 @@ class Chef
         end
 
         def disable_service
-          TargetIO::Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).each { |f| ::File.delete(f) }
+          Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).each { |f| ::File.delete(f) }
 
           if @new_resource.priority.is_a? Integer
             create_symlink(2, "K", 100 - @new_resource.priority)
@@ -86,13 +86,13 @@ class Chef
         end
 
         def create_symlink(run_level, status, priority)
-          ::TargetIO::File.symlink("/etc/rc.d/init.d/#{@new_resource.service_name}", "/etc/rc.d/rc#{run_level}.d/#{status}#{priority}#{@new_resource.service_name}")
+          ::File.symlink("/etc/rc.d/init.d/#{@new_resource.service_name}", "/etc/rc.d/rc#{run_level}.d/#{status}#{priority}#{@new_resource.service_name}")
         end
 
         def set_current_resource_attributes
           # assuming run level 2 for aix
           is_enabled = false
-          files = TargetIO::Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"])
+          files = Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"])
 
           priority = {}
 

data/lib/chef/provider/service/arch.rb

@@ -20,7 +20,7 @@ require_relative "init"
 
 class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
 
-  provides :service, platform_family: "arch", target_mode: true
+  provides :service, platform_family: "arch"
 
   def self.supports?(resource, action)
     service_script_exist?(:etc_rcd, resource.service_name)
@@ -32,8 +32,8 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
   end
 
   def load_current_resource
-    raise Chef::Exceptions::Service, "Could not find /etc/rc.conf" unless ::TargetIO::File.exist?("/etc/rc.conf")
-    raise Chef::Exceptions::Service, "No DAEMONS found in /etc/rc.conf" unless /DAEMONS=\((.*)\)/m.match?(::TargetIO::File.read("/etc/rc.conf"))
+    raise Chef::Exceptions::Service, "Could not find /etc/rc.conf" unless ::File.exist?("/etc/rc.conf")
+    raise Chef::Exceptions::Service, "No DAEMONS found in /etc/rc.conf" unless /DAEMONS=\((.*)\)/m.match?(::File.read("/etc/rc.conf"))
 
     super
 
@@ -50,7 +50,7 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
   #   )
   def daemons
     entries = []
-    if ::TargetIO::File.read("/etc/rc.conf") =~ /DAEMONS=\((.*)\)/m
+    if ::File.read("/etc/rc.conf") =~ /DAEMONS=\((.*)\)/m
       entries += $1.gsub(/\\?[\r\n]/, " ").gsub(/# *[^ ]+/, " ").split(" ") if $1.length > 0
     end
 
@@ -61,8 +61,8 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
 
   # FIXME: Multiple entries of DAEMONS will cause very bad results :)
   def update_daemons(entries)
-    content = ::TargetIO::File.read("/etc/rc.conf").gsub(/DAEMONS=\((.*)\)/m, "DAEMONS=(#{entries.join(" ")})")
-    ::TargetIO::File.open("/etc/rc.conf", "w") do |f|
+    content = ::File.read("/etc/rc.conf").gsub(/DAEMONS=\((.*)\)/m, "DAEMONS=(#{entries.join(" ")})")
+    ::File.open("/etc/rc.conf", "w") do |f|
       f.write(content)
     end
   end

data/lib/chef/provider/service/debian.rb

@@ -22,7 +22,7 @@ class Chef
   class Provider
     class Service
       class Debian < Chef::Provider::Service::Init
-        provides :service, platform_family: "debian", target_mode: true do
+        provides :service, platform_family: "debian" do
           debianrcd?
         end
 
@@ -46,7 +46,7 @@ class Chef
           shared_resource_requirements
           requirements.assert(:all_actions) do |a|
             update_rcd = "/usr/sbin/update-rc.d"
-            a.assertion { ::TargetIO::File.exist? update_rcd }
+            a.assertion { ::File.exist? update_rcd }
             a.failure_message Chef::Exceptions::Service, "#{update_rcd} does not exist!"
             # no whyrun recovery - this is a base system component of debian
             # distros and must be present
@@ -73,10 +73,10 @@ class Chef
 
         # returns a list of levels that the service should be stopped or started on
         def parse_init_file(path)
-          return [] unless ::TargetIO::File.exist?(path)
+          return [] unless ::File.exist?(path)
 
           in_info = false
-          ::TargetIO::File.readlines(path).each_with_object([]) do |line, acc|
+          ::File.readlines(path).each_with_object([]) do |line, acc|
             if /^### BEGIN INIT INFO/.match?(line)
               in_info = true
             elsif /^### END INIT INFO/.match?(line)
@@ -95,7 +95,7 @@ class Chef
 
           levels = parse_init_file(@init_command)
           levels.each do |level|
-            rc_files.push TargetIO::Dir.glob("/etc/rc#{level}.d/[SK][0-9][0-9]#{current_resource.service_name}")
+            rc_files.push Dir.glob("/etc/rc#{level}.d/[SK][0-9][0-9]#{current_resource.service_name}")
           end
 
           rc_files.flatten.each do |line|

data/lib/chef/provider/service/freebsd.rb

@@ -26,7 +26,7 @@ class Chef
 
         attr_reader :enabled_state_found
 
-        provides :service, os: %w{freebsd netbsd}, target_mode: true
+        provides :service, os: %w{freebsd netbsd}
 
         include Chef::Mixin::ShellOut
 
@@ -34,9 +34,9 @@ class Chef
           super
           @enabled_state_found = false
           @init_command = nil
-          if ::TargetIO::File.exist?("/etc/rc.d/#{new_resource.service_name}")
+          if ::File.exist?("/etc/rc.d/#{new_resource.service_name}")
             @init_command = "/etc/rc.d/#{new_resource.service_name}"
-          elsif ::TargetIO::File.exist?("/usr/local/etc/rc.d/#{new_resource.service_name}")
+          elsif ::File.exist?("/usr/local/etc/rc.d/#{new_resource.service_name}")
             @init_command = "/usr/local/etc/rc.d/#{new_resource.service_name}"
           end
         end
@@ -118,11 +118,11 @@ class Chef
         private
 
         def read_rc_conf
-          ::TargetIO::File.open("/etc/rc.conf", "r", &:readlines)
+          ::File.open("/etc/rc.conf", "r", &:readlines)
         end
 
         def write_rc_conf(lines)
-          ::TargetIO::File.open("/etc/rc.conf", "w") do |file|
+          ::File.open("/etc/rc.conf", "w") do |file|
             lines.each { |line| file.puts(line) }
           end
         end
@@ -131,7 +131,7 @@ class Chef
         def service_enable_variable_name
           @service_enable_variable_name ||=
             if init_command
-              ::TargetIO::File.open(init_command) do |rcscript|
+              ::File.open(init_command) do |rcscript|
                 rcscript.each_line do |line|
                   if line =~ /^name="?(\w+)"?/
                     return $1 + "_enable"
@@ -150,7 +150,7 @@ class Chef
 
         def determine_enabled_status!
           var_name = service_enable_variable_name
-          if ::TargetIO::File.exist?("/etc/rc.conf") && var_name
+          if ::File.exist?("/etc/rc.conf") && var_name
             read_rc_conf.each do |line|
               case line
               when /^#{Regexp.escape(var_name)}="(\w+)"/

data/lib/chef/provider/service/gentoo.rb

@@ -22,7 +22,7 @@ require_relative "../../util/path_helper"
 
 class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
 
-  provides :service, platform_family: "gentoo", target_mode: true
+  provides :service, platform_family: "gentoo"
 
   def load_current_resource
     supports[:status] = true if supports[:status].nil?
@@ -32,10 +32,10 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
     super
 
     @current_resource.enabled(
-      TargetIO::Dir.glob("/etc/runlevels/**/#{Chef::Util::PathHelper.escape_glob_dir(@current_resource.service_name)}").any? do |file|
+      Dir.glob("/etc/runlevels/**/#{Chef::Util::PathHelper.escape_glob_dir(@current_resource.service_name)}").any? do |file|
         @found_script = true
-        exists = ::TargetIO::File.exist? file
-        readable = ::TargetIO::File.readable? file
+        exists = ::File.exist? file
+        readable = ::File.readable? file
         logger.trace "#{@new_resource} exists: #{exists}, readable: #{readable}"
         exists && readable
       end
@@ -47,7 +47,7 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
 
   def define_resource_requirements
     requirements.assert(:all_actions) do |a|
-      a.assertion { ::TargetIO::File.exist?("/sbin/rc-update") }
+      a.assertion { ::File.exist?("/sbin/rc-update") }
       a.failure_message Chef::Exceptions::Service, "/sbin/rc-update does not exist"
       # no whyrun recovery -t his is a core component whose presence is
       # unlikely to be affected by what we do in the course of a chef run

data/lib/chef/provider/service/init.rb

@@ -26,7 +26,7 @@ class Chef
 
         attr_accessor :init_command
 
-        provides :service, os: "!windows", target_mode: true
+        provides :service, os: "!windows"
 
         def self.supports?(resource, action)
           service_script_exist?(:initd, resource.service_name)
@@ -42,7 +42,7 @@ class Chef
           shared_resource_requirements
           requirements.assert(:start, :stop, :restart, :reload) do |a|
             a.assertion do
-              custom_command_for_action?(action) || ::TargetIO::File.exist?(default_init_command)
+              custom_command_for_action?(action) || ::File.exist?(default_init_command)
             end
             a.failure_message(Chef::Exceptions::Service, "#{default_init_command} does not exist!")
             a.whyrun("Init script '#{default_init_command}' doesn't exist, assuming a prior action would have created it.") do

data/lib/chef/provider/service/insserv.rb

@@ -24,7 +24,7 @@ class Chef
     class Service
       class Insserv < Chef::Provider::Service::Init
 
-        provides :service, platform_family: %w{debian rhel fedora suse amazon}, target_mode: true do
+        provides :service, platform_family: %w{debian rhel fedora suse amazon} do
           insserv?
         end
 
@@ -38,7 +38,7 @@ class Chef
           # Look for a /etc/rc.*/SnnSERVICE link to signify that the service would be started in a runlevel
           service_name = Chef::Util::PathHelper.escape_glob_dir(current_resource.service_name)
 
-          if TargetIO::Dir.glob("/etc/rc*/**/S*#{service_name}").empty?
+          if Dir.glob("/etc/rc*/**/S*#{service_name}").empty?
             current_resource.enabled false
           else
             current_resource.enabled true

data/lib/chef/provider/service/invokercd.rb

@@ -23,7 +23,7 @@ class Chef
     class Service
       class Invokercd < Chef::Provider::Service::Init
 
-        provides :service, platform_family: "debian", override: true, target_mode: true do
+        provides :service, platform_family: "debian", override: true do
           invokercd?
         end
 

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

@@ -24,7 +24,7 @@ class Chef
     class Service
       class Openbsd < Chef::Provider::Service::Init
 
-        provides :service, os: "openbsd", target_mode: true
+        provides :service, os: "openbsd"
 
         attr_reader :init_command, :rc_conf, :rc_conf_local, :enabled_state_found
 
@@ -33,9 +33,9 @@ class Chef
 
         def initialize(new_resource, run_context)
           super
-          @rc_conf = ::TargetIO::File.read(RC_CONF_PATH) rescue ""
-          @rc_conf_local = ::TargetIO::File.read(RC_CONF_LOCAL_PATH) rescue ""
-          @init_command = ::TargetIO::File.exist?(rcd_script_path) ? rcd_script_path : nil
+          @rc_conf = ::File.read(RC_CONF_PATH) rescue ""
+          @rc_conf_local = ::File.read(RC_CONF_LOCAL_PATH) rescue ""
+          @init_command = ::File.exist?(rcd_script_path) ? rcd_script_path : nil
           new_resource.status_command("#{default_init_command} check")
         end
 
@@ -129,8 +129,8 @@ class Chef
         end
 
         def update_rcl(value)
-          TargetIO::FileUtils.touch RC_CONF_LOCAL_PATH unless ::TargetIO::File.exist? RC_CONF_LOCAL_PATH
-          ::TargetIO::File.write(RC_CONF_LOCAL_PATH, value)
+          FileUtils.touch RC_CONF_LOCAL_PATH unless ::File.exist? RC_CONF_LOCAL_PATH
+          ::File.write(RC_CONF_LOCAL_PATH, value)
           @rc_conf_local = value
         end
 
@@ -139,7 +139,7 @@ class Chef
           @bsevn ||= begin
             result = nil
             if rcd_script_found?
-              ::TargetIO::File.open(init_command) do |rcscript|
+              ::File.open(init_command) do |rcscript|
                 if m = rcscript.read.match(/^# \$OpenBSD: (\w+)[(.rc),]?/)
                   result = m[1] + "_flags"
                 end

data/lib/chef/provider/service/redhat.rb

@@ -28,7 +28,7 @@ class Chef
         # @api private
         attr_accessor :current_run_levels
 
-        provides :service, platform_family: "rpm_based", target_mode: true do
+        provides :service, platform_family: "rpm_based" do
           redhatrcd?
         end
 
@@ -56,7 +56,7 @@ class Chef
 
           requirements.assert(:all_actions) do |a|
             chkconfig_file = "/sbin/chkconfig"
-            a.assertion { ::TargetIO::File.exist? chkconfig_file }
+            a.assertion { ::File.exist? chkconfig_file }
             a.failure_message Chef::Exceptions::Service, "#{chkconfig_file} does not exist!"
           end
 
@@ -80,7 +80,7 @@ class Chef
 
           super
 
-          if ::TargetIO::File.exist?("/sbin/chkconfig")
+          if ::File.exist?("/sbin/chkconfig")
             chkconfig = shell_out!("/sbin/chkconfig --list #{current_resource.service_name}", returns: [0, 1])
             unless run_levels.nil? || run_levels.empty?
               all_levels_match = true

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

@@ -25,7 +25,7 @@ class Chef
       class Solaris < Chef::Provider::Service
         attr_reader :maintenance
 
-        provides :service, os: "solaris2", target_mode: true
+        provides :service, os: "solaris2"
 
         def initialize(new_resource, run_context = nil)
           super
@@ -39,7 +39,7 @@ class Chef
           @current_resource.service_name(@new_resource.service_name)
 
           [@init_command, @status_command].each do |cmd|
-            unless ::TargetIO::File.executable? cmd
+            unless ::File.executable? cmd
               raise Chef::Exceptions::Service, "#{cmd} not executable!"
             end
           end

data/lib/chef/provider/service/systemd.rb

@@ -26,7 +26,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
 
   include Chef::Mixin::Which
 
-  provides(:service, os: "linux", target_mode: true) do |node|
+  provides :service, os: "linux", target_mode: true do |node|
     systemd?
   end
 
@@ -106,7 +106,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
     if new_resource.user
       raise NotImplementedError, "#{new_resource} does not support the user property on a target_mode host (yet)" if Chef::Config.target_mode?
 
-      uid = TargetIO::Etc.getpwnam(new_resource.user).uid
+      uid = Etc.getpwnam(new_resource.user).uid
       options = {
         environment: {
           "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/#{uid}/bus",

data/lib/chef/provider/service/upstart.rb

@@ -124,9 +124,9 @@ class Chef
             end
           end
           # Get enabled/disabled state by reading job configuration file
-          if ::TargetIO::File.exist?("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
+          if ::File.exist?("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
             logger.trace("#{@new_resource} found #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
-            ::TargetIO::File.open("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}", "r") do |file|
+            ::File.open("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}", "r") do |file|
               while line = file.gets
                 case line
                 when /^start on/

data/lib/chef/provider/subversion.rb

@@ -27,7 +27,7 @@ class Chef
   class Provider
     class Subversion < Chef::Provider
 
-      provides :subversion, target_mode: true
+      provides :subversion
 
       SVN_INFO_PATTERN = /^([\w\s]+): (.+)$/.freeze
 
@@ -48,7 +48,7 @@ class Chef
           # Make sure the parent dir exists, or else fail.
           # for why run, print a message explaining the potential error.
           parent_directory = ::File.dirname(new_resource.destination)
-          a.assertion { ::TargetIO::File.directory?(parent_directory) }
+          a.assertion { ::File.directory?(parent_directory) }
           a.failure_message(Chef::Exceptions::MissingParentDirectory,
             "Cannot clone #{new_resource} to #{new_resource.destination}, the enclosing directory #{parent_directory} does not exist")
           a.whyrun("Directory #{parent_directory} does not exist, assuming it would have been created")
@@ -81,7 +81,7 @@ class Chef
 
       action :sync, description: "Update the source to the specified version, or get a new clone or checkout. This action causes a hard reset of the index and working tree, discarding any uncommitted changes." do
         assert_target_directory_valid!
-        if ::TargetIO::File.exist?(::File.join(new_resource.destination, ".svn"))
+        if ::File.exist?(::File.join(new_resource.destination, ".svn"))
           current_rev = find_current_revision
           logger.trace "#{new_resource} current revision: #{current_rev} target revision: #{revision_int}"
           unless current_revision_matches_target_revision?
@@ -134,7 +134,7 @@ class Chef
       alias :revision_slug :revision_int
 
       def find_current_revision
-        return nil unless ::TargetIO::File.exist?(::File.join(new_resource.destination, ".svn"))
+        return nil unless ::File.exist?(::File.join(new_resource.destination, ".svn"))
 
         command = scm(:info)
         svn_info = shell_out!(command, **run_options(cwd: cwd, returns: [0, 1])).stdout
@@ -214,7 +214,7 @@ class Chef
       end
 
       def target_dir_non_existent_or_empty?
-        !::TargetIO::File.exist?(new_resource.destination) || TargetIO::Dir.entries(new_resource.destination).sort == [".", ".."]
+        !::File.exist?(new_resource.destination) || Dir.entries(new_resource.destination).sort == [".", ".."]
       end
 
       def svn_binary
@@ -224,7 +224,7 @@ class Chef
 
       def assert_target_directory_valid!
         target_parent_directory = ::File.dirname(new_resource.destination)
-        unless ::TargetIO::File.directory?(target_parent_directory)
+        unless ::File.directory?(target_parent_directory)
           msg = "Cannot clone #{new_resource} to #{new_resource.destination}, the enclosing directory #{target_parent_directory} does not exist"
           raise Chef::Exceptions::MissingParentDirectory, msg
         end
@@ -238,9 +238,9 @@ class Chef
         require "etc" unless defined?(Etc)
         case user
         when Integer
-          TargetIO::Etc.getpwuid(user).dir
+          Etc.getpwuid(user).dir
         else
-          TargetIO::Etc.getpwnam(user.to_s).dir
+          Etc.getpwnam(user.to_s).dir
         end
       end
     end

data/lib/chef/provider/systemd_unit.rb

@@ -29,13 +29,13 @@ class Chef
     class SystemdUnit < Chef::Provider
       include Chef::Mixin::Which
 
-      provides :systemd_unit, target_mode: true
+      provides :systemd_unit
 
       def load_current_resource
         @current_resource = Chef::Resource::SystemdUnit.new(new_resource.name)
 
         current_resource.unit_name(new_resource.unit_name)
-        current_resource.content(::TargetIO::File.read(unit_path)) if ::TargetIO::File.exist?(unit_path)
+        current_resource.content(::File.read(unit_path)) if ::File.exist?(unit_path)
         current_resource.user(new_resource.user)
         current_resource.enabled(enabled?)
         current_resource.active(active?)
@@ -86,7 +86,7 @@ class Chef
       end
 
       action :delete, description: "Delete a systemd unit file, if it exists." do
-        if ::TargetIO::File.exist?(unit_path)
+        if ::File.exist?(unit_path)
           converge_by("deleting unit: #{new_resource.unit_name}") do
             manage_unit_file(:delete)
             daemon_reload if new_resource.triggers_reload

data/lib/chef/provider/template.rb

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

data/lib/chef/provider/user/aix.rb

@@ -20,8 +20,8 @@ class Chef
   class Provider
     class User
       class Aix < Chef::Provider::User
-        provides :user, os: "aix", target_mode: true
-        provides :aix_user, target_mode: true
+        provides :user, os: "aix"
+        provides :aix_user
 
         # The ruby-shadow gem is not supported on aix.
         def supports_ruby_shadow?
@@ -124,7 +124,7 @@ class Chef
           return unless updating_home? && new_resource.manage_home
 
           # -m option does not work on aix, so move dir.
-          if ::TargetIO::File.directory?(current_resource.home)
+          if ::File.directory?(current_resource.home)
             logger.trace("Changing users home directory from #{current_resource.home} to #{new_resource.home}")
             FileUtils.mv current_resource.home, new_resource.home
           else

data/lib/chef/provider/user/linux.rb

@@ -20,19 +20,14 @@ class Chef
   class Provider
     class User
       class Linux < Chef::Provider::User
-        provides :linux_user, target_mode: true
-        provides :user, os: "linux", target_mode: true
+        provides :linux_user
+        provides :user, os: "linux"
 
         def load_current_resource
           super
           load_shadow_options
         end
 
-        def supports_ruby_shadow?
-          # For target mode, ruby-shadow is redirected to a file-based implementation
-          true unless ChefConfig::Config.target_mode?
-        end
-
         def compare_user
           user_changed = super
 

data/lib/chef/provider/user/pw.rb

@@ -22,12 +22,12 @@ class Chef
   class Provider
     class User
       class Pw < Chef::Provider::User
-        provides :pw_user, target_mode: true
-        provides :user, os: "freebsd", target_mode: true
+        provides :pw_user
+        provides :user, os: "freebsd"
 
         def load_current_resource
           super
-          raise Chef::Exceptions::User, "Could not find binary /usr/sbin/pw for #{new_resource}" unless ::TargetIO::File.exist?("/usr/sbin/pw")
+          raise Chef::Exceptions::User, "Could not find binary /usr/sbin/pw for #{new_resource}" unless ::File.exist?("/usr/sbin/pw")
         end
 
         def create_user

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

@@ -24,8 +24,8 @@ class Chef
   class Provider
     class User
       class Solaris < Chef::Provider::User
-        provides :solaris_user, target_mode: true
-        provides :user, os: %w{openindiana illumos omnios solaris2 smartos}, target_mode: true
+        provides :solaris_user
+        provides :user, os: %w{openindiana illumos omnios solaris2 smartos}
 
         PASSWORD_FILE = "/etc/shadow".freeze
 
@@ -46,7 +46,7 @@ class Chef
         end
 
         def check_lock
-          user = TargetIO::IO.read(PASSWORD_FILE).match(/^#{Regexp.escape(new_resource.username)}:([^:]*):/)
+          user = IO.read(PASSWORD_FILE).match(/^#{Regexp.escape(new_resource.username)}:([^:]*):/)
 
           # If we're in whyrun mode, and the user is not created, we assume it will be
           return false if whyrun_mode? && user.nil?
@@ -122,7 +122,7 @@ class Chef
         # a pipe to passwd(1) or evaluating modern ruby-shadow.  See https://github.com/chef/chef/pull/721
         def write_shadow_file
           buffer = Tempfile.new("shadow", "/etc")
-          ::TargetIO::File.open(PASSWORD_FILE) do |shadow_file|
+          ::File.open(PASSWORD_FILE) do |shadow_file|
             shadow_file.each do |entry|
               user = entry.split(":").first
               if user == new_resource.username
@@ -140,10 +140,10 @@ class Chef
           uid  = s.uid
           gid  = s.gid
 
-          TargetIO::FileUtils.chown uid, gid, buffer.path
-          TargetIO::FileUtils.chmod mode, buffer.path
+          FileUtils.chown uid, gid, buffer.path
+          FileUtils.chmod mode, buffer.path
 
-          TargetIO::FileUtils.mv buffer.path, PASSWORD_FILE
+          FileUtils.mv buffer.path, PASSWORD_FILE
         end
 
         def updated_password(entry)

data/lib/chef/provider/user/windows.rb

@@ -85,7 +85,12 @@ class Chef
           @net_user.update(**set_options)
         end
 
+        def clear_account_rights(name)
+          Chef::ReservedNames::Win32::Security.clear_account_rights(name)
+        end
+
         def remove_user
+          clear_account_rights(new_resource.username)
           @net_user.delete
         end