fluent-plugin-s3 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17add9c31857c6ce80237346cd1d1c9b04228c42
-  data.tar.gz: 8fc1df453d0a0ba8c2cee043c8ed5de2082ab12a
+  metadata.gz: 9d13dd2a15a01b18147a2772eb8204e77cd5a17e
+  data.tar.gz: 4d5155d27eedb6393b53c13b0de02d8c59208c46
 SHA512:
-  metadata.gz: 05a92ebf96c7817dd19bbb7804e58352eb502a02387e3d78de4743a2f2725ed13c97b6c00e8956d1c7db47a112d6f54888daf6e17a365a38cdb0e65cae5237c2
-  data.tar.gz: 24a208b805572239fe1844a8218a7b96c86585bddbc8fc160ddb610cd9bb1a979f212947ca126a6ee8d4d3e5d7d99e1b4aaa43a52c29699a6913b37e9b4c9707
+  metadata.gz: cad1c888c86a2b79b347b31245b6d14805c9df93c77a48968e5ce8a8d20de4227b536c941dd203bc78ad7d11029f28af9589c147a1a556959c499110c31b5675
+  data.tar.gz: 39ce697d7361c6a73b49ad3bda2a2accea94a8ca5ab69af8bf6cdcb07e82d98740bfdd9fa21531545fe10ddab6ab369ff4e52121174673f9ea57e33a94053bf2

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.8.7 - 2017/10/27
+
+  * out_s3: support for granting a permission to a canonical user id
+
+
 Release 0.8.6 - 2017/10/11
 
   * out_s3: specified s3_object_key_format is applied when check_object is false

data/README.md

@@ -299,6 +299,39 @@ To use cross-account access, you will need to create a bucket policy granting
 the specific access required. Refer to the [AWS
 documentation](http://docs.aws.amazon.com/AmazonS3/latest/dev/example-walkthroughs-managing-access-example3.html) for examples.
 
+**grant_full_control**
+
+Allows grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
+This is useful for cross-account access using IAM roles.
+
+Valid values are `id="Grantee-CanonicalUserID"`. Please specify the grantee's canonical user ID.
+
+e.g. `id="79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be"`
+
+Note that a canonical user ID is different from an AWS account ID.
+Please refer to [AWS documentation](https://docs.aws.amazon.com/general/latest/gr/acct-identifiers.html) for more details.
+
+**grant_read**
+
+Allows grantee to read the object data and its metadata.
+Valid values are `id="Grantee-CanonicalUserID"`. Please specify the grantee's canonical user ID.
+
+e.g. `id="79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be"`
+
+**grant_read_acp**
+
+Allows grantee to read the object ACL.
+Valid values are `id="Grantee-CanonicalUserID"`. Please specify the grantee's canonical user ID.
+
+e.g. `id="79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be"`
+
+**grant_write_acp**
+
+Allows grantee to write the ACL for the applicable object.
+Valid values are `id="Grantee-CanonicalUserID"`. Please specify the grantee's canonical user ID.
+
+e.g. `id="79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be"`
+
 **hex_random_length**
 
 The length of `%{hex_random}` placeholder. Default is 4 as written in

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.7

data/lib/fluent/plugin/out_s3.rb

@@ -100,6 +100,14 @@ module Fluent
     config_param :format, :string, :default => 'out_file'
     desc "Permission for the object in S3"
     config_param :acl, :string, :default => nil
+    desc "Allows grantee READ, READ_ACP, and WRITE_ACP permissions on the object"
+    config_param :grant_full_control, :string, :default => nil
+    desc "Allows grantee to read the object data and its metadata"
+    config_param :grant_read, :string, :default => nil
+    desc "Allows grantee to read the object ACL"
+    config_param :grant_read_acp, :string, :default => nil
+    desc "Allows grantee to write the ACL for the applicable object"
+    config_param :grant_write_acp, :string, :default => nil
     desc "The length of `%{hex_random}` placeholder(4-16)"
     config_param :hex_random_length, :integer, :default => 4
     desc "Overwrite already existing path"
@@ -278,6 +286,10 @@ module Fluent
         put_options[:sse_customer_key] = @sse_customer_key if @sse_customer_key
         put_options[:sse_customer_key_md5] = @sse_customer_key_md5 if @sse_customer_key_md5
         put_options[:acl] = @acl if @acl
+        put_options[:grant_full_control] = @grant_full_control if @grant_full_control
+        put_options[:grant_read] = @grant_read if @grant_read
+        put_options[:grant_read_acp] = @grant_read_acp if @grant_read_acp
+        put_options[:grant_write_acp] = @grant_write_acp if @grant_write_acp
         @bucket.object(s3path).put(put_options)
 
         @values_for_s3_object_chunk.delete(chunk.unique_id)

data/test/test_out_s3.rb

@@ -142,6 +142,16 @@ EOC
     assert_match /#{Socket.gethostname}/, d.instance.path
   end
 
+  def test_configure_with_grant
+    conf = CONFIG.clone
+    conf << "\grant_full_control id='0123456789'\ngrant_read id='1234567890'\ngrant_read_acp id='2345678901'\ngrant_write_acp id='3456789012'\n"
+    d = create_driver(conf)
+    assert_equal "id='0123456789'", d.instance.grant_full_control
+    assert_equal "id='1234567890'", d.instance.grant_read
+    assert_equal "id='2345678901'", d.instance.grant_read_acp
+    assert_equal "id='3456789012'", d.instance.grant_write_acp
+  end
+
   def test_path_slicing
     config = CONFIG.clone.gsub(/path\slog/, "path log/%Y/%m/%d")
     d = create_driver(config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Amazon S3 output plugin for Fluentd event collector