chef 14.2.0 → 14.3.37

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

@@ -210,7 +210,7 @@ class Chef
         end
 
         def resolve_source_to_version_obj
-          shell_out_with_timeout!("rpm -qp --queryformat '%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{ARCH}\n' #{new_resource.source}").stdout.each_line do |line|
+          shell_out!("rpm -qp --queryformat '%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{ARCH}\n' #{new_resource.source}").stdout.each_line do |line|
             # this is another case of committing the sin of doing some lightweight mangling of RPM versions in ruby -- but the output of the rpm command
             # does not match what the yum library accepts.
             case line
@@ -260,7 +260,7 @@ class Chef
         end
 
         def yum(*args)
-          shell_out_compact_timeout!(yum_binary, *args)
+          shell_out!(yum_binary, *args)
         end
 
         def safe_version_array

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

@@ -35,7 +35,7 @@ class Chef
           candidate_version = current_version = nil
           is_installed = false
           logger.trace("#{new_resource} checking zypper")
-          status = shell_out_compact_timeout!("zypper", "--non-interactive", "info", package_name)
+          status = shell_out!("zypper", "--non-interactive", "info", package_name)
           status.stdout.each_line do |line|
             case line
             when /^Version *: (.+) *$/
@@ -86,7 +86,7 @@ class Chef
         def locked_packages
           @locked_packages ||=
             begin
-              locked = shell_out_compact_timeout!("zypper", "locks")
+              locked = shell_out!("zypper", "locks")
               locked.stdout.each_line.map do |line|
                 line.split("|").shift(2).last.strip
               end
@@ -144,9 +144,9 @@ class Chef
         def zypper_package(command, *options, names, versions)
           zipped_names = zip(names, versions)
           if zypper_version < 1.0
-            shell_out_compact_timeout!("zypper", gpg_checks, command, *options, "-y", names)
+            shell_out!("zypper", gpg_checks, command, *options, "-y", names)
           else
-            shell_out_compact_timeout!("zypper", "--non-interactive", gpg_checks, command, *options, zipped_names)
+            shell_out!("zypper", "--non-interactive", gpg_checks, command, *options, zipped_names)
           end
         end
 

data/lib/chef/provider/powershell_script.rb

@@ -85,10 +85,10 @@ class Chef
           # in that block will still trigger a syntax error which is
           # exactly what we want here -- verify the syntax without
           # actually running the script.
-          user_code_wrapped_in_powershell_script_block = <<-EOH
-{
-  #{new_resource.code}
-}
+          user_code_wrapped_in_powershell_script_block = <<~EOH
+            {
+              #{new_resource.code}
+            }
 EOH
           user_script_file.puts user_code_wrapped_in_powershell_script_block
 
@@ -146,75 +146,75 @@ EOH
       # executed, otherwise 0 or 1 based on whether $? is set to true
       # (success, where we return 0) or false (where we return 1).
       def wrapper_script
-        <<-EOH
-# Chef Client wrapper for powershell_script resources
-
-# In rare cases, such as when PowerShell is executed
-# as an alternate user, the new-variable cmdlet is not
-# available, so import it just in case
-if ( get-module -ListAvailable Microsoft.PowerShell.Utility )
-{
-    Import-Module Microsoft.PowerShell.Utility
-}
-
-# LASTEXITCODE can be uninitialized -- make it explictly 0
-# to avoid incorrect detection of failure (non-zero) codes
-$global:LASTEXITCODE = 0
-
-# Catch any exceptions -- without this, exceptions will result
-# In a zero return code instead of the desired non-zero code
-# that indicates a failure
-trap [Exception] {write-error ($_.Exception.Message);exit 1}
-
-# Variable state that should not be accessible to the user code
-new-variable -name interpolatedexitcode -visibility private -value $#{new_resource.convert_boolean_return}
-new-variable -name chefscriptresult -visibility private
-
-# Initialize a variable we use to capture $? inside a block
-$global:lastcmdlet = $null
-
-# Execute the user's code in a script block --
-$chefscriptresult =
-{
- #{new_resource.code}
-
- # This assignment doesn't affect the block's return value
- $global:lastcmdlet = $?
-}.invokereturnasis()
-
-# Assume failure status of 1 -- success cases
-# will have to override this
-$exitstatus = 1
-
-# If convert_boolean_return is enabled, the block's return value
-# gets precedence in determining our exit status
-if ($interpolatedexitcode -and $chefscriptresult -ne $null -and $chefscriptresult.gettype().name -eq 'boolean')
-{
-  $exitstatus = [int32](!$chefscriptresult)
-}
-elseif ($lastcmdlet)
-{
-  # Otherwise, a successful cmdlet execution defines the status
-  $exitstatus = 0
-}
-elseif ( $LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0 )
-{
-  # If the cmdlet status is failed, allow the Win32 status
-  # in $LASTEXITCODE to define exit status. This handles the case
-  # where no cmdlets, only Win32 processes have run since $?
-  # will be set to $false whenever a Win32 process returns a non-zero
-  # status.
-  $exitstatus = $LASTEXITCODE
-}
-
-# Print STDOUT for the script execution
-Write-Output $chefscriptresult
-
-# If this script is launched with -File, the process exit
-# status of PowerShell.exe will be $exitstatus. If it was
-# launched with -Command, it will be 0 if $exitstatus was 0,
-# 1 (i.e. failed) otherwise.
-exit $exitstatus
+        <<~EOH
+          # Chef Client wrapper for powershell_script resources
+
+          # In rare cases, such as when PowerShell is executed
+          # as an alternate user, the new-variable cmdlet is not
+          # available, so import it just in case
+          if ( get-module -ListAvailable Microsoft.PowerShell.Utility )
+          {
+              Import-Module Microsoft.PowerShell.Utility
+          }
+
+          # LASTEXITCODE can be uninitialized -- make it explictly 0
+          # to avoid incorrect detection of failure (non-zero) codes
+          $global:LASTEXITCODE = 0
+
+          # Catch any exceptions -- without this, exceptions will result
+          # In a zero return code instead of the desired non-zero code
+          # that indicates a failure
+          trap [Exception] {write-error ($_.Exception.Message);exit 1}
+
+          # Variable state that should not be accessible to the user code
+          new-variable -name interpolatedexitcode -visibility private -value $#{new_resource.convert_boolean_return}
+          new-variable -name chefscriptresult -visibility private
+
+          # Initialize a variable we use to capture $? inside a block
+          $global:lastcmdlet = $null
+
+          # Execute the user's code in a script block --
+          $chefscriptresult =
+          {
+           #{new_resource.code}
+
+           # This assignment doesn't affect the block's return value
+           $global:lastcmdlet = $?
+          }.invokereturnasis()
+
+          # Assume failure status of 1 -- success cases
+          # will have to override this
+          $exitstatus = 1
+
+          # If convert_boolean_return is enabled, the block's return value
+          # gets precedence in determining our exit status
+          if ($interpolatedexitcode -and $chefscriptresult -ne $null -and $chefscriptresult.gettype().name -eq 'boolean')
+          {
+            $exitstatus = [int32](!$chefscriptresult)
+          }
+          elseif ($lastcmdlet)
+          {
+            # Otherwise, a successful cmdlet execution defines the status
+            $exitstatus = 0
+          }
+          elseif ( $LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0 )
+          {
+            # If the cmdlet status is failed, allow the Win32 status
+            # in $LASTEXITCODE to define exit status. This handles the case
+            # where no cmdlets, only Win32 processes have run since $?
+            # will be set to $false whenever a Win32 process returns a non-zero
+            # status.
+            $exitstatus = $LASTEXITCODE
+          }
+
+          # Print STDOUT for the script execution
+          Write-Output $chefscriptresult
+
+          # If this script is launched with -File, the process exit
+          # status of PowerShell.exe will be $exitstatus. If it was
+          # launched with -Command, it will be 0 if $exitstatus was 0,
+          # 1 (i.e. failed) otherwise.
+          exit $exitstatus
 EOH
       end
 

data/lib/chef/provider/reboot.rb

@@ -45,10 +45,10 @@ class Chef
       # @return [void]
       def request_reboot
         node.run_context.request_reboot(
-          :delay_mins => new_resource.delay_mins,
-          :reason => new_resource.reason,
-          :timestamp => Time.now,
-          :requested_by => new_resource.name
+          delay_mins: new_resource.delay_mins,
+          reason: new_resource.reason,
+          timestamp: Time.now,
+          requested_by: new_resource.name
           )
       end
 

data/lib/chef/provider/registry_key.rb

@@ -68,7 +68,7 @@ class Chef
 
       def key_missing?(values, name)
         values.each do |v|
-          return true unless v.has_key?(name)
+          return true unless v.key?(name)
         end
         false
       end
@@ -120,7 +120,7 @@ class Chef
           end
         end
         new_resource.unscrubbed_values.each do |value|
-          if @name_hash.has_key?(value[:name].downcase)
+          if @name_hash.key?(value[:name].downcase)
             current_value = @name_hash[value[:name].downcase]
             if [:dword, :dword_big_endian, :qword].include? value[:type]
               value[:data] = value[:data].to_i
@@ -151,7 +151,7 @@ class Chef
           end
         end
         new_resource.unscrubbed_values.each do |value|
-          unless @name_hash.has_key?(value[:name].downcase)
+          unless @name_hash.key?(value[:name].downcase)
             converge_by_value = value
             converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive
 
@@ -165,7 +165,7 @@ class Chef
       def action_delete
         if registry.key_exists?(new_resource.key)
           new_resource.unscrubbed_values.each do |value|
-            if @name_hash.has_key?(value[:name].downcase)
+            if @name_hash.key?(value[:name].downcase)
               converge_by_value = value
               converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive
 

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

@@ -146,11 +146,11 @@ class Chef
 
         def load_json_data
           path = sanitized_cache_file_path(sanitized_cache_file_basename)
-          if Chef::FileCache.has_key?(path)
+          if Chef::FileCache.key?(path)
             Chef::FileCache.load(path)
           else
             old_path = sanitized_cache_file_path(sanitized_cache_file_basename_md5)
-            if Chef::FileCache.has_key?(old_path)
+            if Chef::FileCache.key?(old_path)
               # We found an old cache control data file. We started using sha256 instead of md5
               # to name these. Upgrade the file to the new name.
               Chef::Log.trace("Found old cache control data file at #{old_path}. Moving to #{path}.")

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

@@ -58,7 +58,7 @@ class Chef
 
         def sftp
           host = port ? "#{hostname}:#{port}" : hostname
-          @sftp ||= Net::SFTP.start(host, user, :password => pass)
+          @sftp ||= Net::SFTP.start(host, user, password: pass)
         end
 
         def pass

data/lib/chef/provider/resource_update.rb

@@ -31,7 +31,7 @@ class Chef
 
       attr_accessor :type
       attr_accessor :name
-      attr_accessor :duration #ms
+      attr_accessor :duration # ms
       attr_accessor :status
       attr_accessor :initial_state
       attr_accessor :final_state

data/lib/chef/provider/route.rb

@@ -133,7 +133,7 @@ class Chef
         else
           command = generate_command(:add)
           converge_by("run #{command.join(' ')} to add route") do
-            shell_out_compact!(command)
+            shell_out!(command)
             logger.info("#{new_resource} added")
           end
         end
@@ -146,7 +146,7 @@ class Chef
         if is_running
           command = generate_command(:delete)
           converge_by("run #{command.join(' ')} to delete route ") do
-            shell_out_compact!(command)
+            shell_out!(command)
             logger.info("#{new_resource} removed")
           end
         else

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

@@ -31,8 +31,8 @@ class Chef
 
         attr_reader :init_command, :rc_conf, :rc_conf_local, :enabled_state_found
 
-        RC_CONF_PATH = "/etc/rc.conf"
-        RC_CONF_LOCAL_PATH = "/etc/rc.conf.local"
+        RC_CONF_PATH = "/etc/rc.conf".freeze
+        RC_CONF_LOCAL_PATH = "/etc/rc.conf.local".freeze
 
         def initialize(new_resource, run_context)
           super
@@ -116,7 +116,7 @@ class Chef
               old_list = rc_conf_local.match(/^pkg_scripts="(.*)"/)
               old_list = old_list ? old_list[1].split(" ") : []
               new_list = old_list - [new_resource.service_name]
-              update_rcl rc_conf_local.sub(/^pkg_scripts="(.*)"/, pkg_scripts = "#{new_list.join(' ')}")
+              update_rcl rc_conf_local.sub(/^pkg_scripts="(.*)"/, pkg_scripts = (new_list.join(" ")).to_s)
             end
           end
         end

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

@@ -81,7 +81,7 @@ class Chef
           super
 
           if ::File.exists?("/sbin/chkconfig")
-            chkconfig = shell_out!("/sbin/chkconfig --list #{current_resource.service_name}", :returns => [0, 1])
+            chkconfig = shell_out!("/sbin/chkconfig --list #{current_resource.service_name}", returns: [0, 1])
             unless run_levels.nil? || run_levels.empty?
               all_levels_match = true
               chkconfig.stdout.split(/\s+/)[1..-1].each do |level|

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

@@ -163,6 +163,7 @@ class Chef
         end
 
         def ps_cmd
+          # XXX: magic attributes are a shitty api, need something better here and deprecate this attribute
           @run_context.node[:command] && @run_context.node[:command][:ps]
         end
       end

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

@@ -80,7 +80,7 @@ class Chef
         end
 
         def service_status
-          cmd = shell_out!(@status_command, "-l", @current_resource.service_name, :returns => [0, 1])
+          cmd = shell_out!(@status_command, "-l", @current_resource.service_name, returns: [0, 1])
           # Example output
           # $ svcs -l rsyslog
           # fmri         svc:/application/rsyslog:default

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

@@ -79,10 +79,10 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
     if new_resource.user
       uid = Etc.getpwnam(new_resource.user).uid
       options = {
-        :environment => {
+        environment: {
           "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/#{uid}/bus",
         },
-        :user => new_resource.user,
+        user: new_resource.user,
       }
       args = "--user"
     else

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

@@ -33,23 +33,23 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
   include Chef::ReservedNames::Win32::API::Error rescue LoadError
   include Chef::Win32ServiceConstants
 
-  #Win32::Service.get_start_type
-  AUTO_START = "auto start"
-  MANUAL = "demand start"
-  DISABLED = "disabled"
-
-  #Win32::Service.get_current_state
-  RUNNING = "running"
-  STOPPED = "stopped"
-  CONTINUE_PENDING = "continue pending"
-  PAUSE_PENDING = "pause pending"
-  PAUSED = "paused"
-  START_PENDING = "start pending"
-  STOP_PENDING  = "stop pending"
+  # Win32::Service.get_start_type
+  AUTO_START = "auto start".freeze
+  MANUAL = "demand start".freeze
+  DISABLED = "disabled".freeze
+
+  # Win32::Service.get_current_state
+  RUNNING = "running".freeze
+  STOPPED = "stopped".freeze
+  CONTINUE_PENDING = "continue pending".freeze
+  PAUSE_PENDING = "pause pending".freeze
+  PAUSED = "paused".freeze
+  START_PENDING = "start pending".freeze
+  STOP_PENDING  = "stop pending".freeze
 
   TIMEOUT = 60
 
-  SERVICE_RIGHT = "SeServiceLogonRight"
+  SERVICE_RIGHT = "SeServiceLogonRight".freeze
 
   def load_current_resource
     @current_resource = Chef::Resource::WindowsService.new(new_resource.name)
@@ -94,7 +94,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
       logger.info "#{@new_resource} configured with #{new_config.inspect}"
 
       # LocalSystem is the default runas user, which is a special service account that should ultimately have the rights of BUILTIN\Administrators, but we wouldn't see that from get_account_right
-      if new_config.has_key?(:service_start_name) && new_config[:service_start_name].casecmp("localsystem") != 0
+      if new_config.key?(:service_start_name) && new_config[:service_start_name].casecmp("localsystem") != 0
         unless Chef::ReservedNames::Win32::Security.get_account_right(canonicalize_username(new_config[:service_start_name])).include?(SERVICE_RIGHT)
           grant_service_logon(new_config[:service_start_name])
         end
@@ -361,8 +361,8 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
 
     logger.trace "#{@new_resource.name} setting start_type to #{type}"
     Win32::Service.configure(
-      :service_name => @new_resource.service_name,
-      :start_type => startup_type
+      service_name: @new_resource.service_name,
+      start_type: startup_type
     )
     @new_resource.updated_by_last_action(true)
   end

data/lib/chef/provider/subversion.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-#TODO subversion and git should both extend from a base SCM provider.
+# TODO subversion and git should both extend from a base SCM provider.
 
 require "chef/log"
 require "chef/provider"
@@ -126,7 +126,7 @@ class Chef
             new_resource.revision
           else
             command = scm(:info, new_resource.repository, new_resource.svn_info_args, authentication, "-r#{new_resource.revision}")
-            svn_info = shell_out!(command, run_options(:cwd => cwd, :returns => [0, 1])).stdout
+            svn_info = shell_out!(command, run_options(cwd: cwd, returns: [0, 1])).stdout
 
             extract_revision_info(svn_info)
           end
@@ -138,7 +138,7 @@ class Chef
       def find_current_revision
         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
+        svn_info = shell_out!(command, run_options(cwd: cwd, returns: [0, 1])).stdout
 
         extract_revision_info(svn_info)
       end