diff options
Diffstat (limited to 'lib/chef')
52 files changed, 85 insertions, 73 deletions
diff --git a/lib/chef/api_client.rb b/lib/chef/api_client.rb index 550aa6bd3f..1bd06652c5 100644 --- a/lib/chef/api_client.rb +++ b/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 }) diff --git a/lib/chef/api_client/registration.rb b/lib/chef/api_client/registration.rb index 6cbb071020..dd214d7812 100644 --- a/lib/chef/api_client/registration.rb +++ b/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" diff --git a/lib/chef/api_client_v1.rb b/lib/chef/api_client_v1.rb index 8ce06ea780..3a2dafa3a8 100644 --- a/lib/chef/api_client_v1.rb +++ b/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) diff --git a/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb b/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb index 3951f1a7e6..98091eaf9a 100644 --- a/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +++ b/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 diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb index 9b0ea18cd8..a619dc75bf 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +++ b/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) diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb index 6b4657ae6a..a680daacc0 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +++ b/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, $!) diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb index e0eca5f6de..04d48d4e8e 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +++ b/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") diff --git a/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb b/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb index ee0ecd3b40..0102ea2844 100644 --- a/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +++ b/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 diff --git a/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb b/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb index 205aa9fd86..6c7dd7b477 100644 --- a/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb +++ b/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 diff --git a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb index c81e880744..e56c68ffae 100644 --- a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +++ b/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 diff --git a/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb b/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb index 344a3deecc..02cde95880 100644 --- a/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +++ b/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 diff --git a/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb b/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb index a780ddd97b..a31922d7c8 100644 --- a/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +++ b/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 diff --git a/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb b/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb index 8259db473d..df589a6cc0 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +++ b/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) diff --git a/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb b/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb index df3d393d35..2a8ebd1f5a 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb +++ b/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) diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb index 6ba53fab4b..a58a01ae8c 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +++ b/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) diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb index 876ad7282b..9eaae9c73f 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +++ b/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 diff --git a/lib/chef/client.rb b/lib/chef/client.rb index e668aeee00..15922a5efd 100644 --- a/lib/chef/client.rb +++ b/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") diff --git a/lib/chef/config_fetcher.rb b/lib/chef/config_fetcher.rb index ad03c845ab..d9d100ed00 100644 --- a/lib/chef/config_fetcher.rb +++ b/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 diff --git a/lib/chef/cookbook_uploader.rb b/lib/chef/cookbook_uploader.rb index 5780c61cc9..de367f2455 100644 --- a/lib/chef/cookbook_uploader.rb +++ b/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) diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb index 2ed84e0d9d..8d4eb2e8ab 100644 --- a/lib/chef/cookbook_version.rb +++ b/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 diff --git a/lib/chef/data_bag.rb b/lib/chef/data_bag.rb index edef971830..35b014905f 100644 --- a/lib/chef/data_bag.rb +++ b/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 diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb index 63b4060baa..9804c271c4 100644 --- a/lib/chef/data_bag_item.rb +++ b/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 diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb index c40897d687..1ca035e594 100644 --- a/lib/chef/environment.rb +++ b/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 diff --git a/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb b/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb index a046f1a277..e87ef0da70 100644 --- a/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +++ b/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) diff --git a/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb b/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb index 3bd9b419fa..6ab2816a57 100644 --- a/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb +++ b/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) diff --git a/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb b/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb index a2f77c8287..7b2ccf0d9a 100644 --- a/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +++ b/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) diff --git a/lib/chef/formatters/error_inspectors/registration_error_inspector.rb b/lib/chef/formatters/error_inspectors/registration_error_inspector.rb index 02e8b0d61a..4ca08ca120 100644 --- a/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +++ b/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) diff --git a/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb b/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb index 9d46465947..ac7304df13 100644 --- a/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +++ b/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) diff --git a/lib/chef/http.rb b/lib/chef/http.rb index 3f815b9eff..e9f94e6c92 100644 --- a/lib/chef/http.rb +++ b/lib/chef/http.rb @@ -152,7 +152,7 @@ class Chef response.error! unless success_response?(response) return_value - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e http_attempts += 1 response = e.response if response.kind_of?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0 @@ -190,7 +190,7 @@ class Chef response.error! end tempfile - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e http_attempts += 1 response = e.response if response.kind_of?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0 @@ -245,7 +245,7 @@ class Chef end end tempfile - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e http_attempts += 1 response = e.response if response.kind_of?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0 diff --git a/lib/chef/key.rb b/lib/chef/key.rb index 6971e84d5f..19ed07f608 100644 --- a/lib/chef/key.rb +++ b/lib/chef/key.rb @@ -187,7 +187,7 @@ class Chef def save create - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code == "409" update else diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 6e525bdf3d..2bb6169cc9 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -455,7 +455,7 @@ class Chef case e when SystemExit raise # make sure exit passes through. - when Net::HTTPServerException, Net::HTTPFatalError + when Net::HTTPClientException, Net::HTTPFatalError humanize_http_exception(e) when OpenSSL::SSL::SSLError ui.error "Could not establish a secure connection to the server." diff --git a/lib/chef/knife/bootstrap/client_builder.rb b/lib/chef/knife/bootstrap/client_builder.rb index f5c49ab620..5fb0edc31b 100644 --- a/lib/chef/knife/bootstrap/client_builder.rb +++ b/lib/chef/knife/bootstrap/client_builder.rb @@ -187,7 +187,7 @@ class Chef def resource_exists?(relative_path) rest.get(relative_path) true - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise unless e.response.code == "404" false end diff --git a/lib/chef/knife/cookbook_delete.rb b/lib/chef/knife/cookbook_delete.rb index a4f64747c3..3de35d0a72 100644 --- a/lib/chef/knife/cookbook_delete.rb +++ b/lib/chef/knife/cookbook_delete.rb @@ -88,7 +88,7 @@ class Chef @available_versions ||= rest.get("cookbooks/#{@cookbook_name}").map do |name, url_and_version| url_and_version["versions"].map { |url_by_version| url_by_version["version"] } end.flatten - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.to_s =~ /^404/ ui.error("Cannot find a cookbook named #{@cookbook_name} to delete.") nil diff --git a/lib/chef/knife/cookbook_upload.rb b/lib/chef/knife/cookbook_upload.rb index 4260ee01e2..02bea271b2 100644 --- a/lib/chef/knife/cookbook_upload.rb +++ b/lib/chef/knife/cookbook_upload.rb @@ -205,7 +205,7 @@ class Chef def assert_environment_valid! environment - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code.to_s == "404" ui.error "The environment #{config[:environment]} does not exist on the server, aborting." Log.debug(e) diff --git a/lib/chef/knife/data_bag_create.rb b/lib/chef/knife/data_bag_create.rb index 563e931dca..bf90fb81b3 100644 --- a/lib/chef/knife/data_bag_create.rb +++ b/lib/chef/knife/data_bag_create.rb @@ -53,7 +53,7 @@ class Chef begin rest.get("data/#{@data_bag_name}") ui.info("Data bag #{@data_bag_name} already exists") - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise unless e.to_s =~ /^404/ # if it doesn't exists, try to create it rest.post("data", { "name" => @data_bag_name }) diff --git a/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb index a544dcbfdd..a9a757069b 100644 --- a/lib/chef/knife/raw.rb +++ b/lib/chef/knife/raw.rb @@ -112,7 +112,7 @@ class Chef rescue Timeout::Error => e ui.error "Server timeout" exit 1 - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e ui.error "Server responded with error #{e.response.code} \"#{e.response.message}\"" ui.error "Error Body: #{e.response.body}" if e.response.body && e.response.body != "" exit 1 diff --git a/lib/chef/knife/search.rb b/lib/chef/knife/search.rb index 324c439ddc..168db6da1a 100644 --- a/lib/chef/knife/search.rb +++ b/lib/chef/knife/search.rb @@ -109,7 +109,7 @@ class Chef result_items << formatted_item result_count += 1 end - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e msg = Chef::JSONCompat.from_json(e.response.body)["error"].first ui.error("knife search failed: #{msg}") exit 99 diff --git a/lib/chef/knife/supermarket_share.rb b/lib/chef/knife/supermarket_share.rb index a47e16bd8c..bee90a9113 100644 --- a/lib/chef/knife/supermarket_share.rb +++ b/lib/chef/knife/supermarket_share.rb @@ -116,7 +116,7 @@ class Chef data = noauth_rest.get("#{config[:supermarket_site]}/api/v1/cookbooks/#{@name_args[0]}") data["category"] rescue => e - return "Other" if e.kind_of?(Net::HTTPServerException) && e.response.code == "404" + return "Other" if e.kind_of?(Net::HTTPClientException) && e.response.code == "404" ui.fatal("Unable to reach Supermarket: #{e.message}. Increase log verbosity (-VV) for more information.") Chef::Log.trace("\n#{e.backtrace.join("\n")}") exit(1) diff --git a/lib/chef/knife/supermarket_unshare.rb b/lib/chef/knife/supermarket_unshare.rb index e2dfa33b86..98b6fa5789 100644 --- a/lib/chef/knife/supermarket_unshare.rb +++ b/lib/chef/knife/supermarket_unshare.rb @@ -48,7 +48,7 @@ class Chef begin rest.delete "#{config[:supermarket_site]}/api/v1/cookbooks/#{@name_args[0]}" - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise e unless e.message =~ /Forbidden/ ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it." exit 1 diff --git a/lib/chef/mixin/api_version_request_handling.rb b/lib/chef/mixin/api_version_request_handling.rb index 5b9a588cac..a706e10618 100644 --- a/lib/chef/mixin/api_version_request_handling.rb +++ b/lib/chef/mixin/api_version_request_handling.rb @@ -19,7 +19,7 @@ class Chef module Mixin module ApiVersionRequestHandling - # @param exeception [Net::HTTPServerException] may or may not contain the x-ops-server-api-version header + # @param exeception [Net::HTTPClientException] may or may not contain the x-ops-server-api-version header # supported_client_versions: # @param supported_client_versions [Array<Integer>] The API versions the client supports. # diff --git a/lib/chef/monkey_patches/net_http.rb b/lib/chef/monkey_patches/net_http.rb index 15ccf0fff5..775568639b 100644 --- a/lib/chef/monkey_patches/net_http.rb +++ b/lib/chef/monkey_patches/net_http.rb @@ -5,6 +5,10 @@ module ChefNetHTTPExceptionExtensions attr_accessor :chef_rest_request end +unless defined?(Net::HTTPClientException) + Net::HTTPClientException = Net::HTTPServerException +end + require "net/http" module Net class HTTPError @@ -13,7 +17,7 @@ module Net class HTTPRetriableError include ChefNetHTTPExceptionExtensions end - class HTTPServerException + class HTTPClientException include ChefNetHTTPExceptionExtensions end class HTTPFatalError diff --git a/lib/chef/node.rb b/lib/chef/node.rb index c31fc99279..87418b5732 100644 --- a/lib/chef/node.rb +++ b/lib/chef/node.rb @@ -575,7 +575,7 @@ class Chef def self.find_or_create(node_name) load(node_name) - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise unless e.response.code == "404" node = build(node_name) node.create @@ -608,7 +608,7 @@ class Chef else chef_server_rest.put("nodes/#{name}", data_for_save) end - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code == "404" chef_server_rest.post("nodes", data_for_save) else @@ -622,7 +622,7 @@ class Chef def create chef_server_rest.post("nodes", data_for_save) self - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e # Chef Server before 12.3 rejects node JSON with 'policy_name' or # 'policy_group' keys, but 'policy_name' will be detected first. # Backcompat can be removed in 13.0 @@ -655,7 +655,7 @@ class Chef trimmed_data = data_for_save_without_policyfile_attrs chef_server_rest.put("nodes/#{name}", trimmed_data) - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise e unless e.response.code == "404" chef_server_rest.post("nodes", trimmed_data) end diff --git a/lib/chef/node/mixin/immutablize_array.rb b/lib/chef/node/mixin/immutablize_array.rb index b5e0993cfa..a2b8649268 100644 --- a/lib/chef/node/mixin/immutablize_array.rb +++ b/lib/chef/node/mixin/immutablize_array.rb @@ -34,6 +34,7 @@ class Chef :at, :bsearch, :bsearch_index, + :chain, :chunk, :chunk_while, :collect, @@ -43,6 +44,7 @@ class Chef :count, :cycle, :detect, + :difference, :dig, :drop, :drop_while, @@ -56,6 +58,7 @@ class Chef :empty?, :entries, :fetch, + :filter, :find, :find_all, :find_index, @@ -117,6 +120,7 @@ class Chef :to_plist, :to_set, :transpose, + :union, :uniq, :values_at, :zip, @@ -139,6 +143,7 @@ class Chef :delete_at, :delete_if, :fill, + :filter!, :flatten!, :insert, :keep_if, diff --git a/lib/chef/node/mixin/immutablize_hash.rb b/lib/chef/node/mixin/immutablize_hash.rb index 04ac5418ef..109390ed74 100644 --- a/lib/chef/node/mixin/immutablize_hash.rb +++ b/lib/chef/node/mixin/immutablize_hash.rb @@ -30,6 +30,7 @@ class Chef :all?, :any?, :assoc, + :chain, :chunk, :chunk_while, :collect, @@ -58,6 +59,7 @@ class Chef :entries, :fetch, :fetch_values, + :filter, :find, :find_all, :find_index, @@ -131,6 +133,7 @@ class Chef :default_proc=, :delete, :delete_if, + :filter!, :keep_if, :map!, :merge!, diff --git a/lib/chef/org.rb b/lib/chef/org.rb index afc5cf148d..28702bd314 100644 --- a/lib/chef/org.rb +++ b/lib/chef/org.rb @@ -92,7 +92,7 @@ class Chef def save create - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code == "409" update else diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb index dd1dc40274..3e7462f0ed 100644 --- a/lib/chef/policy_builder/policyfile.rb +++ b/lib/chef/policy_builder/policyfile.rb @@ -311,7 +311,7 @@ class Chef # @api private def policy @policy ||= api_service.get(policyfile_location) - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise ConfigurationError, "Error loading policyfile from `#{policyfile_location}': #{e.class} - #{e.message}" end diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb index 45cc40508c..96ffb5831f 100644 --- a/lib/chef/provider/apt_repository.rb +++ b/lib/chef/provider/apt_repository.rb @@ -271,7 +271,7 @@ class Chef url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}" key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"') install_key_from_keyserver(key_id, "keyserver.ubuntu.com") - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise "Could not access Launchpad ppa API: #{e.message}" end diff --git a/lib/chef/provider/remote_file/content.rb b/lib/chef/provider/remote_file/content.rb index 4cf2c32287..b5f42749e7 100644 --- a/lib/chef/provider/remote_file/content.rb +++ b/lib/chef/provider/remote_file/content.rb @@ -54,7 +54,7 @@ class Chef as_uri(source) end raw_file = grab_file_from_uri(uri) - rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPServerException, Net::HTTPFatalError, Net::FTPError, Errno::ETIMEDOUT => e + rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPClientException, Net::HTTPFatalError, Net::FTPError, Errno::ETIMEDOUT => e logger.warn("#{@new_resource} cannot be downloaded from #{source}: #{e}") if source = sources.shift logger.info("#{@new_resource} trying to download from another mirror") diff --git a/lib/chef/role.rb b/lib/chef/role.rb index fc9a383a1f..31318fbfe3 100644 --- a/lib/chef/role.rb +++ b/lib/chef/role.rb @@ -224,7 +224,7 @@ class Chef def save begin chef_server_rest.put("roles/#{@name}", self) - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e raise e unless e.response.code == "404" chef_server_rest.post("roles", self) end diff --git a/lib/chef/run_list/run_list_expansion.rb b/lib/chef/run_list/run_list_expansion.rb index a679eceba5..97422bee16 100644 --- a/lib/chef/run_list/run_list_expansion.rb +++ b/lib/chef/run_list/run_list_expansion.rb @@ -219,7 +219,7 @@ class Chef def fetch_role(name, included_by) Chef::Role.from_hash(rest.get("roles/#{name}")) - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.message == '404 "Not Found"' role_not_found(name, included_by) else diff --git a/lib/chef/user.rb b/lib/chef/user.rb index f44d38c2d5..9b2c5bc8f0 100644 --- a/lib/chef/user.rb +++ b/lib/chef/user.rb @@ -115,7 +115,7 @@ class Chef def save(new_key = false) create - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code == "409" update(new_key) else diff --git a/lib/chef/user_v1.rb b/lib/chef/user_v1.rb index 949f5b0909..2f35ec8be0 100644 --- a/lib/chef/user_v1.rb +++ b/lib/chef/user_v1.rb @@ -164,7 +164,7 @@ class Chef new_user["public_key"] = new_user["chef_key"]["public_key"] new_user.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) @@ -200,7 +200,7 @@ class Chef payload[:private_key] = new_key if new_key updated_user = chef_root_rest_v1.put("users/#{username}", payload) - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code == "400" # if a 400 is returned but the error message matches the error related to private / public key fields, try V0 # else, raise the 400 @@ -220,7 +220,7 @@ class Chef def save(new_key = false) create - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e if e.response.code == "409" update(new_key) else @@ -235,7 +235,7 @@ class Chef reregistered_self = chef_root_rest_v0.put("users/#{username}", payload) private_key(reregistered_self["private_key"]) # only V0 supported for reregister - 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"] |