Convert all uses of Chef::REST to Chef::ServerAPItm/no_more_rest

In the process, stop auto-expanding JSON in the HTTP client, and let
individual classes control that themselves.

Fixes #2737, Fixes #3518

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 2820f58e85..34e437c82f 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -26,14 +26,16 @@ require 'chef/mixin/path_sanity'
 require 'chef/knife/core/subcommand_loader'
 require 'chef/knife/core/ui'
 require 'chef/local_mode'
-require 'chef/rest'
+require 'chef/server_api'
 require 'chef/http/authenticator'
+require 'chef/http/http_request'
+require 'chef/http'
 require 'pp'
 
 class Chef
   class Knife
 
-    Chef::REST::RESTRequest.user_agent = "Chef Knife#{Chef::REST::RESTRequest::UA_COMMON}"
+    Chef::HTTP::HTTPRequest.user_agent = "Chef Knife#{Chef::HTTP::HTTPRequest::UA_COMMON}"
 
     include Mixlib::CLI
     include Chef::Mixin::PathSanity
@@ -551,15 +553,15 @@ class Chef
 
     def rest
       @rest ||= begin
-        require 'chef/rest'
-        Chef::REST.new(Chef::Config[:chef_server_url])
+        require 'chef/server_api'
+        Chef::ServerAPI.new(Chef::Config[:chef_server_url])
       end
     end
 
     def noauth_rest
       @rest ||= begin
-        require 'chef/rest'
-        Chef::REST.new(Chef::Config[:chef_server_url], false, false)
+        require 'chef/http/simple_json'
+        Chef::HTTP::SimpleJSON.new(Chef::Config[:chef_server_url])
       end
     end