Dropped support for faraday_middleware-aws-signers-v4, part 2 [skip ci]

Andrew Kane
1 parent 4c0c2437
Showing 1 changed file with 3 additions and 16 deletions Show diff stats
lib/searchkick.rb
@@ -78,7 +78,7 @@ module Searchkick
           retry_on_failure: 2
         }.deep_merge(client_options)) do |f|
           f.use Searchkick::Middleware
-          f.request signer_middleware_key, signer_middleware_aws_params if aws_credentials
+          f.request :aws_sigv4, signer_middleware_aws_params if aws_credentials
         end
       else
         # TODO figure out error type
@@ -90,7 +90,7 @@ module Searchkick
           retry_on_failure: 2
         }.deep_merge(client_options)) do |f|
           f.use Searchkick::Middleware
-          f.request signer_middleware_key, signer_middleware_aws_params if aws_credentials
+          f.request :aws_sigv4, signer_middleware_aws_params if aws_credentials
         end
       end
     end
@@ -265,21 +265,8 @@ module Searchkick
   end
  
   # private
-  def self.signer_middleware_key
-    defined?(FaradayMiddleware::AwsSignersV4) ? :aws_signers_v4 : :aws_sigv4
-  end
-
-  # private
   def self.signer_middleware_aws_params
-    if signer_middleware_key == :aws_sigv4
-      {service: "es", region: "us-east-1"}.merge(aws_credentials)
-    else
-      {
-        credentials: aws_credentials[:credentials] || Aws::Credentials.new(aws_credentials[:access_key_id], aws_credentials[:secret_access_key]),
-        service_name: "es",
-        region: aws_credentials[:region] || "us-east-1"
-      }
-    end
+    {service: "es", region: "us-east-1"}.merge(aws_credentials)
   end
  
   # private
...	...	@@ -78,7 +78,7 @@ module Searchkick
78	78	retry_on_failure: 2
79	79	}.deep_merge(client_options)) do \|f\|
80	80	f.use Searchkick::Middleware
81		- f.request signer_middleware_key, signer_middleware_aws_params if aws_credentials
	81	+ f.request :aws_sigv4, signer_middleware_aws_params if aws_credentials
82	82	end
83	83	else
84	84	# TODO figure out error type
...	...	@@ -90,7 +90,7 @@ module Searchkick
90	90	retry_on_failure: 2
91	91	}.deep_merge(client_options)) do \|f\|
92	92	f.use Searchkick::Middleware
93		- f.request signer_middleware_key, signer_middleware_aws_params if aws_credentials
	93	+ f.request :aws_sigv4, signer_middleware_aws_params if aws_credentials
94	94	end
95	95	end
96	96	end
...	...	@@ -265,21 +265,8 @@ module Searchkick
265	265	end
266	266
267	267	# private
268		- def self.signer_middleware_key
269		- defined?(FaradayMiddleware::AwsSignersV4) ? :aws_signers_v4 : :aws_sigv4
270		- end
271		-
272		- # private
273	268	def self.signer_middleware_aws_params
274		- if signer_middleware_key == :aws_sigv4
275		- {service: "es", region: "us-east-1"}.merge(aws_credentials)
276		- else
277		- {
278		- credentials: aws_credentials[:credentials] \|\| Aws::Credentials.new(aws_credentials[:access_key_id], aws_credentials[:secret_access_key]),
279		- service_name: "es",
280		- region: aws_credentials[:region] \|\| "us-east-1"
281		- }
282		- end
	269	+ {service: "es", region: "us-east-1"}.merge(aws_credentials)
283	270	end
284	271
285	272	# private
...	...