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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ac4a8670f077045def48604b9ace4be0c69fa6a
-  data.tar.gz: e12114b45561ff5ac9b9102c56fe26ad0ec83224
+  metadata.gz: da8385875d796c005689e289afd4d23ec3df97bf
+  data.tar.gz: 9b55914cce79cfd7c2513721d8a81dda81c93e8a
 SHA512:
-  metadata.gz: f29e73dc475eb562c23f40c6a9a3d5bb00cdd588047204234539d9c3e5bcd0f72c7d1e5e4a0579e6cb6116e0aaed6782e8623f6c1c9775aaaa8aa7153cbb6cc8
-  data.tar.gz: 7cb1b7ee12eb2ff25feccde9ab4ef79f0994d35b047e19ac906c114e7807f8e19e882ed905b455a0599a890b03399568f42c1eefca2d874d62825075eccb681d
+  metadata.gz: 43c2bb93d76c85f6409e072bf2a7562b500227e300b7a3f19d0285a328bf9f25199d3fb3a850e5593c65444a7cd98d68c694d61b17dd39663d3d33bd9f1ac155
+  data.tar.gz: 01b06dea5b0ee5ea9e3c5517d7c52e6a3cc3f2ac1c392657400c1b0be9a8bfd987adf7b34029d1da88cba51ff23f28dd8b26df04dde4b126d10d5f83df9f88d8

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.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["atomita"]
   spec.email         = ["sleeping.cait.sith+gh@gmail.com"]
 

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

@@ -55,64 +55,78 @@ module Fluent
     # get AWS Credentials
     #
     def credentials(access_key, secret_key)
-      @credentials ||= {}
-      @credentials[access_key] ||= {}
-      @credentials[access_key][secret_key] ||=
-        begin
-          credentials = nil
-          if access_key.empty? or secret_key.empty?
-            credentials   = Aws::InstanceProfileCredentials.new.credentials
-            credentials ||= Aws::SharedCredentials.new.credentials
-          end
-          credentials ||= Aws::Credentials.new access_key, secret_key
-          credentials
+      lambda do
+        credentials = nil
+        if access_key.empty? or secret_key.empty?
+          credentials   = Aws::InstanceProfileCredentials.new.credentials
+          credentials ||= Aws::SharedCredentials.new.credentials
         end
+        credentials ||= Aws::Credentials.new access_key, secret_key
+        credentials
+      end
     end
 
+  end
 
-    #
-    # monkey patch
-    #
-    class ElasticsearchOutput::Elasticsearch::Transport::Transport::HTTP::Faraday
-
-      alias :__build_connections_origin_from_aws_elasticsearch_service_output :__build_connections
-
-      # Builds and returns a collection of connections.
-      #
-      # @return [Connections::Collection]
-      # @override
-      #
-      def __build_connections
-        Elasticsearch::Transport::Transport::Connections::Collection.new(
-          :connections => hosts.map { |host|
-            host[:protocol]   = host[:scheme] || DEFAULT_PROTOCOL
-            host[:port]     ||= DEFAULT_PORT
-            url               = __full_url(host)
-
-            Elasticsearch::Transport::Transport::Connections::Connection.new(
-              :host => host,
-              :connection => ::Faraday::Connection.new(
-                url,
-                (options[:transport_options] || {}),
-                &__aws_elasticsearch_service_setting(host, &@block)
-              ),
-              :options => host[:connection_options]
-            )
-          },
-          :selector_class => options[:selector_class],
-          :selector => options[:selector]
-        )
+
+  #
+  # monkey patch
+  #
+  class ElasticsearchOutput
+    module Elasticsearch
+
+      module Client
+        include ::Elasticsearch::Client
+        extend self
       end
 
-      def __aws_elasticsearch_service_setting(host, &block)
-        lambda do |faraday|
-          if host[:aws_elasticsearch_service]
-            faraday.request :aws_signers_v4,
-                            credentials: host[:aws_elasticsearch_service][:credentials],
-                            service_name: 'es',
-                            region: host[:aws_elasticsearch_service][:region]
+      module Transport
+        module Transport
+          module HTTP
+            class Faraday < ::Elasticsearch::Transport::Transport::HTTP::Faraday
+
+              alias :__build_connections_origin_from_aws_elasticsearch_service_output :__build_connections
+
+              # Builds and returns a collection of connections.
+              #
+              # @return [Connections::Collection]
+              # @override
+              #
+              def __build_connections
+                ::Elasticsearch::Transport::Transport::Connections::Collection.new(
+                  :connections => hosts.map { |host|
+                    host[:protocol]   = host[:scheme] || DEFAULT_PROTOCOL
+                    host[:port]     ||= DEFAULT_PORT
+                    url               = __full_url(host)
+
+                    ::Elasticsearch::Transport::Transport::Connections::Connection.new(
+                      :host => host,
+                      :connection => ::Faraday::Connection.new(
+                        url,
+                        (options[:transport_options] || {}),
+                        &__aws_elasticsearch_service_setting(host, &@block)
+                      ),
+                      :options => host[:connection_options]
+                    )
+                  },
+                  :selector_class => options[:selector_class],
+                  :selector => options[:selector]
+                )
+              end
+
+              def __aws_elasticsearch_service_setting(host, &block)
+                lambda do |faraday|
+                  if host[:aws_elasticsearch_service]
+                    faraday.request :aws_signers_v4,
+                                    credentials: host[:aws_elasticsearch_service][:credentials].call,
+                                    service_name: 'es',
+                                    region: host[:aws_elasticsearch_service][:region]
+                  end
+                  block.call faraday
+                end
+              end
+            end
           end
-          block.call faraday
         end
       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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - atomita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler