chef 14.8.12 → 14.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08486082bafcd0e272f4a8fbdcf7677de1260168607f2f1a8a1017d41654ba5
-  data.tar.gz: 63d92a1beb97fef7ef40d566d02e2d6304848c51a0a59251dba9545bdbcdafcc
+  metadata.gz: 526794b697bdaa549867f4a0e1677105d853988a4aabe866304f886c9929ba3b
+  data.tar.gz: d5bebc413c998b69ea27a171946c02da841833404059a2a2c1ecd8c41bdbaaa1
 SHA512:
-  metadata.gz: 123ec76435079d744bf4cd759b33932ea74f3381680b668a34e765f71817c69df7c2d012bbee5039363a26932b1cbda799d8a2abb85725fdbadceb4515f57f2b
-  data.tar.gz: f8265387cc5daaf80506352219cf787a847d4250c121bde4162fb88b62606f04f9120100025bc1fdf7dd98673eae922068f80a81cf1b056fb09c745fb4acd232
+  metadata.gz: 6d55687d4035b05bc142d280aa45f3444003d5f231fcc5b587d757e0e096fe41f8ca6d6dccbb22f3bb91e0f18d1c3ba895609dfe31c1b35f5fe412350dcf602b
+  data.tar.gz: 2f05d0bb2ffd3a87b06a14c95c545f2767418e67904e8c06614e0750fb3898331995df8481d323530e521bc971ac66562b936c5455ea9fee0101a02ccfe09d48

data/Gemfile

@@ -55,7 +55,7 @@ group(:development, :test) do
   gem "webmock"
 
   # for testing new chefstyle rules
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", "=0.11.2"
 end
 
 group(:travis) do

data/chef.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
   s.add_dependency "mixlib-authentication", "~> 2.1"
   s.add_dependency "mixlib-shellout", "~> 2.4"
-  s.add_dependency "mixlib-archive", "~> 0.4"
+  s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 14.0"
 
   s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"

data/lib/chef/api_client.rb

@@ -186,7 +186,7 @@ class Chef
     # Save this client via the REST API, returns a hash including the private key
     def save
       http_api.put("clients/#{name}", { name: name, admin: admin, validator: validator })
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       # If that fails, go ahead and try and update it
       if e.response.code == "404"
         http_api.post("clients", { name: name, admin: admin, validator: validator })

data/lib/chef/api_client/registration.rb

@@ -93,7 +93,7 @@ class Chef
 
       def create_or_update
         create
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         # If create fails because the client exists, attempt to update. This
         # requires admin privileges.
         raise unless e.response.code == "409"

data/lib/chef/api_client_v1.rb

@@ -216,7 +216,7 @@ class Chef
     # Save this client via the REST API, returns a hash including the private key
     def save
       update
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       # If that fails, go ahead and try and update it
       if e.response.code == "404"
         create
@@ -235,7 +235,7 @@ class Chef
         private_key(reregistered_self.private_key)
       end
       self
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       # if there was a 406 related to versioning, give error explaining that
       # only API version 0 is supported for reregister command
       if e.response.code == "406" && e.response["x-ops-server-api-version"]
@@ -266,7 +266,7 @@ class Chef
 
       begin
         new_client = chef_rest_v1.put("clients/#{name}", payload)
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         # rescue API V0 if 406 and the server supports V0
         supported_versions = server_client_api_version_intersection(e, SUPPORTED_API_VERSIONS)
         raise e unless supported_versions && supported_versions.include?(0)
@@ -303,7 +303,7 @@ class Chef
           new_client.delete("chef_key")
         end
 
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         # rescue API V0 if 406 and the server supports V0
         supported_versions = server_client_api_version_intersection(e, SUPPORTED_API_VERSIONS)
         raise e unless supported_versions && supported_versions.include?(0)

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

@@ -51,7 +51,7 @@ class Chef
                 rest.put("#{api_path}/#{permission}", { permission => acls[permission] })
               rescue Timeout::Error => e
                 raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "Timeout writing: #{e}")
-              rescue Net::HTTPServerException => e
+              rescue Net::HTTPClientException => e
                 if e.response.code == "404"
                   raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
                 else

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

@@ -108,7 +108,7 @@ class Chef
                 rest.delete(api_path)
               rescue Timeout::Error => e
                 raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "Timeout deleting: #{e}")
-              rescue Net::HTTPServerException
+              rescue Net::HTTPClientException
                 if $!.response.code == "404"
                   raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
                 else
@@ -182,7 +182,7 @@ class Chef
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "Timeout reading: #{e}")
 
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               if e.response.code == "404"
                 @could_not_get_chef_object = e
                 raise Chef::ChefFS::FileSystem::NotFoundError.new(self, @could_not_get_chef_object)

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

@@ -41,7 +41,7 @@ class Chef
             File.open(tmpfile, "rb") { |f| f.read }
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "Timeout reading #{file[:url]}: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "#{e.message} retrieving #{file[:url]}")
           rescue Errno::ENOENT
             raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)

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

@@ -60,7 +60,7 @@ class Chef
             upload_cookbook(other, options)
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "Timeout writing: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             case e.response.code
             when "409"
               raise Chef::ChefFS::FileSystem::CookbookFrozenError.new(:write, self, e, "Cookbook #{other.name} is frozen")

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

@@ -56,7 +56,7 @@ class Chef
               rest.delete(api_path)
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "Timeout deleting: #{e}")
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               if e.response.code == "404"
                 raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
               else

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

@@ -33,7 +33,7 @@ class Chef
             @children ||= root.get_json(api_path).keys.sort.map { |entry| make_child_entry(entry, true) }
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout getting children: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             if e.response.code == "404"
               raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
             else
@@ -50,7 +50,7 @@ class Chef
               rest.post(api_path, { "name" => name })
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "Timeout creating child '#{name}': #{e}")
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               if e.response.code == "409"
                 raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self, e, "Cannot create #{name} under #{path}: already exists")
               else

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

@@ -33,7 +33,7 @@ class Chef
             end
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             if $!.response.code == "404"
               raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
             else

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

@@ -46,7 +46,7 @@ class Chef
             (desired_invites - invites).each do |invite|
               begin
                 rest.post(api_path, { "user" => invite })
-              rescue Net::HTTPServerException => e
+              rescue Net::HTTPClientException => e
                 if e.response.code == "409"
                   Chef::Log.warn("Could not invite #{invite} to organization #{org}: #{api_error_text(e.response)}")
                 else

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

@@ -45,7 +45,7 @@ class Chef
             (desired_members - members).each do |member|
               begin
                 rest.post(api_path, "username" => member)
-              rescue Net::HTTPServerException => e
+              rescue Net::HTTPClientException => e
                 if %w{404 405}.include?(e.response.code)
                   raise "Chef server at #{api_path} does not allow you to directly add members.  Please either upgrade your Chef server or move the users you want into invitations.json instead of members.json."
                 else

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

@@ -80,7 +80,7 @@ class Chef
             end
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             # 404 = NotFoundError
             if $!.response.code == "404"
               # GET /organizations/ORG/policies returned 404, but that just might be because
@@ -91,7 +91,7 @@ class Chef
                 root.get_json(parent.api_path)
                 # Return empty list if the organization exists but /policies didn't work
                 []
-              rescue Net::HTTPServerException => e
+              rescue Net::HTTPClientException => e
                 if e.response.code == "404"
                   raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
                 end
@@ -131,7 +131,7 @@ class Chef
               rest.post("#{api_path}/#{policy_name}/revisions", object)
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "Timeout creating '#{name}': #{e}")
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               # 404 = NotFoundError
               if e.response.code == "404"
                 raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)

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

@@ -79,7 +79,7 @@ class Chef
 
                 get_data = begin
                   rest.get(policy_path)
-                rescue Net::HTTPServerException => e
+                rescue Net::HTTPClientException => e
                   raise "Could not find policy '#{policy_name}'' with revision '#{policy_data["revision_id"]}'' on the server"
                 end
 
@@ -113,7 +113,7 @@ class Chef
 
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "Timeout creating '#{name}': #{e}")
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               # 404 = NotFoundError
               if e.response.code == "404"
                 raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)

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

@@ -77,7 +77,7 @@ class Chef
             end
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             # 404 = NotFoundError
             if $!.response.code == "404"
 
@@ -90,7 +90,7 @@ class Chef
                   root.get_json(parent.api_path)
                   # Return empty list if the organization exists but /policies didn't work
                   []
-                rescue Net::HTTPServerException => e
+                rescue Net::HTTPClientException => e
                   if e.response.code == "404"
                     raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
                   end
@@ -133,7 +133,7 @@ class Chef
               rest.post(api_path, object)
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "Timeout creating '#{name}': #{e}")
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               # 404 = NotFoundError
               if e.response.code == "404"
                 raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)

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

@@ -72,7 +72,7 @@ class Chef
               begin
                 @this_object_cache = rest.get(api_path)
                 @exists = true
-              rescue Net::HTTPServerException => e
+              rescue Net::HTTPClientException => e
                 if e.response.code == "404"
                   @exists = false
                 else
@@ -91,7 +91,7 @@ class Chef
             rest.delete(api_path)
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "Timeout deleting: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             if e.response.code == "404"
               raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
             else
@@ -108,7 +108,7 @@ class Chef
             @this_object_cache ? JSON.parse(@this_object_cache) : root.get_json(api_path)
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "Timeout reading: #{e}")
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             if $!.response.code == "404"
               raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
             else
@@ -185,7 +185,7 @@ class Chef
               rest.put(api_path, object)
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "Timeout writing: #{e}")
-            rescue Net::HTTPServerException => e
+            rescue Net::HTTPClientException => e
               if e.response.code == "404"
                 raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
               else

data/lib/chef/client.rb

