fluent-plugin-s3 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e306f719d4a60dcbfbbc48db85ee403a9865b054
-  data.tar.gz: bef798f3e37dde338873bd3697b5388e04e032bd
+  metadata.gz: 563ab768bef3f13148f841becf15b1d7e8e88ed2
+  data.tar.gz: b3b54160a015d14b801914e522fef06ad5d7bb1a
 SHA512:
-  metadata.gz: 0bc0a0c6daa1c762097aecc94828d59a79e15a9abf514938a0d3a4e412205c4681f2fc8235d40425f36adbbf25daf903a147c34426af7bbb9e9865625b0220d5
-  data.tar.gz: 6883277b81e496c02673038c3f83118050e7c38c2f42391b4168dc80b0a73889fd81906462ab1d3914036eece8a34f913cfec32fd4a0bf529ff4426c37111f91
+  metadata.gz: 27b44ab95d94a7cf93cd1337aea917326bf596693b7af529a75cfb343c7a65e97311c9345d21ee8bf3983c69b84a2773f26081c4cc6f928fb6f25ba9a621b285
+  data.tar.gz: 205930d50c3e1d1d42383e149b870aa4e8b8232780288026fcdeb214624626927b3e68601a1f361aaa1dd3632e3a81119d9e964615e890bbf19ebe94733ecd06

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.6.6 - 2016/03/16
+
+  * Fix ACL handling in PUT operation
+
+
 Release 0.6.5 - 2016/01/13
 
   * Add description to parameters

data/README.md

@@ -25,7 +25,7 @@ Simply use RubyGems:
 ## Configuration
 
     <match pattern>
-      type s3
+      @type s3
 
       aws_key_id YOUR_AWS_KEY_ID
       aws_sec_key YOUR_AWS_SECRET_KEY
@@ -98,8 +98,8 @@ now.
 assured to be unique. This is used to follow a way of peformance tuning, `Add
 a Hex Hash Prefix to Key Name`, written in [Request Rate and Performance
 Considerations - Amazon Simple Storage
-Service](https://docs.aws.amazon.com/AmazonS3/latest/dev/request-rate-perf-con
-siderations.html). You can configure the length of string with a
+Service](https://docs.aws.amazon.com/AmazonS3/latest/dev/request-rate-perf-considerations.html).
+You can configure the length of string with a
 `hex_random_length` parameter (Default: 4).
 
 The default format is `%{path}%{time_slice}_%{index}.%{file_extension}`.
@@ -252,18 +252,17 @@ 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
+*   public-read
+*   public-read-write (not recommended - see [Canned
     ACL](http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#cann
     ed-acl))
-*   authenticated_read
-*   bucket_owner_read
-*   bucket_owner_full_control
+*   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-walkthro
-ughs-managing-access-example3.html) for examples.
+documentation](http://docs.aws.amazon.com/AmazonS3/latest/dev/example-walkthroughs-managing-access-example3.html) for examples.
 
 **hex_random_length**
 
@@ -299,7 +298,7 @@ this plugin on FIPS enabled environment, set `compute_checksums false`.
 Typically, you use AssumeRole for cross-account access or federation.
 
     <match *>
-      type s3
+      @type s3
 
       <assume_role_credentials>
         role_arn          ROLE_ARN
@@ -346,7 +345,7 @@ Retrieve temporary security credentials via HTTP request. This is useful on
 EC2 instance.
 
     <match *>
-      type s3
+      @type s3
 
       <instance_profile_credentials>
         ip_address IP_ADDRESS
@@ -391,7 +390,7 @@ This loads AWS access credentials from local ini file. This is useful for
 local developing.
 
     <match *>
-      type s3
+      @type s3
 
       <shared_credentials>
         path         PATH

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/lib/fluent/plugin/out_s3.rb

@@ -96,7 +96,7 @@ module Fluent
     desc "Change one line format in the S3 object (out_file,json,ltsv,single_value)"
     config_param :format, :string, :default => 'out_file'
     desc "Permission for the object in S3"
-    config_param :acl, :string, :default => :private
+    config_param :acl, :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"
@@ -216,9 +216,14 @@ module Fluent
         tmp.rewind
         log.debug { "out_s3: write chunk: {key:#{chunk.key},tsuffix:#{tsuffix(chunk)}} to s3://#{@s3_bucket}/#{s3path}" }
 
-        put_options = {:body => tmp, :content_type => @compressor.content_type, :storage_class => @storage_class}
+        put_options = {
+          :body => tmp,
+          :content_type => @compressor.content_type,
+          :storage_class => @storage_class,
+        }
         put_options[:server_side_encryption] = @use_server_side_encryption if @use_server_side_encryption
         put_options[:ssekms_key_id] = @ssekms_key_id if @ssekms_key_id
+        put_options[:acl] = @acl if @acl
         @bucket.object(s3path).put(put_options)
 
         @values_for_s3_object_chunk.delete(chunk.unique_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd