[OC-3553] convert http_request provider to non-deprecated APIs

1 files changed, 24 insertions, 41 deletions

diff --git a/lib/chef/provider/http_request.rb b/lib/chef/provider/http_request.rb
index 0ea5f8289f..184e17e409 100644
--- a/lib/chef/provider/http_request.rb
+++ b/lib/chef/provider/http_request.rb
@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,13 +36,9 @@ class Chef
       def action_head
         message = check_message(@new_resource.message)
         # returns true from Chef::REST if returns 2XX (Net::HTTPSuccess)
-        modified = @rest.run_request(
-          :HEAD,
-          @rest.create_url("#{@new_resource.url}?message=#{message}"),
+        modified = @rest.head(
+          "#{@new_resource.url}?message=#{message}",
           @new_resource.headers,
-          false,
-          10,
-          false
         )
         Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
         Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
@@ -53,76 +49,63 @@ class Chef
       end
 
       # Send a GET request to @new_resource.url, with ?message=@new_resource.message
-      def action_get  
+      def action_get
         converge_by("#{@new_resource} GET to #{@new_resource.url}") do
 
           message = check_message(@new_resource.message)
-          body = @rest.run_request(
-            :GET, 
-            @rest.create_url("#{@new_resource.url}?message=#{message}"),
-            @new_resource.headers,
+          body = @rest.get(
+            "#{@new_resource.url}?message=#{message}",
             false,
-            10,
-            false
+            @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful")
           Chef::Log.debug("#{@new_resource} GET request response: #{body}")
         end
       end
-      
+
       # Send a PUT request to @new_resource.url, with the message as the payload
-      def action_put 
+      def action_put
         converge_by("#{@new_resource} PUT to #{@new_resource.url}") do
           message = check_message(@new_resource.message)
-          body = @rest.run_request(
-            :PUT,
-            @rest.create_url("#{@new_resource.url}"),
-            @new_resource.headers,
+          body = @rest.put(
+            "#{@new_resource.url}",
             message,
-            10,
-            false
+            @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} PUT to #{@new_resource.url} successful")
           Chef::Log.debug("#{@new_resource} PUT request response: #{body}")
         end
       end
-      
+
       # Send a POST request to @new_resource.url, with the message as the payload
       def action_post
         converge_by("#{@new_resource} POST to #{@new_resource.url}") do
           message = check_message(@new_resource.message)
-          body = @rest.run_request(
-            :POST,
-            @rest.create_url("#{@new_resource.url}"),
-            @new_resource.headers,
+          body = @rest.post(
+            "#{@new_resource.url}",
             message,
-            10,
-            false
+            @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful")
           Chef::Log.debug("#{@new_resource} POST request response: #{body}")
         end
       end
-      
+
       # Send a DELETE request to @new_resource.url
       def action_delete
         converge_by("#{@new_resource} DELETE to #{@new_resource.url}") do
-          body = @rest.run_request(
-            :DELETE,
-            @rest.create_url("#{@new_resource.url}"),
-            @new_resource.headers,
-            false,
-            10,
-            false
+          body = @rest.delete(
+            "#{@new_resource.url}",
+            @new_resource.headers
           )
           @new_resource.updated_by_last_action(true)
           Chef::Log.info("#{@new_resource} DELETE to #{@new_resource.url} successful")
           Chef::Log.debug("#{@new_resource} DELETE request response: #{body}")
         end
       end
-      
+
       private
-        
+
         def check_message(message)
           if message.kind_of?(Proc)
             message.call
@@ -130,7 +113,7 @@ class Chef
             message
           end
         end
-      
+
     end
   end
 end