lib/conjur/api.rb in conjur-api-4.19.0 vs lib/conjur/api.rb in conjur-api-4.19.1

@@ -40,27 +40,34 @@
 require 'conjur/core-api'
 require 'conjur/layer-api'
 require 'conjur/pubkeys-api'
 require 'conjur-api/version'
 
-class RestClient::Resource
-  include Conjur::Escape
-  include Conjur::LogSource
-  include Conjur::Cast
-  extend  Conjur::BuildFromResponse
-
+# Monkey patch RestClient::Request so it always uses
+# :ssl_cert_store. (RestClient::Resource uses Request to send
+# requests, so it sees :ssl_cert_store, too).
+class RestClient::Request
   alias_method :initialize_without_defaults, :initialize
 
-  def initialize url, options = nil, &block
-    initialize_without_defaults url, default_options.merge(options || {}), &block
-  end
-
-  def default_options
+  def default_args
     {
       ssl_cert_store: OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE
     }
   end
   
+  def initialize args
+    initialize_without_defaults default_args.merge(args)
+  end
+  
+end
+
+    
+class RestClient::Resource
+  include Conjur::Escape
+  include Conjur::LogSource
+  include Conjur::Cast
+  extend  Conjur::BuildFromResponse
+
   # @api private
   # @deprecated
   # The account used by the core service.  This  is deprecated in favor of {Conjur.account} and
   # {Conjur::Configuration#account}.
   # @return [String] the core account