fixing the api_client chef library's save method to expect 409 instead of 403 when client already exists, and also fixing the chef_server_rest method in role, node, api_client, data_bag, data_bag_item

Author: Nuo Yan

chef-server-webui/app/controllers/nodes.rb

@@ -118,12 +118,11 @@ def create
 
   def update
     begin
-      @node = Chef::Node.load(params[:id])
-    rescue Net::HTTPServerException => e
-      raise NotFound, "Cannot load node #{params[:id]}"
-    end
-
-    begin
+      begin
+        @node = Chef::Node.load(params[:id])
+      rescue Net::HTTPServerException => e
+        raise NotFound, "Cannot load node #{params[:id]}"
+      end
       @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
       @node.attribute = JSON.parse(params[:attributes])
       @node.save

chef-server-webui/app/controllers/roles.rb

@@ -122,12 +122,11 @@ def create
   # PUT /roles/:id
   def update
     begin
-      @role = Chef::Role.load(params[:id])
-    rescue Net::HTTPServerException => e
-      raise NotFound, "Cannot load role #{params[:id]}"
-    end
-
-    begin
+      begin
+        @role = Chef::Role.load(params[:id])
+      rescue Net::HTTPServerException => e
+        raise NotFound, "Cannot load role #{params[:id]}"
+      end
       @role.run_list(params[:for_role] ? params[:for_role] : [])
       @role.description(params[:description]) if params[:description] != ''
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''

chef/lib/chef/api_client.rb

@@ -70,6 +70,14 @@ def initialize(couchdb=nil)
       @admin = false
       @couchdb = (couchdb || Chef::CouchDB.new)
     end
+    
+    def chef_server_rest
+      self.class.chef_server_rest
+    end
+    
+    def self.chef_server_rest
+      Chef::REST.new(Chef::Config[:chef_server_url])
+    end
 
     # Gets or sets the client name.
     #
@@ -181,7 +189,7 @@ def self.list(inflate=false)
         end
         response
       else
-        Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("clients")
+        chef_server_rest.get_rest("clients")
       end
     end
 
@@ -195,7 +203,7 @@ def self.cdb_load(name, couchdb=nil)
 
     # Load a client by name via the API
     def self.load(name)
-      response = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("clients/#{name}")
+      response = chef_server_rest.get_rest("clients/#{name}")
       if response.kind_of?(Chef::ApiClient)
         response
       else
@@ -215,7 +223,7 @@ def cdb_destroy
 
     # Remove this client via the REST API
     def destroy
-      Chef::REST.new(Chef::Config[:chef_server_url]).delete_rest("clients/#{@name}")
+      chef_server_rest.delete_rest("clients/#{@name}")
     end
 
     # Save this client to the CouchDB
@@ -228,14 +236,14 @@ def save(new_key=false, validation=false)
       if validation
         r = Chef::REST.new(Chef::Config[:chef_server_url], Chef::Config[:validation_client_name], Chef::Config[:validation_key])
       else
-        r = Chef::REST.new(Chef::Config[:chef_server_url])
+        r = chef_server_rest
       end
       # First, try and create a new registration
       begin
         r.post_rest("clients", {:name => self.name, :admin => self.admin })
       rescue Net::HTTPServerException => e
         # If that fails, go ahead and try and update it
-        if e.response.code == "403"
+        if e.response.code == "409"
           r.put_rest("clients/#{name}", { :name => self.name, :admin => self.admin, :private_key => new_key }) 
         else
           raise e
@@ -245,7 +253,7 @@ def save(new_key=false, validation=false)
 
     # Create the client via the REST API
     def create
-      Chef::REST.new(Chef::Config[:chef_server_url]).post_rest("clients", self)
+      chef_server_rest.post_rest("clients", self)
     end
 
     # Set up our CouchDB design document

chef/lib/chef/data_bag.rb

@@ -102,6 +102,10 @@ def to_json(*a)
     end
 
     def chef_server_rest
+      self.class.chef_server_rest
+    end
+    
+    def self.chef_server_rest
       Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
@@ -131,7 +135,7 @@ def self.list(inflate=false)
         end
         response
       else
