fluent-plugin-aws-elasticsearch-service 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8385875d796c005689e289afd4d23ec3df97bf
-  data.tar.gz: 9b55914cce79cfd7c2513721d8a81dda81c93e8a
+  metadata.gz: 8487d9f3cb8b4f95c44a8c6c79212ca5e3b3952f
+  data.tar.gz: c21e9da418a2f889eabbc426405d5249cc9c67e5
 SHA512:
-  metadata.gz: 43c2bb93d76c85f6409e072bf2a7562b500227e300b7a3f19d0285a328bf9f25199d3fb3a850e5593c65444a7cd98d68c694d61b17dd39663d3d33bd9f1ac155
-  data.tar.gz: 01b06dea5b0ee5ea9e3c5517d7c52e6a3cc3f2ac1c392657400c1b0be9a8bfd987adf7b34029d1da88cba51ff23f28dd8b26df04dde4b126d10d5f83df9f88d8
+  metadata.gz: a52e380406e69697d50586040631f3fd7a0f82a4995a378cab310941c9ed26d56ff947a1ae614bbd0451ee5b72cf87d8bef9a3dc3be9f025151b74dcaeeff5d8
+  data.tar.gz: 6b6ee495ef5a6e4b19d06306e73d4e8fd169c04d8f57f697bdb076dd4e8e47fd56ef267099add94ade3ed5320d1b901e4e3f18219c1489204608de836ef36fa0

data/fluent-plugin-aws-elasticsearch-service.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-aws-elasticsearch-service"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["atomita"]
   spec.email         = ["sleeping.cait.sith+gh@gmail.com"]
 

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

@@ -55,7 +55,7 @@ module Fluent
     # get AWS Credentials
     #
     def credentials(access_key, secret_key)
-      lambda do
+      calback = lambda do
         credentials = nil
         if access_key.empty? or secret_key.empty?
           credentials   = Aws::InstanceProfileCredentials.new.credentials
@@ -64,6 +64,11 @@ module Fluent
         credentials ||= Aws::Credentials.new access_key, secret_key
         credentials
       end
+      def calback.inspect
+        credentials = self.call
+        "#<#{credentials.class.name} access_key_id=#{credentials.access_key_id.inspect}>"
+      end
+      calback
     end
 
   end
@@ -118,7 +123,7 @@ module Fluent
                 lambda do |faraday|
                   if host[:aws_elasticsearch_service]
                     faraday.request :aws_signers_v4,
-                                    credentials: host[:aws_elasticsearch_service][:credentials].call,
+                                    credentials: host[:aws_elasticsearch_service][:credentials],
                                     service_name: 'es',
                                     region: host[:aws_elasticsearch_service][:region]
                   end
@@ -133,3 +138,36 @@ module Fluent
 
   end
 end
+
+
+#
+# monkey patch
+#
+class FaradayMiddleware::AwsSignersV4
+
+  alias :initialize_origin_from_aws_elasticsearch_service_output :initialize
+
+  def initialize(app, options = nil)
+    super(app)
+
+    credentials = options.fetch(:credentials)
+    service_name = options.fetch(:service_name)
+    region = options.fetch(:region)
+    @signer =
+      begin
+        if credentials.is_a?(Proc)
+          signer = lambda do
+            Aws::Signers::V4.new(credentials.call, service_name, region)
+          end
+          def signer.sign(req)
+            self.call.sign(req)
+          end
+          signer
+        else
+          Aws::Signers::V4.new(credentials, service_name, region)
+        end
+      end
+
+    @net_http = app.is_a?(Faraday::Adapter::NetHttp)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-aws-elasticsearch-service
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - atomita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler