diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-12-07 11:15:23 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-01-03 10:53:48 -0800 |
| commit | 10db9b3a50eae9c4c966f39f5beca8f5c17d441e (patch) | |
| tree | 596bb3da0bcd1e2fe9a24e3a376fd6223cb6156f /lib/chef/user_v1.rb | |
| parent | 94ba9c022e57feb2949e22656d811a843b3410f1 (diff) | |
| download | chef-10db9b3a50eae9c4c966f39f5beca8f5c17d441e.tar.gz | |
change HTTPServerException to HTTPClientException for ruby 2.6
includes backcompat for 2.5
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/user_v1.rb')
| -rw-r--r-- | lib/chef/user_v1.rb | 8 |
1 files changed, 4 insertions, 4 deletions
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"] |