fluent-plugin-s3 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5bd6dc0616525d3beb069168b7f59bc985b188
-  data.tar.gz: 5021dbf9b12861ee087ad2b5a1800d9430e79874
+  metadata.gz: 8b5cf42881912f6452810b283b3bd9be7a94160f
+  data.tar.gz: a7f3fb4b37a91b18b72d8f7bdef7a80c783ba64b
 SHA512:
-  metadata.gz: f0c104943d41ecaacefcf35565d3bf3de8ff8c0301d3edb02994f8425cfcc81f43833c1eed478dfc8fd2965017068da32d43a590644e82bbd1cd98277f3888bd
-  data.tar.gz: 4580b5c87c33db7fc7ba65c250c3c2e1330c10be6e75bde2144175df41276cfe929031379df785dba68b5d8196890e6ba51b8fbd5081e8e769ea96b24718c6ae
+  metadata.gz: 21e938107f0fa66ddedf3634013c9e0472ac2a5855f26dfecd3bd01bebce120957e7e656693a4bf993a28afc9272514ac61b5b8678d7f313bec080161c47c442
+  data.tar.gz: 2c334c3fe1c8f34baae53b5668a02971279c8a574e063a04c6f9e4ce925601060bd957356e700abc9d49f0ed3aa3f891ad633e815f62d1eb85b60741268a0aee

data/.travis.yml

@@ -4,7 +4,9 @@ rvm:
   - 1.9.3
   - 2.0
   - 2.1
-  - 2.2.0
+  - 2.2.3
+  - 2.3.0
+  - ruby-head
   - rbx
 
 gemfile:
@@ -17,6 +19,9 @@ branches:
 before_install: gem update bundler
 script: bundle exec rake test
 
+sudo: false
+
 matrix:
   allow_failures:
+    - rvm: ruby-head
     - rvm: rbx

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.6.8 - 2016/04/19
+
+  * Add sse customer key options
+
+
 Release 0.6.7 - 2016/03/31
 
   * Add signature_version parameter

data/README.md

@@ -241,11 +241,17 @@ old logs may reache.
 
 Use UTC instead of local time.
 
+**storage_class**
+
+Set storage class. Possible values are `STANDARD`, `REDUCED_REDUNDANCY`, `STANDARD_IA` from [Ruby SDK](http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#storage_class-instance_method).
+
 **reduced_redundancy**
 
 Use S3 reduced redundancy storage for 33% cheaper pricing. Default is
 false.
 
+This is deprecated. Use `storage_class REDUCED_REDUNDANCY` instead.
+
 **acl**
 
 Permission for the object in S3. This is useful for cross-account access
@@ -287,6 +293,18 @@ The Server-side encryption algorithm used when storing this object in S3
 Specifies the AWS KMS key ID to use for object encryption. You have to
 set "aws:kms" to `use_server_side_encryption` to use the KMS encryption.
 
+**sse_customer_algorithm**
+
+Specifies the algorithm to use to when encrypting the object (e.g., AES256).
+
+**sse_customer_key**
+
+Specifies the AWS KMS key ID to use for object encryption.
+
+**sse_customer_key_md5**
+
+Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
+
 **compute_checksums**
 
 AWS SDK uses MD5 for API request/response by default. On FIPS enabled environment,

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/lib/fluent/plugin/out_s3.rb

@@ -89,9 +89,9 @@ module Fluent
     config_param :check_apikey_on_start, :bool, :default => true
     desc "URI of proxy environment"
     config_param :proxy_uri, :string, :default => nil
-    desc "Use S3 reduced redundancy storage for 33% cheaper pricing"
+    desc "Use S3 reduced redundancy storage for 33% cheaper pricing. Deprecated. Use storage_class instead"
     config_param :reduced_redundancy, :bool, :default => false
-    desc "The type of storage to use for the object(STANDARD,REDUCED_REDUNDANCY)"
+    desc "The type of storage to use for the object(STANDARD,REDUCED_REDUNDANCY,STANDARD_IA)"
     config_param :storage_class, :string, :default => "STANDARD"
     desc "Change one line format in the S3 object (out_file,json,ltsv,single_value)"
     config_param :format, :string, :default => 'out_file'
@@ -103,6 +103,12 @@ module Fluent
     config_param :overwrite, :bool, :default => false
     desc "Specifies the AWS KMS key ID to use for object encryption"
     config_param :ssekms_key_id, :string, :default => nil, :secret => true
+    desc "Specifies the algorithm to use to when encrypting the object"
+    config_param :sse_customer_algorithm, :string, :default => nil
+    desc "Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data"
+    config_param :sse_customer_key, :string, :default => nil, :secret => true
+    desc "Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321"
+    config_param :sse_customer_key_md5, :string, :default => nil, :secret => true
     desc "AWS SDK uses MD5 for API request/response by default"
     config_param :compute_checksums, :bool, :default => nil # use nil to follow SDK default configuration
     desc "Signature version for API Request (s3,v4)"
@@ -151,7 +157,10 @@ module Fluent
         raise ConfigError, "hex_random_length parameter must be less than or equal to #{MAX_HEX_RANDOM_LENGTH}"
       end
 
-      @storage_class = "REDUCED_REDUNDANCY" if @reduced_redundancy
+      if @reduced_redundancy
+        $log.warn "reduced_redundancy parameter is deprecated. Use storage_class parameter instead"
+        @storage_class = "REDUCED_REDUNDANCY"
+      end
       @values_for_s3_object_chunk = {}
     end
 
@@ -228,6 +237,9 @@ module Fluent
         }
         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[:sse_customer_algorithm] = @sse_customer_algorithm if @sse_customer_algorithm
+        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
         @bucket.object(s3path).put(put_options)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd