chef 17.7.29-universal-mingw32 → 17.9.42-universal-mingw32

data/lib/chef/application/base.rb

@@ -254,7 +254,7 @@ class Chef::Application::Base < Chef::Application
     short: "-K KEY_FILE",
     long: "--validation_key KEY_FILE",
     description: "Set the validation key file location, used for registering new clients.",
-    proc: nil
+    proc: lambda { |argument| File.expand_path(argument) }
 
   option :client_key,
     short: "-k KEY_FILE",

data/lib/chef/application/exit_code.rb

@@ -90,45 +90,31 @@ class Chef
         end
 
         def reboot_scheduled?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::Reboot
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::Reboot)
         end
 
         def reboot_needed?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::RebootPending
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::RebootPending)
         end
 
         def reboot_failed?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::RebootFailed
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::RebootFailed)
         end
 
         def configuration_failure?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::ConfigurationError
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::ConfigurationError)
         end
 
         def client_upgraded?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::ClientUpgraded
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::ClientUpgraded)
         end
 
         def sigint_received?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::SigInt
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::SigInt)
         end
 
         def sigterm_received?(exception)
-          resolve_exception_array(exception).any? do |e|
-            e.is_a? Chef::Exceptions::SigTerm
-          end
+          resolve_exception_array(exception).any?(Chef::Exceptions::SigTerm)
         end
 
         def resolve_exception_array(exception)

data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb

@@ -38,7 +38,7 @@ class Chef
 
           def read
             tmpfile = rest.streaming_request(file[:url])
-            File.open(tmpfile, "rb", &:read)
+            File.binread(tmpfile)
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "Timeout reading #{file[:url]}: #{e}")
           rescue Net::HTTPClientException => e