fluent-plugin-s3 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cff4e256a511905f01a1f6ceeb2b29654fd3e11
-  data.tar.gz: 1dc609cd3e8c6097854174cc03469b4e04f1639c
+  metadata.gz: f5f479caba1c3280aa3d9cb83186473afb3c192c
+  data.tar.gz: b1d0ed15c3cee9e9fa3f3b39668f2676f6471870
 SHA512:
-  metadata.gz: d94cd2e1b7ac41f7c9f17ce303f2fa63773e4b5000dbf59dd96cecbd67f3c139dd17a69eda8c4ec2b2c103fdbd576832a8064e1aad090855d4388a6c3ab5cebb
-  data.tar.gz: 0deee51a8774c9aa7a98f961d6be3a9497ca8aa82b38bf8479f811b5453840e888dc58d7c6d195c52337942092d66a5bb1f6419c87083eaa7973aa434b2b19f0
+  metadata.gz: a37ef95d2298ca9f64fbc72fb5facec926862d0dedc40420f6f19baae4af32d16fb44be0122c2788355b29244ba804e9fdfd9b6263615860c7796a32b32a3870
+  data.tar.gz: 3286ceedbd344873fd79987f2f413096e579b2164c932200943fefd1e6cff467a3aa78abd6991d10a15cc3d9d16c965efdc915da20ffc5f713daca9fc9b31fbf

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.7.1 - 2016/09/02
+
+  * Support IAM role for Amazon ECS task
+
+
 Release 0.7.0 - 2016/08/10
 
   * Add s3 input plugin

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/fluent-plugin-s3.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
-  gem.add_dependency "aws-sdk", "~> 2"
+  gem.add_dependency "aws-sdk", [">= 2.3.22", "< 3"]
   gem.add_dependency "yajl-ruby", "~> 1.0"
   gem.add_dependency "fluent-mixin-config-placeholders", ">= 0.3.0"
   gem.add_development_dependency "rake", ">= 0.9.2"

data/lib/fluent/plugin/out_s3.rb

@@ -312,7 +312,11 @@ module Fluent
         credentials_options[:port] = c.port if c.port
         credentials_options[:http_open_timeout] = c.http_open_timeout if c.http_open_timeout
         credentials_options[:http_read_timeout] = c.http_read_timeout if c.http_read_timeout
-        options[:credentials] = Aws::InstanceProfileCredentials.new(credentials_options)
+        if ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+          options[:credentials] = Aws::ECSCredentials.new(credentials_options)
+        else
+          options[:credentials] = Aws::InstanceProfileCredentials.new(credentials_options)
+        end
       when @shared_credentials
         c = @shared_credentials
         credentials_options[:path] = c.path if c.path
@@ -321,7 +325,11 @@ module Fluent
       when @aws_iam_retries
         $log.warn("'aws_iam_retries' parameter is deprecated. Use 'instance_profile_credentials' instead")
         credentials_options[:retries] = @aws_iam_retries
-        options[:credentials] = Aws::InstanceProfileCredentials.new(credentials_options)
+        if ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+          options[:credentials] = Aws::ECSCredentials.new(credentials_options)
+        else
+          options[:credentials] = Aws::InstanceProfileCredentials.new(credentials_options)
+        end
       else
         # Use default credentials
         # See http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html

data/test/test_in_s3.rb

@@ -178,7 +178,9 @@ class S3InputTest < Test::Unit::TestCase
       [message]
     }
     assert_nothing_raised do
-      d.run
+      d.run do
+        d.instance.router.emit("input.s3", @time, { "message" => "aaa" })
+      end
     end
   end
 
@@ -216,7 +218,11 @@ class S3InputTest < Test::Unit::TestCase
       [message]
     }
     assert_nothing_raised do
-      d.run
+      d.run do
+        d.instance.router.emit("input.s3", @time, { "message" => "aaa\n" })
+        d.instance.router.emit("input.s3", @time, { "message" => "bbb\n" })
+        d.instance.router.emit("input.s3", @time, { "message" => "ccc\n" })
+      end
     end
   end
 end

data/test/test_out_s3.rb

@@ -484,6 +484,25 @@ class S3OutputTest < Test::Unit::TestCase
     assert_equal(expected_credentials, credentials)
   end
 
+  def test_ecs_credentials
+    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = "/credential_provider_version/credentials?id=task_UUID"
+
+    expected_credentials = Aws::Credentials.new("test_key", "test_secret")
+    mock(Aws::ECSCredentials).new({}).returns(expected_credentials)
+    config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
+    config += %[
+      <instance_profile_credentials>
+      </instance_profile_credentials>
+    ]
+    d = create_time_sliced_driver(config)
+    assert_nothing_raised{ d.run }
+    client = d.instance.instance_variable_get(:@s3).client
+    credentials = client.config.credentials
+    assert_equal(expected_credentials, credentials)
+
+    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
+  end
+
   def test_instance_profile_credentials_aws_iam_retries
     expected_credentials = Aws::Credentials.new("test_key", "test_secret")
     mock(Aws::InstanceProfileCredentials).new({}).returns(expected_credentials)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -35,16 +35,22 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.3.22
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.3.22
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement