1 files changed, 16 insertions, 14 deletions

diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb
index 0e9617f98c..4eb118d3bc 100644
--- a/lib/chef/cookbook_version.rb
+++ b/lib/chef/cookbook_version.rb
@@ -25,6 +25,7 @@ require 'chef/cookbook/metadata'
 require 'chef/version_class'
 require 'chef/digester'
 require 'chef/cookbook_manifest'
+require 'chef/server_api'
 
 class Chef
 
@@ -459,11 +460,13 @@ class Chef
     end
     private :preferences_for_path
 
-    def self.json_create(o)
-      cookbook_version = new(o["cookbook_name"])
+    def self.from_hash(o)
+      cookbook_version = new(o["cookbook_name"] || o["name"])
+
       # We want the Chef::Cookbook::Metadata object to always be inflated
       cookbook_version.metadata = Chef::Cookbook::Metadata.from_hash(o["metadata"])
       cookbook_version.manifest = o
+      cookbook_version.identifier = o["identifier"] if o.key?("identifier")
 
       # We don't need the following step when we decide to stop supporting deprecated operators in the metadata (e.g. <<, >>)
       cookbook_version.manifest["metadata"] = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(cookbook_version.metadata))
@@ -472,13 +475,12 @@ class Chef
       cookbook_version
     end
 
+    def self.json_create(o)
+      from_hash(o)
+    end
+
     def self.from_cb_artifact_data(o)
-      cookbook_version = new(o["name"])
-      # We want the Chef::Cookbook::Metadata object to always be inflated
-      cookbook_version.metadata = Chef::Cookbook::Metadata.from_hash(o["metadata"])
-      cookbook_version.manifest = o
-      cookbook_version.identifier = o["identifier"]
-      cookbook_version
+      from_hash(o)
     end
 
     # @deprecated This method was used by the Ruby Chef Server and is no longer
@@ -543,22 +545,22 @@ class Chef
     end
 
     def self.chef_server_rest
-      Chef::REST.new(Chef::Config[:chef_server_url])
+      Chef::ServerAPI.new(Chef::Config[:chef_server_url])
     end
 
     def destroy
-      chef_server_rest.delete_rest("cookbooks/#{name}/#{version}")
+      chef_server_rest.delete("cookbooks/#{name}/#{version}")
       self
     end
 
     def self.load(name, version="_latest")
       version = "_latest" if version == "latest"
-      chef_server_rest.get_rest("cookbooks/#{name}/#{version}")
+      from_hash(chef_server_rest.get("cookbooks/#{name}/#{version}"))
     end
 
     # The API returns only a single version of each cookbook in the result from the cookbooks method
     def self.list
-      chef_server_rest.get_rest('cookbooks')
+      chef_server_rest.get('cookbooks')
     end
 
     # Alias latest_cookbooks as list
@@ -567,7 +569,7 @@ class Chef
     end
 
     def self.list_all_versions
-      chef_server_rest.get_rest('cookbooks?num_versions=all')
+      chef_server_rest.get('cookbooks?num_versions=all')
     end
 
     ##
@@ -577,7 +579,7 @@ class Chef
     # [String]::  Array of cookbook versions, which are strings like 'x.y.z'
     # nil::       if the cookbook doesn't exist. an error will also be logged.
     def self.available_versions(cookbook_name)
-      chef_server_rest.get_rest("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
+      chef_server_rest.get("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
         cb["version"]
       end
     rescue Net::HTTPServerException => e