feat(deps): update to faraday 2

lib/scalingo/api/client.rb

@@ -106,11 +106,7 @@ def authenticated_connection
         @connection = Faraday.new(connection_options) { |conn|
           conn.response :json, content_type: /\bjson$/, parser_options: {symbolize_names: true}
           conn.request :json
-
-          if token_holder.token&.value
-            auth_header = Faraday::Request::Authorization.header "Bearer", token_holder.token.value
-            conn.headers[Faraday::Request::Authorization::KEY] = auth_header
-          end
+          conn.request :authorization, "Bearer", -> { token_holder.token&.value }
 
           conn.adapter(config.faraday_adapter) if config.faraday_adapter
         }
@@ -123,12 +119,7 @@ def database_connection(database_id)
         @database_connections[database_id] ||= Faraday.new(connection_options) { |conn|
           conn.response :json, content_type: /\bjson$/, parser_options: {symbolize_names: true}
           conn.request :json
-
-          bearer_token = token_holder.database_tokens[database_id]&.value
-          if bearer_token
-            auth_header = Faraday::Request::Authorization.header "Bearer", bearer_token
-            conn.headers[Faraday::Request::Authorization::KEY] = auth_header
-          end
+          conn.request :authorization, "Bearer", -> { token_holder.database_tokens[database_id]&.value }
 
           conn.adapter(config.faraday_adapter) if config.faraday_adapter
         }

lib/scalingo/auth/tokens.rb

@@ -5,7 +5,7 @@ class Auth::Tokens < API::Endpoint
     def exchange(token, headers = nil, &block)
       data = nil
 
-      authorization = Faraday::Request::BasicAuthentication.header("", token)
+      authorization = Faraday::Utils.basic_header_from("", token)
 
       request_headers = {
         Faraday::Request::Authorization::KEY => authorization

lib/scalingo/core_client.rb

@@ -1,6 +1,5 @@
 require "forwardable"
 require "faraday"
-require "faraday_middleware"
 require "scalingo/token_holder"
 require "scalingo/errors"
 

scalingo.gemspec

@@ -33,8 +33,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "activesupport", [">= 5", "< 8"]
-  s.add_dependency "faraday", "~> 1.0"
-  s.add_dependency "faraday_middleware", "~> 1.0"
+  s.add_dependency "faraday", "~> 2.0"
   s.add_dependency "multi_json", ">= 1.0.3", "~> 1.0"
 
   s.add_development_dependency "bundler", "~> 2.0"
@@ -43,5 +42,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "standard", "~> 1.32"
   s.add_development_dependency "rubocop-rspec"
   s.add_development_dependency "pry", "~> 0.14.1"
-  s.add_development_dependency "webmock", "~> 3.12.2"
+  s.add_development_dependency "webmock", "~> 3.19"
 end

spec/scalingo/api/client_spec.rb

@@ -164,8 +164,13 @@
     end
 
     context "with bearer token" do
+      before { stub_request(:any, "localhost") }
+
       it "has an authentication header set with a bearer scheme" do
-        expect(subject.connection.headers["Authorization"]).to eq "Bearer #{subject.token_holder.token.value}"
+        request_headers = subject.connection.get("/").env.request_headers
+        expected = "Bearer #{subject.token_holder.token.value}"
+
+        expect(request_headers["Authorization"]).to eq(expected)
       end
     end
   end
@@ -184,14 +189,20 @@
     end
 
     context "with bearer token" do
+      before { stub_request(:any, "localhost") }
+
       it "has an authentication header set with a bearer scheme" do
         scalingo.authenticate_database_with_bearer_token(
           database_id,
           "1234",
           expires_at: Time.now + 1.hour,
-          raise_on_expired_token: false,
+          raise_on_expired_token: false
         )
-        expect(subject.database_connection(database_id).headers["Authorization"]).to eq "Bearer #{subject.token_holder.database_tokens[database_id].value}"
+
+        request_headers = subject.database_connection(database_id).get("/").env.request_headers
+        expected = "Bearer #{subject.token_holder.database_tokens[database_id].value}"
+
+        expect(request_headers["Authorization"]).to eq(expected)
       end
     end
 

spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "bundler/setup"
 require "scalingo"
+require "active_support/all"
 
 pattern = File.join(File.expand_path(__dir__), "support", "**", "*.rb")