Allow user to pass nil for client_name and signing_validation_key

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/chef/server_api.rb b/lib/chef/server_api.rb
index 8cdcd7a09d..1eff5cdc02 100644
--- a/lib/chef/server_api.rb
+++ b/lib/chef/server_api.rb
@@ -28,8 +28,14 @@ class Chef
   class ServerAPI < Chef::HTTP
 
     def initialize(url = Chef::Config[:chef_server_url], options = {})
-      options[:client_name] ||= Chef::Config[:node_name]
-      options[:signing_key_filename] ||= Chef::Config[:client_key]
+      # merge will allow even nil keys to overwrite the defaults.
+      # If you *don't* specify :signing_key_filename, we want to grab it from
+      # Chef::Config.  If you specify :signing_key_filename => nil, we want to
+      # leave it nil.
+      options = {
+        :client_name => Chef::Config[:node_name],
+        :signing_key_filename => Chef::Config[:client_key]
+      }.merge(options)
       super(url, options)
     end