fluent-plugin-s3 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e60678442f985dd0a5cd7ee3d89bee66094c36
-  data.tar.gz: 4089973adc9be5216cf3aec4e78cbbe4559b62ed
+  metadata.gz: 898dacde8e05065481eb052b7ceccd83990ca271
+  data.tar.gz: 800463c09bd87c561a2b376ef4471e9d1d53065e
 SHA512:
-  metadata.gz: 6d6f65c0db5df8e36ed610d96983be680452143c44e391af65f3205e10158df469ccb755f71f322033f1651eb8cd0dec14494537ebf12d8ab3a71ff62dc52670
-  data.tar.gz: 8b09ae39e27f7148160a6fb0bed738155af1c2cbd5248f0a0aecc69c877c86180a49d11474f295b87ae7d6c30955aa39ad9382e1738783a9aa714ac768297a6e
+  metadata.gz: 52a258b0df126e20e63f0e760ca38d3e33e4bbf6d22ee76e086ae083ae51b8c019cd4df18c4c6b5bf8cc45f227b961f9fc306a83fd1747094c1599b0655d2e0f
+  data.tar.gz: f98a116cfb1fb4092fdd612312baa44ac3d3ffc7651abc43c2b81eb193d674e5118ea1b571a2c0af6d2780469fcb401e98a5be0452f831df9907cc622667d94b

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.6.4 - 2015/12/03
+
+  * Add secret parameters to role_arn, external_id and ssekms_key_id
+  * Fix region handling in assume_role_credentials
+
+
 Release 0.6.3 - 2015/11/25
 
   * Add compute_checksums parameter

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/fluent/plugin/out_s3.rb

@@ -20,11 +20,11 @@ module Fluent
     config_param :aws_key_id, :string, :default => nil, :secret => true
     config_param :aws_sec_key, :string, :default => nil, :secret => true
     config_section :assume_role_credentials, :multi => false do
-      config_param :role_arn, :string
+      config_param :role_arn, :string, :secret => true
       config_param :role_session_name, :string
       config_param :policy, :string, :default => nil
       config_param :duration_seconds, :integer, :default => nil
-      config_param :external_id, :string, :default => nil
+      config_param :external_id, :string, :default => nil, :secret => true
     end
     config_section :instance_profile_credentials, :multi => false do
       config_param :retries, :integer, :default => nil
@@ -55,7 +55,7 @@ module Fluent
     config_param :acl, :string, :default => :private
     config_param :hex_random_length, :integer, :default => 4
     config_param :overwrite, :bool, :default => false
-    config_param :ssekms_key_id, :string, :default => nil
+    config_param :ssekms_key_id, :string, :default => nil, :secret => true
     config_param :compute_checksums, :bool, :default => nil # use nil to follow SDK default configuration
 
     attr_reader :bucket
@@ -235,6 +235,9 @@ module Fluent
         credentials_options[:policy] = c.policy if c.policy
         credentials_options[:duration_seconds] = c.duration_seconds if c.duration_seconds
         credentials_options[:external_id] = c.external_id if c.external_id
+        if @s3_region
+          credentials_options[:client] = Aws::STS::Client.new(:region => @s3_region)
+        end
         options[:credentials] = Aws::AssumeRoleCredentials.new(credentials_options)
       when @instance_profile_credentials
         c = @instance_profile_credentials

data/test/test_out_s3.rb

@@ -467,6 +467,30 @@ class S3OutputTest < Test::Unit::TestCase
     assert_equal(expected_credentials, credentials)
   end
 
+  def test_assume_role_credentials_with_region
+    expected_credentials = Aws::Credentials.new("test_key", "test_secret")
+    sts_client = Aws::STS::Client.new(:region => 'ap-northeast-1')
+    mock(Aws::STS::Client).new(:region => 'ap-northeast-1'){ sts_client }
+    mock(Aws::AssumeRoleCredentials).new(:role_arn => "test_arn",
+                                         :role_session_name => "test_session",
+                                         :client => sts_client){
+      expected_credentials
+    }
+    config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
+    config += %[
+      s3_region ap-northeast-1
+      <assume_role_credentials>
+        role_arn test_arn
+        role_session_name test_session
+      </assume_role_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)
+  end
+
   def test_instance_profile_credentials
     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.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd