fluent-plugin-s3 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f674b76e6ab0fcde41c2a1f580b36f2b0e346f01
-  data.tar.gz: 32de8cacec06dd1f7a0ab241e05eafca9ecaf755
+  metadata.gz: c8fc0cbcb10886649237d443f3c2ca2a78157b26
+  data.tar.gz: 41c079389e44e2f47c8abcfad167b0724060d65d
 SHA512:
-  metadata.gz: 8417dad2be0be87130030d41fdfb59ba553d5f574c71f0eb3f685145dd7b6ff1011ff9dd89d35b65b4dcb422be0e54f297c312d51cbdef2e70728c4ce5dbe42f
-  data.tar.gz: e0f4aaace4ebf98f33cabaa782ae39b8999d0fee860d9b7a0eec990f0661faddffdf8510ea29609ab786587f6044f799abb9392f649fd423d7570aed42456085
+  metadata.gz: 6dece2571ff2d3899f8aa33b87dd8c21762f15eb732bfbf8867dd23760747b88d061113bda9dc060e430fa7d483daa4fd8540d13e2642ca9fd1158ea7c5bc260
+  data.tar.gz: 479759306f6db9351384e1848e5030f134ef4b8e4a3a99bf9afcb5f87a805e49ed97032fc06701c74469fc20100df75be1e6f7c4dad121eea334c91cf4b813aa

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.5.11 - 2015/08/04
+
+  * Add acl parameter
+  * Fix use_server_side_encryption parameter
+
+
 Release 0.5.10 - 2015/07/27
 
   * Add "uuid_flush" placeholder to s3_object_key_format for creating unique object

data/README.rdoc

@@ -158,6 +158,18 @@ You can change key name by "message_key" option.
 
 [reduced_redundancy] Use S3 reduced redundancy storage for 33% cheaper pricing. Default is false.
 
+[acl] Permission for the object in S3. This is useful for cross-account access using IAM roles. Valid values are:
+
+- private (default)
+- public_read
+- public_read_write (not recommended - see {Canned ACL}[http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl])
+- authenticated_read
+- bucket_owner_read
+- bucket_owner_full_control
+
+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.
+
 == IAM Policy
 
 The following is an example for a minimal IAM policy needed to write to an s3 bucket (matches my-s3bucket/logs, my-s3bucket-test, etc.).

data/VERSION

@@ -1 +1 @@
-0.5.10
+0.5.11

data/lib/fluent/plugin/out_s3.rb

@@ -30,6 +30,7 @@ module Fluent
     config_param :proxy_uri, :string, :default => nil
     config_param :reduced_redundancy, :bool, :default => false
     config_param :format, :string, :default => 'out_file'
+    config_param :acl, :string, :default => :private
 
     attr_reader :bucket
 
@@ -84,7 +85,7 @@ module Fluent
       options[:s3_endpoint] = @s3_endpoint if @s3_endpoint
       options[:proxy_uri] = @proxy_uri if @proxy_uri
       options[:use_ssl] = @use_ssl
-      options[:s3_server_side_encryption] = @use_server_side_encryption
+      options[:s3_server_side_encryption] = @use_server_side_encryption.to_sym if @use_server_side_encryption
 
       @s3 = AWS::S3.new(options)
       @bucket = @s3.buckets[@s3_bucket]
@@ -125,7 +126,8 @@ module Fluent
       begin
         @compressor.compress(chunk, tmp)
         @bucket.objects[s3path].write(Pathname.new(tmp.path), {:content_type => @compressor.content_type,
-                                                               :reduced_redundancy => @reduced_redundancy})
+                                                               :reduced_redundancy => @reduced_redundancy,
+                                                               :acl => @acl})
       ensure
         tmp.close(true) rescue nil
       end

data/test/test_out_s3.rb

@@ -260,7 +260,7 @@ class S3OutputTest < Test::Unit::TestCase
 
         pathname.to_s.match(%r|s3-|)
       },
-      {:content_type => "application/x-gzip", :reduced_redundancy => false})
+      {:content_type => "application/x-gzip", :reduced_redundancy => false, :acl => :private})
 
     # Assert the key of S3Object, which event logs are stored in
     s3obj_col = flexmock(AWS::S3::ObjectCollection)
@@ -307,7 +307,7 @@ class S3OutputTest < Test::Unit::TestCase
 
         pathname.to_s.match(%r|s3-|)
       },
-      {:content_type => "application/x-gzip", :reduced_redundancy => false})
+      {:content_type => "application/x-gzip", :reduced_redundancy => false, :acl => :private})
 
     # Assert the key of S3Object, which event logs are stored in
     s3obj_col = flexmock(AWS::S3::ObjectCollection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd