From 070ee92bcb8c9bb8a40ecd4b314a11e8df07a8b3 Mon Sep 17 00:00:00 2001 From: Jeff Gran Date: Wed, 13 Mar 2024 15:09:34 -0600 Subject: [PATCH] Update for faraday 2 compatibility --- lib/sumologic.rb | 6 +++--- sumologic.gemspec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/sumologic.rb b/lib/sumologic.rb index 2d79173..424dda6 100644 --- a/lib/sumologic.rb +++ b/lib/sumologic.rb @@ -1,5 +1,5 @@ require 'faraday' -require 'faraday_middleware' +require 'faraday/follow_redirects' require 'faraday-cookie_jar' require 'multi_json' @@ -14,9 +14,9 @@ def initialize(access_id=nil, access_key=nil, endpoint=SumoLogic::URL) @endpoint = endpoint headers = {'Content-Type' => 'application/json', 'Accept' => 'application/json'} @http = Faraday.new(url: @endpoint, headers: headers) do |conn| - conn.basic_auth(access_id, access_key) - conn.use FaradayMiddleware::FollowRedirects, limit: 5 + conn.use Faraday::FollowRedirects::Middleware, limit: 5 conn.use :cookie_jar + conn.request :authorization, :basic, access_id, access_key conn.request :json conn.response :json, content_type: 'application/json' conn.adapter Faraday.default_adapter diff --git a/sumologic.gemspec b/sumologic.gemspec index 3170fd8..9e560dc 100644 --- a/sumologic.gemspec +++ b/sumologic.gemspec @@ -24,9 +24,9 @@ Gem::Specification.new do |s| s.test_files = s.files.grep(%r{^(test|spec|features)/}) s.require_paths = ['lib'] s.required_ruby_version = '>= 2.0.0' - s.add_runtime_dependency 'faraday', '~> 1.10', '>= 1.10.3' - s.add_runtime_dependency 'faraday_middleware', '~> 1.2', '>= 1.2.0' - s.add_runtime_dependency 'faraday-cookie_jar', '~> 0', '>= 0' + s.add_runtime_dependency 'faraday' + s.add_runtime_dependency 'faraday-follow_redirects' + s.add_runtime_dependency 'faraday-cookie_jar' s.add_runtime_dependency 'multi_json', '~> 1' s.add_development_dependency 'bundler', '~> 2' s.add_development_dependency 'coveralls', '~> 0'