diff --git a/lib/netbox_client_ruby.rb b/lib/netbox_client_ruby.rb index 9d7d4c6..62bbf2c 100644 --- a/lib/netbox_client_ruby.rb +++ b/lib/netbox_client_ruby.rb @@ -27,5 +27,6 @@ module NetboxClientRuby setting :adapter, :net_http setting :logger setting :request_options, open_timeout: 1, timeout: 5 + setting :ssl end end diff --git a/lib/netbox_client_ruby/connection.rb b/lib/netbox_client_ruby/connection.rb index 04ea01d..116b962 100644 --- a/lib/netbox_client_ruby/connection.rb +++ b/lib/netbox_client_ruby/connection.rb @@ -35,7 +35,8 @@ def self.netbox_config faraday.request request_encoding faraday.response config.faraday.logger if config.faraday.logger faraday.response :json, content_type: /\bjson$/ - faraday.options.merge NetboxClientRuby.config.faraday.request_options + faraday.options.merge! NetboxClientRuby.config.faraday.request_options + faraday.ssl.merge! NetboxClientRuby.config.faraday.ssl faraday.options.params_encoder = Faraday::FlatParamsEncoder faraday.adapter config.faraday.adapter || Faraday.default_adapter end diff --git a/spec/netbox_client_ruby/connection_spec.rb b/spec/netbox_client_ruby/connection_spec.rb index e361c2b..13040e6 100644 --- a/spec/netbox_client_ruby/connection_spec.rb +++ b/spec/netbox_client_ruby/connection_spec.rb @@ -9,6 +9,8 @@ config.netbox.api_base_url = 'https://netbox.test/api/' config.faraday.adapter = :net_http config.faraday.logger = nil + config.faraday.request_options = {} + config.faraday.ssl = {} end end @@ -61,6 +63,7 @@ config.netbox.auth.token = '2e35594ec8710e9922d14365a1ea66f27ea69450' config.netbox.api_base_url = 'https://netbox.test/api/' config.faraday.adapter = :net_http_persistent + config.faraday.ssl = {} end end @@ -78,6 +81,7 @@ config.netbox.api_base_url = 'https://netbox.test/api/' config.faraday.logger = :logger config.faraday.adapter = :net_http + config.faraday.ssl = {} end end