diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-02-19 16:44:48 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-02-19 16:44:48 -0800 |
| commit | d8fbc2505da27aab787985446630999aa0eeab0f (patch) | |
| tree | bf486ae12dbd8ec6168be3ff29e976c895b37e4d /lib/chef | |
| parent | 38f8d2ac45a24a88bea9a035c576fadec292e9e6 (diff) | |
| download | chef-d8fbc2505da27aab787985446630999aa0eeab0f.tar.gz | |
Update HTTPServerException to be HTTPClientExceptionnet_http_deprecations
Avoid deprecation warnings. Also remove the monkeypatch that provided
HTTPClientException on older Ruby releases since we're 2.6+ now and we
don't need this.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/monkey_patches/net_http.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource/chef_vault_secret.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/chef/monkey_patches/net_http.rb b/lib/chef/monkey_patches/net_http.rb index 07918a8c1f..42007d23a7 100644 --- a/lib/chef/monkey_patches/net_http.rb +++ b/lib/chef/monkey_patches/net_http.rb @@ -5,10 +5,6 @@ module ChefNetHTTPExceptionExtensions attr_accessor :chef_rest_request end -unless defined?(Net::HTTPClientException) - Net::HTTPClientException = Net::HTTPServerException -end - require "net/http" unless defined?(Net::HTTP) module Net class HTTPError diff --git a/lib/chef/resource/chef_vault_secret.rb b/lib/chef/resource/chef_vault_secret.rb index a2292439e6..598b494afc 100644 --- a/lib/chef/resource/chef_vault_secret.rb +++ b/lib/chef/resource/chef_vault_secret.rb @@ -80,7 +80,7 @@ class Chef search item.search rescue ChefVault::Exceptions::KeysNotFound current_value_does_not_exist! - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e current_value_does_not_exist! if e.response_code == "404" end end |