fluent-plugin-s3 1.0.0.rc4 → 1.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc4b32e04be1ba3836e5c34a09df8a831b42086
-  data.tar.gz: 0cf95c08b2eabc0f249f5a7e468cf6c597e0626b
+  metadata.gz: 82cd0b191f92c55f6bb0e9468f5f109589447b45
+  data.tar.gz: bd9c053a805179e895b6f239111e44200ceba83a
 SHA512:
-  metadata.gz: f1c8dd2918e1c4490881a29a5e7d234f59e13ba0907a73a84dfd4a8b7e8a8f470b28a3cbaa97fefc116a4ca778c132c588d3503e4fab2eb7e5ffd65ea6b1aa94
-  data.tar.gz: ce4efb8bedd6f58d701677ae457383cae253ac2a46fadac01b5a3ef4a4bfeb1b6a001220babc01911a0beb42bc81ca3f141b11c86ae1a8c7f6cacd564b4c4df3
+  metadata.gz: 3d5c0ad94122c1854753c7071b852d156c48666a40e73c1c97279328aaeb35f8c86899f9bb8c49e530350a6920f1016b1c05270bebc9a55aab68d569e4224ba5
+  data.tar.gz: 8600b6fbb35071b1cce21296d04874c7f2cd950a022c4b192d81f96bc5770cb79a1c7f47df5a8278b66d4c135c0269bced04a1990a84495cb7cef65762ab49a9

data/README.md

@@ -166,7 +166,7 @@ now.
 * %{uuid_flush} a uuid that is replaced everytime the buffer will be flushed. If you want to use this placeholder, install `uuidtools` gem first.
 * %{hostname} is replaced with `Socket.gethostname` result.
 * %{hex_random} a random hex string that is replaced for each buffer chunk, not
-assured to be unique. This is used to follow a way of peformance tuning, `Add
+assured to be unique. This is used to follow a way of performance 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-considerations.html).
@@ -211,7 +211,7 @@ as a sub-domain. See Plugins::S3BucketDns for more details.
 
 **store_as**
 
-archive format on S3. You can use serveral format:
+archive format on S3. You can use several format:
 
 *   gzip (default)
 *   json
@@ -332,7 +332,7 @@ Format of the time used as the file name. Default is '%Y%m%d'. Use
 **time_slice_wait**
 
 The time to wait old logs. Default is 10 minutes. Specify larger value if
-old logs may reache.
+old logs may reach.
 
 **utc**
 

data/VERSION

@@ -1 +1 @@
-1.0.0.rc4
+1.0.0.rc5

data/lib/fluent/plugin/in_s3.rb

@@ -20,6 +20,8 @@ module Fluent::Plugin
 
     DEFAULT_PARSE_TYPE = "none"
 
+    desc "Use aws-sdk-ruby bundled cert"
+    config_param :use_bundled_cert, :bool, default: false
     desc "AWS access key id"
     config_param :aws_key_id, :string, default: nil, secret: true
     desc "AWS secret key."
@@ -93,6 +95,8 @@ module Fluent::Plugin
         raise Fluent::ConfigError, "sqs/queue_name is required"
       end
 
+      Aws.use_bundled_cert! if @use_bundled_cert
+
       @extractor = EXTRACTOR_REGISTRY.lookup(@store_as).new(log: log)
       @extractor.configure(conf)
 

data/lib/fluent/plugin/out_s3.rb

@@ -22,6 +22,8 @@ module Fluent::Plugin
     config_param :path, :string, default: ""
     desc "The Server-side encryption algorithm used when storing this object in S3 (AES256, aws:kms)"
     config_param :use_server_side_encryption, :string, default: nil
+    desc "Use aws-sdk-ruby bundled cert"
+    config_param :use_bundled_cert, :bool, default: false
     desc "AWS access key id"
     config_param :aws_key_id, :string, default: nil, secret: true
     desc "AWS secret key."
@@ -129,6 +131,8 @@ module Fluent::Plugin
 
       super
 
+      Aws.use_bundled_cert! if @use_bundled_cert
+
       if @s3_endpoint && @s3_endpoint.end_with?('amazonaws.com')
         raise Fluent::ConfigError, "s3_endpoint parameter is not supported for S3, use s3_region instead. This parameter is for S3 compatible services"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd