chef 14.2.0 → 14.3.37

data/lib/chef/provider/systemd_unit.rb

@@ -247,8 +247,8 @@ class Chef
           if new_resource.user
             uid = Etc.getpwnam(new_resource.user).uid
             {
-              :user => new_resource.user,
-              :environment => {
+              user: new_resource.user,
+              environment: {
                 "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/#{uid}/bus",
               },
             }

data/lib/chef/provider/template/content.rb

@@ -29,7 +29,7 @@ class Chef
 
         def template_location
           @template_file_cache_location ||= begin
-            template_finder.find(new_resource.source, :local => new_resource.local, :cookbook => new_resource.cookbook)
+            template_finder.find(new_resource.source, local: new_resource.local, cookbook: new_resource.cookbook)
           end
         end
 

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

@@ -24,7 +24,7 @@ class Chef
         provides :aix_user
 
         def create_user
-          shell_out_compact!("useradd", universal_options, useradd_options, new_resource.username)
+          shell_out!("useradd", universal_options, useradd_options, new_resource.username)
           add_password
         end
 
@@ -32,11 +32,11 @@ class Chef
           add_password
           manage_home
           return if universal_options.empty? && usermod_options.empty?
-          shell_out_compact!("usermod", universal_options, usermod_options, new_resource.username)
+          shell_out!("usermod", universal_options, usermod_options, new_resource.username)
         end
 
         def remove_user
-          shell_out_compact!("userdel", userdel_options, new_resource.username)
+          shell_out!("userdel", userdel_options, new_resource.username)
         end
 
         # Aix does not support -r like other unix, sytem account is created by adding to 'system' group
@@ -66,7 +66,7 @@ class Chef
         end
 
         def check_lock
-          lock_info = shell_out_compact!("lsuser", "-a", "account_locked", new_resource.username)
+          lock_info = shell_out!("lsuser", "-a", "account_locked", new_resource.username)
           if whyrun_mode? && passwd_s.stdout.empty? && lock_info.stderr.match(/does not exist/)
             # if we're in whyrun mode and the user is not yet created we assume it would be
             return false
@@ -85,11 +85,11 @@ class Chef
         end
 
         def lock_user
-          shell_out_compact!("chuser", "account_locked=true", new_resource.username)
+          shell_out!("chuser", "account_locked=true", new_resource.username)
         end
 
         def unlock_user
-          shell_out_compact!("chuser", "account_locked=false", new_resource.username)
+          shell_out!("chuser", "account_locked=false", new_resource.username)
         end
 
         def universal_options

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

@@ -326,7 +326,7 @@ user password using shadow hash.")
         end
 
         def ditto_home
-          shell_out_compact!("/usr/sbin/createhomedir", "-c", "-u", "#{new_resource.username}")
+          shell_out!("/usr/sbin/createhomedir", "-c", "-u", (new_resource.username).to_s)
         end
 
         def move_home
@@ -364,7 +364,7 @@ user password using shadow hash.")
 
           # Shadow info is saved as binary plist. Convert the info to binary plist.
           shadow_info_binary = StringIO.new
-          shell_out_compact("plutil", "-convert", "binary1", "-o", "-", "-",
+          shell_out("plutil", "-convert", "binary1", "-o", "-", "-",
                             input: shadow_info.to_plist, live_stream: shadow_info_binary)
 
           if user_info.nil?
@@ -586,7 +586,7 @@ user password using shadow hash.")
 
           # We flush the cache here in order to make sure that we read fresh information
           # for the user.
-          shell_out_compact("dscacheutil", "-flushcache") # FIXME: this is MacOS version dependent
+          shell_out("dscacheutil", "-flushcache") # FIXME: this is MacOS version dependent
 
           begin
             user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist"
@@ -654,7 +654,7 @@ user password using shadow hash.")
         end
 
         def run_dscl(*args)
-          result = shell_out_compact("dscl", ".", "-#{args[0]}", args[1..-1])
+          result = shell_out("dscl", ".", "-#{args[0]}", args[1..-1])
           return "" if ( args.first =~ /^delete/ ) && ( result.exitstatus != 0 )
           raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") unless result.exitstatus == 0
           raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") if result.stdout =~ /No such key: /
@@ -662,7 +662,7 @@ user password using shadow hash.")
         end
 
         def run_plutil(*args)
-          result = shell_out_compact("plutil", "-#{args[0]}", args[1..-1])
+          result = shell_out("plutil", "-#{args[0]}", args[1..-1])
           raise(Chef::Exceptions::PlistUtilCommandFailed, "plutil error: #{result.inspect}") unless result.exitstatus == 0
           if result.stdout.encoding == Encoding::ASCII_8BIT
             result.stdout.encode("utf-8", "binary", undef: :replace, invalid: :replace, replace: "?")
@@ -672,7 +672,7 @@ user password using shadow hash.")
         end
 
         def convert_binary_plist_to_xml(binary_plist_string)
-          shell_out_compact("plutil", "-convert", "xml1", "-o", "-", "-", input: binary_plist_string).stdout
+          shell_out("plutil", "-convert", "xml1", "-o", "-", "-", input: binary_plist_string).stdout
         end
 
         def convert_to_binary(string)

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

@@ -24,23 +24,23 @@ class Chef
         provides :user, os: "linux"
 
         def create_user
-          shell_out_compact!("useradd", universal_options, useradd_options, new_resource.username)
+          shell_out!("useradd", universal_options, useradd_options, new_resource.username)
         end
 
         def manage_user
-          shell_out_compact!("usermod", universal_options, usermod_options, new_resource.username)
+          shell_out!("usermod", universal_options, usermod_options, new_resource.username)
         end
 
         def remove_user
-          shell_out_compact!("userdel", userdel_options, new_resource.username)
+          shell_out!("userdel", userdel_options, new_resource.username)
         end
 
         def lock_user
-          shell_out_compact!("usermod", "-L", new_resource.username)
+          shell_out!("usermod", "-L", new_resource.username)
         end
 
         def unlock_user
-          shell_out_compact!("usermod", "-U", new_resource.username)
+          shell_out!("usermod", "-U", new_resource.username)
         end
 
         # common to usermod and useradd
@@ -88,7 +88,7 @@ class Chef
         def check_lock
           # there's an old bug in rhel (https://bugzilla.redhat.com/show_bug.cgi?id=578534)
           # which means that both 0 and 1 can be success.
-          passwd_s = shell_out_compact("passwd", "-S", new_resource.username, returns: [ 0, 1 ])
+          passwd_s = shell_out("passwd", "-S", new_resource.username, returns: [ 0, 1 ])
 
           # checking "does not exist" has to come before exit code handling since centos and ubuntu differ in exit codes
           if passwd_s.stderr =~ /does not exist/

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

@@ -31,19 +31,19 @@ class Chef
         end
 
         def create_user
-          shell_out_compact!("pw", "useradd", set_options)
+          shell_out!("pw", "useradd", set_options)
           modify_password
         end
 
         def manage_user
-          shell_out_compact!("pw", "usermod", set_options)
+          shell_out!("pw", "usermod", set_options)
           modify_password
         end
 
         def remove_user
           command = [ "pw", "userdel", new_resource.username ]
           command << "-r" if new_resource.manage_home
-          shell_out_compact!(command)
+          shell_out!(command)
         end
 
         def check_lock
@@ -57,11 +57,11 @@ class Chef
         end
 
         def lock_user
-          shell_out_compact!("pw", "lock", new_resource.username)
+          shell_out!("pw", "lock", new_resource.username)
         end
 
         def unlock_user
-          shell_out_compact!("pw", "unlock", new_resource.username)
+          shell_out!("pw", "unlock", new_resource.username)
         end
 
         def set_options

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

@@ -27,21 +27,21 @@ class Chef
         provides :solaris_user
         provides :user, os: %w{openindiana opensolaris illumos omnios solaris2 smartos}
 
-        PASSWORD_FILE = "/etc/shadow"
+        PASSWORD_FILE = "/etc/shadow".freeze
 
         def create_user
-          shell_out_compact!("useradd", universal_options, useradd_options, new_resource.username)
+          shell_out!("useradd", universal_options, useradd_options, new_resource.username)
           manage_password
         end
 
         def manage_user
           manage_password
           return if universal_options.empty? && usermod_options.empty?
-          shell_out_compact!("usermod", universal_options, usermod_options, new_resource.username)
+          shell_out!("usermod", universal_options, usermod_options, new_resource.username)
         end
 
         def remove_user
-          shell_out_compact!("userdel", userdel_options, new_resource.username)
+          shell_out!("userdel", userdel_options, new_resource.username)
         end
 
         def check_lock
@@ -56,11 +56,11 @@ class Chef
         end
 
         def lock_user
-          shell_out_compact!("passwd", "-l", new_resource.username)
+          shell_out!("passwd", "-l", new_resource.username)
         end
 
         def unlock_user
-          shell_out_compact!("passwd", "-u", new_resource.username)
+          shell_out!("passwd", "-u", new_resource.username)
         end
 
         private

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

@@ -36,7 +36,7 @@ class Chef
             useradd.concat(universal_options)
             useradd.concat(useradd_options)
           end
-          shell_out_compact!(command)
+          shell_out!(command)
         end
 
         def manage_user
@@ -44,7 +44,7 @@ class Chef
           command = compile_command("usermod") do |u|
             u.concat(universal_options)
           end
-          shell_out_compact!(command)
+          shell_out!(command)
         end
 
         def remove_user
@@ -52,13 +52,13 @@ class Chef
           command << "-r" if new_resource.manage_home
           command << "-f" if new_resource.force
           command << new_resource.username
-          shell_out_compact!(command)
+          shell_out!(command)
         end
 
         def check_lock
           # we can get an exit code of 1 even when it's successful on
           # rhel/centos (redhat bug 578534). See additional error checks below.
-          passwd_s = shell_out_compact!("passwd", "-S", new_resource.username, returns: [0, 1])
+          passwd_s = shell_out!("passwd", "-S", new_resource.username, returns: [0, 1])
           if whyrun_mode? && passwd_s.stdout.empty? && passwd_s.stderr.match(/does not exist/)
             # if we're in whyrun mode and the user is not yet created we assume it would be
             return false
@@ -79,7 +79,7 @@ class Chef
           unless passwd_s.exitstatus == 0
             raise_lock_error = false
             if %w{redhat centos}.include?(node[:platform])
-              passwd_version_check = shell_out_compact!("rpm", "-q", "passwd")
+              passwd_version_check = shell_out!("rpm", "-q", "passwd")
               passwd_version = passwd_version_check.stdout.chomp
 
               unless passwd_version == "passwd-0.73-1"
@@ -96,11 +96,11 @@ class Chef
         end
 
         def lock_user
-          shell_out_compact!("usermod", "-L", new_resource.username)
+          shell_out!("usermod", "-L", new_resource.username)
         end
 
         def unlock_user
-          shell_out_compact!("usermod", "-U", new_resource.username)
+          shell_out!("usermod", "-U", new_resource.username)
         end
 
         def compile_command(base_command)

data/lib/chef/provider/windows_env.rb

@@ -63,7 +63,7 @@ class Chef
       # <false>:: If a change is not required
       def requires_modify_or_create?
         if new_resource.delim
-          #e.g. check for existing value within PATH
+          # e.g. check for existing value within PATH
           new_values.inject(0) do |index, val|
             next_index = current_values.find_index val
             return true if next_index.nil? || next_index < index
@@ -91,18 +91,18 @@ class Chef
         end
       end
 
-      #e.g. delete a PATH element
+      # e.g. delete a PATH element
       #
       # ==== Returns
       # <true>:: If we handled the element case and caller should not delete the key
       # <false>:: Caller should delete the key, either no :delim was specific or value was empty
       #           after we removed the element.
       def delete_element
-        return false unless new_resource.delim #no delim: delete the key
+        return false unless new_resource.delim # no delim: delete the key
         needs_delete = new_values.any? { |v| current_values.include?(v) }
         if !needs_delete
           logger.trace("#{new_resource} element '#{new_resource.value}' does not exist")
-          return true #do not delete the key
+          return true # do not delete the key
         else
           new_value =
             current_values.select do |item|
@@ -110,13 +110,13 @@ class Chef
             end.join(new_resource.delim)
 
           if new_value.empty?
-            return false #nothing left here, delete the key
+            return false # nothing left here, delete the key
           else
             old_value = new_resource.value(new_value)
             create_env
             logger.trace("#{new_resource} deleted #{old_value} element")
             new_resource.updated_by_last_action(true)
-            return true #we removed the element and updated; do not delete the key
+            return true # we removed the element and updated; do not delete the key
           end
         end
       end

data/lib/chef/provider/windows_task.rb

@@ -46,8 +46,8 @@ class Chef
           SEP: TaskScheduler::SEPTEMBER,
           OCT: TaskScheduler::OCTOBER,
           NOV: TaskScheduler::NOVEMBER,
-          DEC: TaskScheduler::DECEMBER
-        }
+          DEC: TaskScheduler::DECEMBER,
+        }.freeze
 
         DAYS_OF_WEEK = { MON: TaskScheduler::MONDAY,
                          TUE: TaskScheduler::TUESDAY,
@@ -55,14 +55,14 @@ class Chef
                          THU: TaskScheduler::THURSDAY,
                          FRI: TaskScheduler::FRIDAY,
                          SAT: TaskScheduler::SATURDAY,
-                         SUN: TaskScheduler::SUNDAY }
+                         SUN: TaskScheduler::SUNDAY }.freeze
 
         WEEKS_OF_MONTH = {
           FIRST: TaskScheduler::FIRST_WEEK,
           SECOND: TaskScheduler::SECOND_WEEK,
           THIRD: TaskScheduler::THIRD_WEEK,
-          FOURTH: TaskScheduler::FOURTH_WEEK
-        }
+          FOURTH: TaskScheduler::FOURTH_WEEK,
+        }.freeze
 
         DAYS_OF_MONTH = {
           1 => TaskScheduler::TASK_FIRST,
@@ -95,20 +95,18 @@ class Chef
           28 => TaskScheduler::TASK_TWENTY_EIGHTH,
           29 => TaskScheduler::TASK_TWENTY_NINTH,
           30 => TaskScheduler::TASK_THIRTYETH,
-          31 => TaskScheduler::TASK_THIRTY_FIRST
-        }
+          31 => TaskScheduler::TASK_THIRTY_FIRST,
+        }.freeze
 
         def load_current_resource
           @current_resource = Chef::Resource::WindowsTask.new(new_resource.name)
-          task = TaskScheduler.new
-          if task.exists?(new_resource.task_name)
-            @current_resource.exists = true
+          task = TaskScheduler.new(new_resource.task_name, nil, "\\", false)
+          @current_resource.exists = task.exists?(new_resource.task_name)
+          if @current_resource.exists
             task.get_task(new_resource.task_name)
             @current_resource.task = task
             pathed_task_name = new_resource.task_name.start_with?('\\') ? new_resource.task_name : "\\#{new_resource.task_name}"
             @current_resource.task_name(pathed_task_name)
-          else
-            @current_resource.exists = false
           end
           @current_resource
         end
@@ -133,10 +131,10 @@ class Chef
             converge_by("#{new_resource} task created") do
               task = TaskScheduler.new
               if new_resource.frequency == :none
-                task.new_work_item(new_resource.task_name, {})
+                task.new_work_item(new_resource.task_name, {}, { user: new_resource.user, password: new_resource.password })
                 task.activate(new_resource.task_name)
               else
-                task.new_work_item(new_resource.task_name, trigger)
+                task.new_work_item(new_resource.task_name, trigger, { user: new_resource.user, password: new_resource.password })
               end
               task.application_name = new_resource.command
               task.parameters = new_resource.command_arguments if new_resource.command_arguments
@@ -197,7 +195,7 @@ class Chef
             logger.trace "#{new_resource} task exists"
             if current_resource.task.status == "not scheduled"
               converge_by("#{new_resource} task enabled") do
-                #TODO wind32-taskscheduler currently not having any method to handle this so using schtasks.exe here
+                # TODO wind32-taskscheduler currently not having any method to handle this so using schtasks.exe here
                 run_schtasks "CHANGE", "ENABLE" => ""
               end
             else
@@ -214,7 +212,7 @@ class Chef
             logger.info "#{new_resource} task exists"
             if %w{ready running}.include?(current_resource.task.status)
               converge_by("#{new_resource} task disabled") do
-                #TODO: in win32-taskscheduler there is no method whcih disbales the task so currently calling disable with schtasks.exe
+                # TODO: in win32-taskscheduler there is no method whcih disbales the task so currently calling disable with schtasks.exe
                 run_schtasks "CHANGE", "DISABLE" => ""
               end
             else
@@ -258,7 +256,7 @@ class Chef
         def trigger
           start_month, start_day, start_year = new_resource.start_day.to_s.split("/")
           start_hour, start_minute = new_resource.start_time.to_s.split(":")
-          #TODO currently end_month, end_year and end_year needs to be set to 0. If not set win32-taskscheduler throwing nil into integer error.
+          # TODO currently end_month, end_year and end_year needs to be set to 0. If not set win32-taskscheduler throwing nil into integer error.
           trigger_hash = {
             start_year: start_year.to_i,
             start_month: start_month.to_i,
@@ -270,7 +268,7 @@ class Chef
             end_year: 0,
             trigger_type: trigger_type,
             type: type,
-            random_minutes_interval: new_resource.random_delay
+            random_minutes_interval: new_resource.random_delay,
           }
 
           if new_resource.frequency == :minute
@@ -320,7 +318,7 @@ class Chef
           hours.to_i * 60 if hours
         end
 
-        #TODO : Try to optimize this method
+        # TODO : Try to optimize this method
         # known issue : Since start_day and time is not mandatory while updating weekly frequency for which start_day is not mentioned by user idempotency
         # is not gettting maintained as new_resource.start_day is nil and we fetch the day of week from start_day to set and its currently coming as nil and don't match with current_task
         def task_needs_update?(task)
@@ -454,7 +452,7 @@ class Chef
 
         def days_of_week
           if new_resource.day
-            #this line of code is just to support backward compatibility of wild card *
+            # this line of code is just to support backward compatibility of wild card *
             new_resource.day = "mon, tue, wed, thu, fri, sat, sun" if new_resource.day == "*" && new_resource.frequency == :weekly
             days = new_resource.day.split(",")
             days.map! { |day| day.to_s.strip.upcase }
@@ -477,7 +475,7 @@ class Chef
           end
 
           if new_resource.months
-            #this line of code is just to support backward compatibility of wild card *
+            # this line of code is just to support backward compatibility of wild card *
             new_resource.months = "jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec" if new_resource.months == "*" && new_resource.frequency == :monthly
             months = new_resource.months.split(",")
             months.map! { |month| month.to_s.strip.upcase }
@@ -541,11 +539,11 @@ class Chef
           end
         end
 
-        #TODO: while creating the configuration settings win32-taskscheduler it accepts execution time limit values in ISO8601 formata
+        # TODO: while creating the configuration settings win32-taskscheduler it accepts execution time limit values in ISO8601 formata
         def config_settings
           settings = {
             execution_time_limit: new_resource.execution_time_limit,
-            enabled: true
+            enabled: true,
           }
           settings[:idle_duration] = new_resource.idle_time if new_resource.idle_time
           settings[:run_only_if_idle] = true if new_resource.idle_time
@@ -565,7 +563,7 @@ class Chef
           new_resource.password.nil? ? TaskScheduler::TASK_LOGON_SERVICE_ACCOUNT : TaskScheduler::TASK_LOGON_PASSWORD
         end
 
-        # This method checks if task and command attributes exist since those two are mandatory attributes to create a schedules task.
+        # This method checks if task and command properties exist since those two are mandatory properties to create a schedules task.
         def basic_validation
           validate = []
           validate << "Command" if new_resource.command.nil? || new_resource.command.empty?