Merge pull request #37 from jeremymv2/fix_use_ssl_value_changed_error

fix: use_ssl value has changed error
chef-boneyard · Apr 29, 2016 · a4b7a28 · a4b7a28
2 parents 1b19dfd + f33a7c1
commit a4b7a28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/libraries/profile.rb b/libraries/profile.rb
@@ -52,10 +52,11 @@ class ComplianceProfile < Chef::Resource # rubocop:disable Metrics/ClassLength
 
         tf = Tempfile.new('foo', Dir.tmpdir, 'wb+')
         tf.binmode
-        Net::HTTP.start(url.host, url.port) do |http|
-          http.use_ssl = url.scheme == 'https'
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE # FIXME
 
+        opts = { use_ssl: url.scheme == 'https',
+                 verify_mode: OpenSSL::SSL::VERIFY_NONE, # FIXME
+        }
+        Net::HTTP.start(url.host, url.port, opts) do |http|
           resp = with_http_rescue do
             http.get(url.path, 'Authorization' => "Bearer #{token}")
           end

diff --git a/libraries/report.rb b/libraries/report.rb
@@ -43,10 +43,10 @@ class ComplianceReport < Chef::Resource
         req = Net::HTTP::Post.new(url, { 'Authorization' => "Bearer #{token}" })
         req.body = blob.to_json
 
-        Net::HTTP.start(url.host, url.port) do |http|
-          http.use_ssl = url.scheme == 'https'
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE # FIXME
-
+        opts = { use_ssl: url.scheme == 'https',
+                 verify_mode: OpenSSL::SSL::VERIFY_NONE, # FIXME
+        }
+        Net::HTTP.start(url.host, url.port, opts) do |http|
           with_http_rescue do
             http.request(req)
           end