Merge pull request #45 from Sixt/master

migrate to aws-sdk 3

Author: atomita

Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in fluent-plugin-aws-elasticsearch-service.gemspec
 gemspec
 
-gem 'fluent-plugin-elasticsearch', "~> 2.0.0.rc.1", require: false
-gem 'aws-sdk', '~> 2', require: false
-gem 'faraday_middleware-aws-signers-v4', '>= 0.1.0', '< 0.1.2', require: false
+gem 'fluent-plugin-elasticsearch', "~> 2.4.0", require: false
+gem 'aws-sdk', '~> 3', require: false
+gem 'faraday_middleware-aws-sigv4', '>= 0.2.4', '< 0.3.0', require: false

fluent-plugin-aws-elasticsearch-service.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_runtime_dependency "fluentd", "~> 0"
-  spec.add_runtime_dependency "fluent-plugin-elasticsearch", "~> 2.0.0.rc.1"
-  spec.add_runtime_dependency "aws-sdk", "~> 2"
-  spec.add_runtime_dependency "faraday_middleware-aws-signers-v4", ">= 0.1.0", "< 0.1.2"
+  spec.add_runtime_dependency "fluent-plugin-elasticsearch", "~> 2.4.0"
+  spec.add_runtime_dependency "aws-sdk", "~> 3"
+  spec.add_runtime_dependency "faraday_middleware-aws-sigv4", ">= 0.2.4", "< 0.3.0"
 end

lib/fluent/plugin/out_aws-elasticsearch-service.rb

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'fluent/plugin/out_elasticsearch'
 require 'aws-sdk'
-require 'faraday_middleware/aws_signers_v4'
+require 'faraday_middleware/aws_sigv4'
 
 
 module Fluent::Plugin
@@ -157,7 +157,7 @@ def __build_connections
               def __aws_elasticsearch_service_setting(host, &block)
                 lambda do |faraday|
                   if host[:aws_elasticsearch_service]
-                    faraday.request :aws_signers_v4,
+                    faraday.request :aws_sigv4,
                                     credentials: host[:aws_elasticsearch_service][:credentials],
                                     service_name: 'es',
                                     region: host[:aws_elasticsearch_service][:region]
@@ -178,7 +178,7 @@ def __aws_elasticsearch_service_setting(host, &block)
 #
 # monkey patch
 #
-class FaradayMiddleware::AwsSignersV4
+class FaradayMiddleware::AwsSigV4
 
   alias :initialize_origin_from_aws_elasticsearch_service_output :initialize
 
@@ -192,14 +192,14 @@ def initialize(app, options = nil)
       begin
         if credentials.is_a?(Proc)
           signer = lambda do
-            Aws::Signers::V4.new(credentials.call, service_name, region)
+            Aws::Sigv4::Signer.new(service: service_name, region: region, credentials: credentials.call)
           end
-          def signer.sign(req)
-            self.call.sign(req)
+          def signer.sign_request(req)
+            self.call.sign_request(req)
           end
           signer
         else
-          Aws::Signers::V4.new(credentials, service_name, region)
+          Aws::Sigv4::Signer.new(service: service_name, region: region, credentials: credentials)
         end
       end