fluent-plugin-s3 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec3e12f232c01e8d49337f8400f81eb721ecb72
-  data.tar.gz: 214c840df68e54ff4c96c5278b0bad06156e028e
+  metadata.gz: 109bc4e5f8560c3d6775afa7722d6bf0f77bdea1
+  data.tar.gz: ee37d164039e615cbaa2cd32c72e75d7e98eec8f
 SHA512:
-  metadata.gz: db47889fef5cb149f2f5c590887ad83989af1c7bee798b784dcc0b33ff48a6bd0c1e0c9b4a2b83d301f924882cb9b11cd3b382f1785e673fc09b71701d1ba2f2
-  data.tar.gz: bacf47f05d717afdcf2298cf31ee154392c8081809c4f337563e706bd8ba3248cf0e2cbccfab80be7811dd01d1df8bd21f29718af1c07860ceeec14274a6010c
+  metadata.gz: af19567e42112011c726894551b16b87f85b04176afd4770932a1968988f8717605b6f9b77f901fc467efbed2b60faf292ee41289d0afc3f687a06ee10c400de
+  data.tar.gz: 43c5e86c3bbb2d0a5b65d7a6728ff916b82d8b732dd24fd1177fd7a7ba278f2e329625116f58bf5d9796261716d893f944b438cf5ee1ad66784edeb9be3599ec

data/.travis.yml

@@ -4,9 +4,8 @@ rvm:
   - 2.1.10
   - 2.2.5
   - 2.3.1
-  - 2.4.0-rc1
+  - 2.4.0
   - ruby-head
-  - rbx
 
 gemfile:
  - Gemfile
@@ -14,6 +13,7 @@ gemfile:
 branches:
   only:
     - master
+    - v0.12
 
 before_install: gem update bundler
 script: bundle exec rake test
@@ -23,4 +23,3 @@ sudo: false
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx

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 @@
-1.0.0.rc1
+1.0.0.rc2

data/lib/fluent/plugin/out_s3.rb

@@ -64,6 +64,8 @@ module Fluent::Plugin
     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"
@@ -151,6 +153,10 @@ module Fluent::Plugin
       @values_for_s3_object_chunk = {}
     end
 
+    def multi_workers_ready?
+      true
+    end
+
     def start
       options = setup_credentials
       options[:region] = @s3_region if @s3_region
@@ -159,6 +165,7 @@ module Fluent::Plugin
       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)
@@ -304,7 +311,7 @@ module Fluent::Plugin
     def process_s3_object_key_format
       %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!
+          raise Fluent::ConfigError, %!#{ph} placeholder in s3_object_key_format is removed!
         end
       }
 
@@ -313,12 +320,12 @@ module Fluent::Plugin
         begin
           require 'uuidtools'
         rescue LoadError
-          raise ConfigError, "uuidtools gem not found. Install uuidtools gem first"
+          raise Fluent::ConfigError, "uuidtools gem not found. Install uuidtools gem first"
         end
         begin
           uuid_random
         rescue => e
-          raise ConfigError, "Generating uuid doesn't work. Can't use %{uuid_flush} on this environment. #{e}"
+          raise Fluent::ConfigError, "Generating uuid doesn't work. Can't use %{uuid_flush} on this environment. #{e}"
         end
         @uuid_flush_enabled = true
       end

data/test/test_out_s3.rb

@@ -251,7 +251,7 @@ class S3OutputTest < Test::Unit::TestCase
     assert_equal(expected, d.formatted)
   end
 
-  CONFIG_TIME_SLICE = %[
+  CONFIG_TIME_SLICE = <<EOC
     aws_key_id test_key_id
     aws_sec_key test_sec_key
     s3_bucket test_bucket
@@ -263,7 +263,7 @@ class S3OutputTest < Test::Unit::TestCase
     @log_level debug
     check_bucket true
     check_object true
-  ]
+EOC
 
   def create_time_sliced_driver(conf = CONFIG_TIME_SLICE)
     Fluent::Test::Driver::Output.new(Fluent::Plugin::S3Output) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 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