1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From 06b7fa2d12706072db85a8deb3479936bde8f622 Mon Sep 17 00:00:00 2001
From: Ankit Honey <honeyankit@github.com>
Date: Wed, 19 Apr 2023 18:34:36 -0700
Subject: [PATCH 1/6] Updating faraday to version 2.0
Updating faraday to version 2.0
---
azure-storage-common.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/azure-storage-common.gemspec
+++ b/azure-storage-common.gemspec
@@ -28,8 +28,9 @@ Gem::Specification.new do |s|
if s.respond_to? :add_runtime_dependency then
s.add_development_dependency(%q<bundler>.freeze, ["~> 1.11"])
s.add_development_dependency(%q<dotenv>.freeze, ["~> 2.0"])
- s.add_runtime_dependency(%q<faraday>.freeze, ["~> 1.0"])
- s.add_runtime_dependency(%q<faraday_middleware>.freeze, [">= 1.0"])
+ s.add_runtime_dependency(%q<faraday>.freeze, ["~> 2.0"])
+ s.add_runtime_dependency(%q<faraday-follow_redirects>.freeze, ["~> 0.4.0"])
+ s.add_runtime_dependency(%q<faraday-net_http_persistent>.freeze, ["~> 2.0"])
s.add_development_dependency(%q<minitest>.freeze, ["~> 5"])
s.add_development_dependency(%q<minitest-reporters>.freeze, ["~> 1"])
s.add_development_dependency(%q<mocha>.freeze, ["~> 1.0"])
@@ -41,8 +42,9 @@ Gem::Specification.new do |s|
else
s.add_dependency(%q<bundler>.freeze, ["~> 1.11"])
s.add_dependency(%q<dotenv>.freeze, ["~> 2.0"])
- s.add_dependency(%q<faraday>.freeze, ["~> 1.0"])
- s.add_dependency(%q<faraday_middleware>.freeze, [">= 1.0"])
+ s.add_dependency(%q<faraday>.freeze, ["~> 2.0"])
+ s.add_dependency(%q<faraday-follow_redirects>.freeze, ["~> 0.4.0"])
+ s.add_dependency(%q<faraday-net_http_persistent>.freeze, ["~> 2.0"])
s.add_dependency(%q<minitest>.freeze, ["~> 5"])
s.add_dependency(%q<minitest-reporters>.freeze, ["~> 1"])
s.add_dependency(%q<mocha>.freeze, ["~> 1.0"])
--- a/lib/azure/core.rb
+++ b/lib/azure/core.rb
@@ -16,7 +16,8 @@
require 'rubygems'
require 'nokogiri'
require 'faraday'
-require 'faraday_middleware'
+require 'faraday/follow_redirects'
+require 'faraday/net_http_persistent'
module Azure
module Core
--- a/lib/azure/storage/common/autoload.rb
+++ b/lib/azure/storage/common/autoload.rb
@@ -30,7 +30,7 @@ require "base64"
require "openssl"
require "uri"
require "faraday"
-require "faraday_middleware"
+require 'faraday/follow_redirects'
require "azure/storage/common/core/autoload"
require "azure/storage/common/default"
--- a/lib/azure/storage/common/core/http_client.rb
+++ b/lib/azure/storage/common/core/http_client.rb
@@ -71,7 +71,7 @@ module Azure::Storage::Common::Core
URI::parse(ENV["HTTPS_PROXY"])
end || nil
Faraday.new(uri, ssl: ssl_options, proxy: proxy_options) do |conn|
- conn.use FaradayMiddleware::FollowRedirects
+ conn.response :follow_redirects #use Faraday::FollowRedirects::Middleware
conn.adapter :net_http_persistent, pool_size: 5 do |http|
# yields Net::HTTP::Persistent
http.idle_timeout = 100
|
