fluent-plugin-s3 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa201801e95642044876a29fe308d0df2912c214
-  data.tar.gz: a04b2703154c2d7efd698911bb73a04e22ca0d8c
+  metadata.gz: a9d2e9c4b652b764291098f4f78295936bc061ae
+  data.tar.gz: bab3ab13e4fae1ff603197db57b86830ec22d532
 SHA512:
-  metadata.gz: 425e1f44dcf826ee015b0b6581ed580648419dab9562a7ea5b2afe5dbb25cd278767e4c0be2ccab3aeb9eaa233a86a92c7721a11c6a1c6487e0f8b302736c11e
-  data.tar.gz: 23c621c0922ad06e43766bc58c92e203f389c09b6b3a1d03c7ee4c3fa186368ae6032c9ed5cfa568bcde0f3ed2435257cc0353d7f0a5530abccc980132e3e861
+  metadata.gz: 920ccb7def0e7cb1dffd101d993b89a3d8206a4d643aa81452762561f90e25905dd107e7324f531fda4b1a37b0ad54ba0b0c1a2a430c5041ac6fc6e6e5699817
+  data.tar.gz: f2ff65f0e35ce52517e32a3cef95ad1e3da873f96b9dc03fe01af65ae08fd0db5f1a424feb5920e163427743dfa38b359b659f408cda42d3a56ee25162193f9b

data/.travis.yml

@@ -6,9 +6,8 @@ rvm:
   - 2.1
   - 2.2.3
   - 2.3.1
-  - 2.4.0-rc1
+  - 2.4.0
   - ruby-head
-  - rbx
 
 gemfile:
  - Gemfile
@@ -17,6 +16,7 @@ gemfile:
 branches:
   only:
     - master
+    - v0.12
 
 before_install: gem update bundler
 script: bundle exec rake test
@@ -27,11 +27,10 @@ matrix:
   allow_failures:
     - rvm: 1.9.3
     - rvm: ruby-head
-    - rvm: rbx
   exclude:
     - rvm: 1.9.3
       gemfile: Gemfile
     - rvm: 2.0
       gemfile: Gemfile
-    - rvm: 2.4.0-rc1
+    - rvm: 2.4.0
       gemfile: Gemfile.v0.12

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.8.1 - 2017/01/29
+
+  * out_s3: Add ssl_verify_peer option to disable cert check
+  * out_s3: Fix %{hostname} regression in path
+
+
 Release 0.8.0 - 2016/12/20
 
   * out_s3: Add check_object / check_bucket parameters for only put permission

data/README.md

@@ -77,6 +77,10 @@ recommend using `s3_region` instead of `s3_endpoint`.
 endpoint for S3 compatible services. For example, Riak CS based storage or
 something. This option doesn't work on S3, use `s3_region` instead.
 
+**ssl_verify_peer**
+
+Verify SSL certificate of the endpoint. Default is true. Set false when you want to ignore the endpoint SSL certificate.
+
 **s3_object_key_format**
 
 The format of S3 object keys. You can use several built-in variables:

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/fluent/plugin/out_s3.rb

@@ -77,6 +77,8 @@ module Fluent
     config_param :s3_region, :string, :default => ENV["AWS_REGION"] || "us-east-1"
     desc "Use 's3_region' instead"
     config_param :s3_endpoint, :string, :default => nil
+    desc "If false, the certificate of endpoint will not be verified"
+    config_param :ssl_verify_peer, :bool, :default => true
     desc "The format of S3 object keys"
     config_param :s3_object_key_format, :string, :default => "%{path}%{time_slice}_%{index}.%{file_extension}"
     desc "If true, the bucket name is always left in the request URI and never moved to the host as a sub-domain"
@@ -161,7 +163,8 @@ module Fluent
         @storage_class = "REDUCED_REDUNDANCY"
       end
 
-      @s3_object_key_format = process_s3_object_key_format
+      @path = process_deprecated_placeholders(@path)
+      @s3_object_key_format = process_deprecated_placeholders(@s3_object_key_format)
       @values_for_s3_object_chunk = {}
     end
 
@@ -173,6 +176,7 @@ module Fluent
       options[:force_path_style] = @force_path_style
       options[:compute_checksums] = @compute_checksums unless @compute_checksums.nil?
       options[:signature_version] = @signature_version unless @signature_version.nil?
+      options[:ssl_verify_peer] = @ssl_verify_peer
 
       s3_client = Aws::S3::Client.new(options)
       @s3 = Aws::S3::Resource.new(:client => s3_client)
@@ -305,14 +309,14 @@ module Fluent
       end
     end
 
-    def process_s3_object_key_format
+    def process_deprecated_placeholders(target_path)
       %W(%{uuid} %{uuid:random} %{uuid:hostname} %{uuid:timestamp}).each { |ph|
-        if @s3_object_key_format.include?(ph)
-          raise ConfigError, %!#{ph} placeholder in s3_object_key_format is removed!
+        if target_path.include?(ph)
+          raise ConfigError, %!#{ph} placeholder is removed!
         end
       }
 
-      if @s3_object_key_format.include?('%{uuid_flush}')
+      if target_path.include?('%{uuid_flush}')
         # test uuidtools works or not
         begin
           require 'uuidtools'
@@ -327,7 +331,7 @@ module Fluent
         @uuid_flush_enabled = true
       end
 
-      @s3_object_key_format.gsub('%{hostname}') { |expr|
+      target_path.gsub('%{hostname}') { |expr|
         log.warn "%{hostname} will be removed in the future. Use \"\#{Socket.gethostname}\" instead"
         Socket.gethostname
       }

data/test/test_out_s3.rb

@@ -129,6 +129,19 @@ class S3OutputTest < Test::Unit::TestCase
     assert_equal false, d.instance.check_object
   end
 
+  def test_config_with_hostname_placeholder
+    d = create_driver(<<EOC)
+      aws_key_id test_key_id
+      aws_sec_key test_sec_key
+      s3_bucket test_bucket
+      path log/%{hostname}/test
+      s3_object_key_format %{path}%{hostname}_%{index}
+      buffer_type memory
+EOC
+    assert_match /#{Socket.gethostname}/, d.instance.s3_object_key_format
+    assert_match /#{Socket.gethostname}/, d.instance.path
+  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.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Amazon S3 output plugin for Fluentd event collector