@@ -552,7 +552,7 @@ class Chef
       recipe = Chef::Recipe.new(nil, nil, run_context)
       recipe.from_file(required_recipe_file)
       run_context
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       case e.response
       when Net::HTTPNotFound
         logger.trace("Required Recipe not configured on the server, skipping it")
@@ -604,7 +604,7 @@ class Chef
     # @api private
     #
     def run_ohai
-      filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version} : nil
+      filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package} : nil
       ohai.all_plugins(filter)
       events.ohai_completed(node)
     rescue Ohai::Exceptions::CriticalPluginFailure => e

data/lib/chef/config_fetcher.rb

@@ -39,7 +39,7 @@ class Chef
 
     def fetch_remote_config
       http.get("")
-    rescue SocketError, SystemCallError, Net::HTTPServerException => error
+    rescue SocketError, SystemCallError, Net::HTTPClientException => error
       Chef::Application.fatal!("Cannot fetch config '#{config_location}': '#{error.class}: #{error.message}")
     end
 

data/lib/chef/cookbook_uploader.rb

@@ -84,7 +84,7 @@ class Chef
       retries = 0
       begin
         rest.put(sandbox_url, { is_completed: true })
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         if e.message =~ /^400/ && (retries += 1) <= 5
           sleep 2
           retry
@@ -101,7 +101,7 @@ class Chef
         save_url = opts[:force] ? manifest.force_save_url : manifest.save_url
         begin
           rest.put(save_url, manifest)
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           case e.response.code
           when "409"
             raise Chef::Exceptions::CookbookFrozen, "Version #{cb.version} of cookbook #{cb.name} is frozen. Use --force to override."
@@ -128,7 +128,7 @@ class Chef
         begin
           rest.put(url, file_contents, headers)
           checksums_to_upload.delete(checksum)
-        rescue Net::HTTPServerException, Net::HTTPFatalError, Errno::ECONNREFUSED, Timeout::Error, Errno::ETIMEDOUT, SocketError => e
+        rescue Net::HTTPClientException, Net::HTTPFatalError, Errno::ECONNREFUSED, Timeout::Error, Errno::ETIMEDOUT, SocketError => e
           error_message = "Failed to upload #{file} (#{checksum}) to #{url} : #{e.message}"
           error_message << "\n#{e.response.body}" if e.respond_to?(:response)
           Chef::Knife.ui.error(error_message)

data/lib/chef/cookbook_version.rb

@@ -491,7 +491,7 @@ class Chef
       chef_server_rest.get("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
         cb["version"]
       end
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       if e.to_s =~ /^404/
         Chef::Log.error("Cannot find a cookbook named #{cookbook_name}")
         nil

data/lib/chef/data_bag.rb

@@ -153,7 +153,7 @@ class Chef
         else
           create
         end
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "409"
       end
       self

data/lib/chef/data_bag_item.rb

@@ -168,7 +168,7 @@ class Chef
         else
           r.put("data/#{data_bag}/#{item_id}", self)
         end
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "404"
         r.post("data/#{data_bag}", self)
       end

data/lib/chef/environment.rb

@@ -275,7 +275,7 @@ class Chef
     def save
       begin
         chef_server_rest.put("environments/#{@name}", self)
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "404"
         chef_server_rest.post("environments", self)
       end

data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb

@@ -35,7 +35,7 @@ class Chef
 
         def add_explanation(error_description)
           case exception
-          when Net::HTTPServerException, Net::HTTPFatalError
+          when Net::HTTPClientException, Net::HTTPFatalError
             humanize_http_exception(error_description)
           when EOFError
             describe_eof_error(error_description)

data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb

@@ -41,7 +41,7 @@ class Chef
 
         def add_explanation(error_description)
           case exception
-          when Net::HTTPServerException, Net::HTTPFatalError
+          when Net::HTTPClientException, Net::HTTPFatalError
             humanize_http_exception(error_description)
           when EOFError
             describe_eof_error(error_description)

data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb

@@ -40,7 +40,7 @@ class Chef
 
         def add_explanation(error_description)
           case exception
-          when Net::HTTPServerException, Net::HTTPFatalError
+          when Net::HTTPClientException, Net::HTTPFatalError
             humanize_http_exception(error_description)
           when Chef::Exceptions::PrivateKeyMissing
             error_description.section("Private Key Not Found:", <<~E)

data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb

@@ -23,7 +23,7 @@ class Chef
 
         def add_explanation(error_description)
           case exception
-          when Net::HTTPServerException, Net::HTTPFatalError
+          when Net::HTTPClientException, Net::HTTPFatalError
             humanize_http_exception(error_description)
           when Errno::ECONNREFUSED, Timeout::Error, Errno::ETIMEDOUT, SocketError
             error_description.section("Network Error:", <<~E)

data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb

@@ -41,7 +41,7 @@ class Chef
 
               Your chef_server_url may be misconfigured, or the network could be down.
 E
-          when Net::HTTPServerException, Net::HTTPFatalError
+          when Net::HTTPClientException, Net::HTTPFatalError
             humanize_http_exception(error_description)
           when Chef::Exceptions::MissingRole
             describe_missing_role(error_description)