summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2012-12-13 16:32:40 -0800
committerdanielsdeleo <dan@opscode.com>2012-12-14 18:28:41 -0800
commit82f1d5d01d1bd0d7fe8920f26f13f9b938922254 (patch)
tree863c9ee1e5cc4776893e918b6cee5cf1f0841b21
parent3c164ca9ea96c89e1db9128cb5dc87ff006af152 (diff)
downloadchef-82f1d5d01d1bd0d7fe8920f26f13f9b938922254.tar.gz
[CHEF-3689] don't set private key from JSON when not present
ApiClient.json_parse would fail on a response from the server with "private_key": false. Also, make ApiClient.inspect a bit nicer
-rw-r--r--chef/lib/chef/api_client.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/chef/lib/chef/api_client.rb b/chef/lib/chef/api_client.rb
index 53f62324a2..02dd34d0d5 100644
--- a/chef/lib/chef/api_client.rb
+++ b/chef/lib/chef/api_client.rb
@@ -164,7 +164,7 @@ class Chef
def self.json_create(o)
client = Chef::ApiClient.new
client.name(o["name"] || o["clientname"])
- client.private_key(o["private_key"])
+ client.private_key(o["private_key"]) if o["private_key"]
client.public_key(o["public_key"])
client.admin(o["admin"])
client.couchdb_rev = o["_rev"]
@@ -284,8 +284,8 @@ class Chef
end
def inspect
- "Chef::ApiClient name:'#{name}' admin:'#{admin.inspect}'" +
- "public_key:'#{public_key}' private_key:#{private_key}"
+ "Chef::ApiClient name:'#{name}' admin:'#{admin.inspect}' " +
+ "public_key:'#{public_key}' private_key:'#{private_key}'"
end
end