Support faraday-1.8

.github/workflows/test.yml

@@ -16,13 +16,7 @@ jobs:
           - 2.6
           - 2.7
         gemfile:
-          - gemfiles/faraday_0.15.gemfile
-          - gemfiles/faraday_0.16.gemfile
-          - gemfiles/faraday_0.17.gemfile
-          - gemfiles/faraday_1.0.gemfile
-          - gemfiles/faraday_1.1.gemfile
-          - gemfiles/faraday_1.2.gemfile
-          - gemfiles/faraday_1.3.gemfile
+          - gemfiles/faraday_1.8.gemfile
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:

Appraisals

@@ -1,29 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'faraday-0.15' do
-  gem 'faraday', '~> 0.15.0'
-end
-
-appraise 'faraday-0.16' do
-  gem 'faraday', '~> 0.16.0'
-end
-
-appraise 'faraday-0.17' do
-  gem 'faraday', '~> 0.17.0'
-end
-
-appraise 'faraday-1.0' do
-  gem 'faraday', '~> 1.0.0'
-end
-
-appraise 'faraday-1.1' do
-  gem 'faraday', '~> 1.1.0'
-end
-
-appraise 'faraday-1.2' do
-  gem 'faraday', '~> 1.2.0'
-end
-
-appraise 'faraday-1.3' do
-  gem 'faraday', '~> 1.3.0'
+appraise 'faraday-1.8' do
+  gem 'faraday', '~> 1.8.0'
 end

faraday_middleware-aws-sigv4.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '>= 0.15'
 
   spec.add_development_dependency 'appraisal', '>= 2.2'
-  spec.add_development_dependency 'aws-sdk-core', '~> 3.14.0'
+  spec.add_development_dependency 'aws-sdk-core', '>= 3.124.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faraday_middleware'
   spec.add_development_dependency 'rake'
@@ -38,4 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-lcov'
   spec.add_development_dependency 'timecop'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

gemfiles/faraday_1.1.gemfile → gemfiles/faraday_1.8.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "faraday", "~> 1.1.0"
+gem "faraday", "~> 1.8.0"
 
 gemspec path: "../"

spec/faraday_middleware/aws_sigv4_instance_profile_credentials_spec.rb

@@ -59,7 +59,7 @@ def faraday(options = {}, &block)
                   'AccessKeyId' => "akid#{Time.now.to_i}",
                   'SecretAccessKey' => "secret#{Time.now.to_i}",
                   'Token' => "token#{Time.now.to_i}",
-                  'Expiration' => Time.now + 3600
+                  'Expiration' => (Time.now + 3600).xmlschema
                 })
     }
   end
@@ -82,13 +82,7 @@ def faraday(options = {}, &block)
     )
 
     expect(account_headers.fetch('authorization')).to match Regexp.new(format(authz_tmpl, access_key_id: 'akid1420070400', signature: "(#{%w[
-      8a7679e7f6e14faa3c5bc8e585f16416bba04883767b651169f745e987908c04
-      0593f7578c038c94d3d463d5b1ed0fa8b4c4f5525c7abb08ae6c095d9df5fb61
-      bb9d431b7be57abce9d81b4b4fd62036eec4d9d4e9dc44ad95b1166a8b16c3f4
-      3dd176d303ac2227e8522eb13413670657821280569556d289047e6ae2ccd975
-      14af79b17c4e94c9582512125daa97f19b19b04d0b8d605d68a02bded3948770
-      05ffc543834d0e93920a4abc60d63f3855b829260877b9c350822eff129e60f9
-      ef99e44bec3dc9abfad2c4cfa0203c7d80e979c840038ca6d700cec5b0c85ebe
+      fb00a1d58f5fbeccae37f980c076e1d2755d4098716c0b31e04f1dc9acbb6c15
     ].join('|')})"))
 
     # 50 minutes after
@@ -102,13 +96,7 @@ def faraday(options = {}, &block)
     )
 
     expect(account_headers.fetch('authorization')).to match Regexp.new(format(authz_tmpl, access_key_id: 'akid1420070400', signature: "(#{%w[
-      936d7c18c31135cb0baebe62ada628644a4c24efcadce044ceb650bc04e3fe1d
-      891f865c1a1297ed133589cd2abb575fd998b66cf79a0505941f50ef3405576b
-      816c7f811b60426fb2cd232ae3a5c6568f5150058bdaa99e3233b61fe8ab7668
-      053ed3702ade746b97a3aeba3f4bfdd06154b0c7d0cc50fa9ba3db81385f6110
-      8ac6851c02183ca987e91116262c9afe24662aff4a7f2dcb67b8d9212cd2d4ba
-      a86dcfb7ddc4a60477601814aa3a17e24d278ba0d58844f5c9188b9ce630837d
-      6dbd5c1d235a959f7191ec12493eb020213e04c1318d33ed3b4808cbe396867e
+      3c003d5155a8e2bcae27c4825ebd545fc0f49b464b8f32ead0861826173797f4
     ].join('|')})"))
 
     # 10 minutes after
@@ -122,13 +110,7 @@ def faraday(options = {}, &block)
     )
 
     expect(account_headers.fetch('authorization')).to match Regexp.new(format(authz_tmpl, access_key_id: 'akid1420074000', signature: "(#{%w[
-      42b4050c22d246f66c13357186a87bb2891ea0bebf7663cec398f9a12d869133
-      f264df5cb2359d8b9d491ff48bd57237d9260f01ebf638455ca18c3dab8beb2d
-      7e8b319cb3ab3d36bd4a6b34d411c03f88891d2266adcc9498573c4ee33d2088
-      dca2842cb07926a4929af3708165ca2897207ca729cab19c1deb518d5d492848
-      c17ee288dfc7e4598e333765b85e0305959ba33835453b7c2885b7d43aabb4f2
-      ae6e1e133d0b033b29ec7050c43ebf0ddd0162b6c82e1e85d01dd11b62569fe0
-      12c302b9062b0ee1a659b2d2f1fe89a1886b83a17974f43bc65e569e74f3da0c
+      208a3aee002d4d23c0af1bc0aa8c8c20cedaf4e98c955d8f80010b322a8f48fe
     ].join('|')})"))
   end
 end

spec/faraday_middleware/aws_sigv4_spec.rb

@@ -51,8 +51,8 @@ def faraday(options = {}, &block)
       'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
       'authorization' =>
       'AWS4-HMAC-SHA256 Credential=akid/20150101/us-east-1/apigateway/aws4_request, ' \
-        "SignedHeaders=#{signed_headers}, " \
-        "Signature=#{signature}" }
+      "SignedHeaders=#{signed_headers}, " \
+      "Signature=#{signature}" }
   end
 
   let(:additional_expected_headers) { {} }
@@ -76,13 +76,7 @@ def faraday(options = {}, &block)
   context 'without query' do
     let(:signature) do
       "(#{%w[
-        4029fcbe5aae50c588651d5a587f4a9fd2b7ba25bc03e1ce57432c758d1a7816
-        024535e1dd5a9f9eb5a8d2eb99c64678766ad6059bdd51ad85d282f49bd20700
-        f15f7c05bba9addb232e39282ea70a7a7c7f2c52dffd4aafe6cc8226fb82d5ab
-        f4299dc8cdf28ee680bb882712daf8fac89c1bcfd46f28549bd37b9412d18b72
-        afb745a953d7e80be81d81ed5425a0a7340cea4d8baf42470bd2c0cda14e5103
-        300f2ca52b5520e67a39900a0850b8691710382a124c14de6f5d741bcf136704
-        daa64ff3387cfee9b4676cf540d5db1093c117df7e24a37ff9badc7ffcc95ede
+        619cd780d0eaf2c01fc5afb41f2437f93da2b4a2e0c0cd5997bbc3dfe774c9f5
       ].join('|')})"
     end
 
@@ -96,13 +90,7 @@ def faraday(options = {}, &block)
     context 'include space' do
       let(:signature) do
         "(#{%w[
-          75bb1b4dbbf7b7a502ecb574abfcc2e12ce115da07f876d3b66fd3ff0ad427fd
-          f0a9030e2e15012d61af8b708ad358c9a5e5495984162884abf1cb910275223b
-          b13ce117f8258ebc4c157b1d216517f38476d80d6a60ace9374d0ec8d500134d
-          53df7eeeaec828ce3c8ca011ee35f20ab620fe1d8610ff00e6a57cab642d2436
-          51e82ebaf936d6dc7a673723240a954b35ac5992e7da3408e25d14715fe24aca
-          ba63e75f4a2635130bfa2484595227b1244c41638713906b470f5ea0e215cb8a
-          bb4a14dc499ed57c9951e39e790c1e622cb15fd6bd1545335893cf9f8209a8d1
+          95226e86cf00547332b3d74dc05e28836b308da50c228470da745f211721278e
         ].join('|')})"
       end
 
@@ -113,13 +101,7 @@ def faraday(options = {}, &block)
     context 'not include space' do
       let(:signature) do
         "(#{%w[
-          94e01cc599b3eef64cc9e08c5f079b0345d5b9dd95cc14d0ea66fc0c5923bf30
-          8c58f5f0decfb7f185d290bae83dac382328ba19c862861fd646089ba0083569
-          115cea2f319d5cf12bd4fa35b8861eaded8037dad4ccc7e8c8929d150ddf3d66
-          552a531f290603c378a4d01a2a307ba4b356c7e7364ac03b337e80085733b61e
-          3d61f6bd2c027925d3da79c87a69b5b77b595687a5c06576c2d8ff66db459415
-          405004d0ffaa9ba489a1eec3760e08f790f8a066ff1334c243e28a271026c773
-          c2802366b46fbf4d832f8917484c93d0cb4b4cc1f7512f3745a42cd9b13da78b
+          1b1d9b93b83c50214e3dc582f14587d72706ecf0acab8838cf122fa9dc3e9b62
         ].join('|')})"
       end