-        Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data")
+        chef_server_rest.get_rest("data")
       end
     end
 
@@ -142,7 +146,7 @@ def self.cdb_load(name, couchdb=nil)
 
     # Load a Data Bag by name via the RESTful API
     def self.load(name)
-      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{name}")
+      chef_server_rest.get_rest("data/#{name}")
     end
 
     # Remove this Data Bag from CouchDB

chef/lib/chef/data_bag_item.rb

@@ -71,7 +71,11 @@ def initialize(couchdb=nil)
     end
 
     def chef_server_rest
-      Chef::REST.new(Chef::Config[:chef_server_url])      
+      self.class.chef_server_rest
+    end
+    
+    def self.chef_server_rest
+      Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
     def raw_data
@@ -163,7 +167,7 @@ def self.cdb_load(data_bag, name, couchdb=nil)
 
     # Load a Data Bag Item by name via RESTful API
     def self.load(data_bag, name)
-      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{data_bag}/#{name}")
+      chef_server_rest.get_rest("data/#{data_bag}/#{name}")
     end
 
     # Remove this Data Bag Item from CouchDB

chef/lib/chef/node.rb

@@ -153,7 +153,11 @@ def couchdb_id=(value)
     end
 
     def chef_server_rest
-      Chef::REST.new(Chef::Config[:chef_server_url])      
+      self.class.chef_server_rest
+    end
+    
+    def self.chef_server_rest
+      Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
     # Find a recipe for this Chef::Node by fqdn.  Will search first for 
@@ -356,7 +360,7 @@ def self.list(inflate=false)
         end
         response
       else
-        Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("nodes")
+        chef_server_rest.get_rest("nodes")
       end
     end
 
@@ -375,7 +379,7 @@ def self.exists?(nodename, couchdb)
 
     # Load a node by name
     def self.load(name)
-      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("nodes/#{name}")
+      chef_server_rest.get_rest("nodes/#{name}")
     end
 
     # Remove this node from the CouchDB

chef/lib/chef/role.rb

@@ -80,6 +80,10 @@ def couchdb_id=(value)
     end
 
     def chef_server_rest
+      self.class.chef_server_rest
+    end
+    
+    def self.chef_server_rest
       Chef::REST.new(Chef::Config[:chef_server_url])
     end
 

chef/lib/chef/webui_user.rb

@@ -72,6 +72,14 @@ def name=(n)
       @name = n.gsub(/\./, '_')
     end
 
+    def chef_server_rest
+      self.class.chef_server_rest
+    end
+    
+    def self.chef_server_rest
+      Chef::REST.new(Chef::Config[:chef_server_url])
+    end
+    
     def admin?
       admin
     end
@@ -130,7 +138,7 @@ def self.cdb_list(inflate=false)
     end
 
     def self.list(inflate=false)
-      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      r = chef_server_rest
       if inflate
         response = Hash.new
         Chef::Search::Query.new.search(:user) do |n|
@@ -149,8 +157,7 @@ def self.cdb_load(name)
 
     # Load a User by name
     def self.load(name)
-      r = Chef::REST.new(Chef::Config[:chef_server_url])
-      r.get_rest("users/#{name}")
+      chef_server_rest.get_rest("users/#{name}")
     end
 
 
@@ -166,8 +173,7 @@ def cdb_destroy
 
     # Remove this WebUIUser via the REST API
     def destroy
-      r = Chef::REST.new(Chef::Config[:chef_server_url])
-      r.delete_rest("users/#{@name}")
+      chef_server_rest.delete_rest("users/#{@name}")
     end
 
     # Save this WebUIUser to the CouchDB
@@ -178,7 +184,7 @@ def cdb_save
 
     # Save this WebUIUser via the REST API
     def save
-      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      r = chef_server_rest
       begin
         r.put_rest("users/#{@name}", self)
       rescue Net::HTTPServerException => e
@@ -193,8 +199,7 @@ def save
 
     # Create the WebUIUser via the REST API
     def create
-      r = Chef::REST.new(Chef::Config[:chef_server_url])
-      r.post_rest("users", self)
+      chef_server_rest.post_rest("users", self)
       self
     end