fluent-plugin-aws-elasticsearch-service 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00328bd3ff633df7108730e87120720e0bf6ce805ef97c4e3d21f117bd7960d
-  data.tar.gz: b01eb257a5231f9e0aeeae68f039583a98c3c9fb0ea9ad660ea5a388befc4271
+  metadata.gz: 5b43f023ea0c787dc6b18db57b47050078babc38c33d45bccd172e30c2f0b2a0
+  data.tar.gz: a2310d3e8fb5a710edca64ec72b656a5cc0517bac9151976e5ad23b16acfe12c
 SHA512:
-  metadata.gz: b81a8b614b5cf1c4d637396462b3067e6d8ae7e34c2a33c5c99f3faf2625091d23576037ad48db7f94f56f2dabfcf8b2a824a6bbff57dba29c1998d7452ad8e7
-  data.tar.gz: 0a3f0da04dee0d718300196847e7bcfac96b46d4d6c6e16fa2d5acfb0169371f55298e075436fb6dcbf3a6d719644e7421b0673d12c3905dfa8d65bf126d6398
+  metadata.gz: 6563475cc1717bc69c6c1d417dcef797e4418f172cdab5d0d767efd8f2aedd3beeb38e405ca162f6c1bee2b1a505004e59a50ce8c5ae625fd01b1ab7e291918f
+  data.tar.gz: f270b332238a0e438de2062a72e5e53e5689e4130bf422b0f092423dad625b4a156a62862f5f7c452f4f6855d2f7ee5c61b0eca3473a58cbc692f8ce81b8acd8

data/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.4.0", "< 4"], require: false
+gem 'fluent-plugin-elasticsearch', [">= 2.4.0", "< 5"], require: false
 gem 'aws-sdk-core', '~> 3', require: false
 gem 'faraday_middleware-aws-sigv4', '~> 0.3.0', require: false

data/README.md

@@ -92,6 +92,7 @@ Additionally, you can use an STS assumed role as the authenticating factor and i
     region eu-west-1
     assume_role_arn arn:aws:sts::ACCOUNT:role/ROLE
     assume_role_session_name SESSION_ID # Defaults to fluentd if omitted
+    sts_credentials_region us-west-2 # Defaults to region if omitted
   </endpoint>
 ```
 

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       = "2.3.0"
+  spec.version       = "2.4.0"
   spec.authors       = ["atomita"]
   spec.email         = ["sleeping.cait.sith+gh@gmail.com"]
 
@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", [">= 1.10", "< 3"]
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_runtime_dependency "fluentd", [">= 0.14.15", "< 2"]
-  spec.add_runtime_dependency "fluent-plugin-elasticsearch", [">= 3.3.0", "< 4"]
+  spec.add_runtime_dependency "fluent-plugin-elasticsearch", [">= 3.3.0", "< 5"]
   spec.add_runtime_dependency "aws-sdk-core", "~> 3"
   spec.add_runtime_dependency "faraday_middleware-aws-sigv4", "~> 0.3.0"
 end

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

@@ -20,6 +20,7 @@ module Fluent::Plugin
       config_param :ecs_container_credentials_relative_uri, :string, :default => nil #Set with AWS_CONTAINER_CREDENTIALS_RELATIVE_URI environment variable value
       config_param :assume_role_session_name, :string, :default => "fluentd"
       config_param :assume_role_web_identity_token_file, :string, :default => nil
+      config_param :sts_credentials_region, :string, :default => nil
     end
 
     # here overrides default value of reload_connections to false because
@@ -35,6 +36,10 @@ module Fluent::Plugin
     def get_connection_options(con_host=nil)
       raise "`endpoint` require." if @endpoint.empty?
 
+      @endpoint.map do |ep|
+        raise Fluent::ConfigError, "Ensure you don't have a trailing slash on the endpoint URL in your fluentd configuration." if ep[:url].end_with?("/")
+      end
+
       hosts =
         begin
           @endpoint.map do |ep|
@@ -75,27 +80,29 @@ module Fluent::Plugin
           credentials = Aws::Credentials.new opts[:access_key_id], opts[:secret_access_key]
         else
           if opts[:assume_role_arn].nil?
-            if opts[:ecs_container_credentials_relative_uri].nil?
+            aws_container_credentials_relative_uri = opts[:ecs_container_credentials_relative_uri] || ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+            if aws_container_credentials_relative_uri.nil?
               credentials = Aws::SharedCredentials.new({retries: 2}).credentials
               credentials ||= Aws::InstanceProfileCredentials.new.credentials
               credentials ||= Aws::ECSCredentials.new.credentials
             else
               credentials = Aws::ECSCredentials.new({
-                credential_path: opts[:ecs_container_credentials_relative_uri]
+                credential_path: aws_container_credentials_relative_uri
               }).credentials
             end
           else
+
             if opts[:assume_role_web_identity_token_file].nil?
               credentials = sts_credential_provider({
                               role_arn: opts[:assume_role_arn],
                               role_session_name: opts[:assume_role_session_name],
-                              region: opts[:region]
+                              region: sts_credentials_region(opts)
                             }).credentials
             else
               credentials = sts_web_identity_credential_provider({
                               role_arn: opts[:assume_role_arn],
                               web_identity_token_file: opts[:assume_role_web_identity_token_file],
-                              region: opts[:region]
+                              region: sts_credentials_region(opts)
                             }).credentials
             end
           end
@@ -110,6 +117,10 @@ module Fluent::Plugin
       calback
     end
 
+    def sts_credentials_region(opts)
+      opts[:sts_credentials_region] || opts[:region]
+    end
+
     def sts_credential_provider(opts)
       # AssumeRoleCredentials is an auto-refreshing credential provider
       @sts ||= Aws::AssumeRoleCredentials.new(opts)

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-aws-elasticsearch-service
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - atomita
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +101,7 @@ dependencies:
         version: 3.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +111,7 @@ dependencies:
         version: 3.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +159,7 @@ homepage: https://github.com/atomita/fluent-plugin-aws-elasticsearch-service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Output plugin to post to "Amazon Elasticsearch Service".
 test_files: []