fluent-plugin-s3 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583365ff89e3d5371be071e1065030ae655e3dbb
-  data.tar.gz: 3f938eab7dd5bb3a5d686a007e6a29743f751f35
+  metadata.gz: c57b9015fd34e6bce4973b7768c86363cb9d8806
+  data.tar.gz: 3cb591a1dab99c38c072175e8a017e94c8bc4c5f
 SHA512:
-  metadata.gz: eb68e549ce5db08df659e30fd341c90ff9d199f1ddbb0b977b98021c26fc7aa21ef69a3a5f1ec08d44d69ed4c412469eb7532b70e3790d8f5482171f447cfe89
-  data.tar.gz: db22de81850f26cd017a11f09ea6c6abe32016f1979059c5ad3dc6a83fd5c502db87979b354000b7a1681f50cdeeb8eb2acdbdc9d5f89f65c84ba65bcd865a53
+  metadata.gz: 9c00167f73102c70b247fdd2b4468b05f217a285ef940604c9ee7d322f341276d7bc27672852cb68a2a5ffd24865c9ee51dd6fd5538570431aeb2476d485795f
+  data.tar.gz: 47756efbab1ea121695ecb4ab67276369f1bd9b320e7a1468c720f0e523276c43eb46079a2ecfe9db39ff4865c2174fde49e4b45f9d082156809a3813ea88387

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
+  - 2.2.0
   - rbx
 
 gemfile:

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.5.5 - 2015/02/19
+
+  * Revive s3_endpoint parameter for S3 compatible services
+
+
 Release 0.5.4 - 2015/02/12
 
   * Add use_server_side_encryption parameter

data/README.rdoc

@@ -39,6 +39,8 @@ Simply use RubyGems:
 
 [s3_region] s3 region name. For example, US West (Oregon) Region is "us-west-2". The full list of regions are available here. > http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region. We recommend using `s3_region` instead of `s3_endpoint`.
 
+[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.
+
 [s3_object_key_format] The format of S3 object keys. You can use several built-in variables:
 
 - %{path}

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/fluent-plugin-s3.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluent-mixin-config-placeholders", ">= 0.3.0"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "flexmock", ">= 1.2.0"
+  gem.add_development_dependency "test-unit", ">= 3.0.8"
 end

data/lib/fluent/plugin/out_s3.rb

@@ -21,6 +21,7 @@ module Fluent
     config_param :aws_sec_key, :string, :default => nil
     config_param :s3_bucket, :string
     config_param :s3_region, :string, :default => nil
+    config_param :s3_endpoint, :string, :default => nil
     config_param :s3_object_key_format, :string, :default => "%{path}%{time_slice}_%{index}.%{file_extension}"
     config_param :store_as, :string, :default => "gzip"
     config_param :auto_create_bucket, :bool, :default => true
@@ -40,8 +41,8 @@ module Fluent
     def configure(conf)
       super
 
-      if conf.has_key?('s3_endpoint')
-        raise ConfigError, "s3_endpoint parameter is removed. Use s3_region instead"
+      if @s3_endpoint && @s3_endpoint.end_with?('amazonaws.com')
+        raise ConfigError, "s3_endpoint parameter is not supported for S3, use s3_region instead. This parameter is for S3 compatible services"
       end
 
       begin
@@ -75,6 +76,7 @@ module Fluent
         options[:secret_access_key] = @aws_sec_key
       end
       options[:region] = @s3_region if @s3_region
+      options[:endpoint] = @s3_endpoint if @s3_endpoint
       options[:proxy_uri] = @proxy_uri if @proxy_uri
       options[:use_ssl] = @use_ssl
       options[:s3_server_side_encryption] = @use_server_side_encryption

data/test/test_out_s3.rb

@@ -46,6 +46,20 @@ class S3OutputTest < Test::Unit::TestCase
     assert_equal 'application/x-gzip', d.instance.instance_variable_get(:@compressor).content_type
   end
 
+  def test_s3_endpoint_with_valid_endpoint
+    d = create_driver(CONFIG + 's3_endpoint riak-cs.example.com')
+    assert_equal 'riak-cs.example.com', d.instance.s3_endpoint
+  end
+
+  data('US West (Oregon)' => 's3-us-west-2.amazonaws.com',
+       'EU (Frankfurt)' => 's3.eu-central-1.amazonaws.com',
+       'Asia Pacific (Tokyo)' => 's3-ap-northeast-1.amazonaws.com')
+  def test_s3_endpoint_with_invalid_endpoint(endpoint)
+    assert_raise(Fluent::ConfigError, "s3_endpoint parameter is not supported, use s3_region instead. This parameter is for S3 compatible services") {
+      d = create_driver(CONFIG + "s3_endpoint #{endpoint}")
+    }
+  end
+
   def test_configure_with_mime_type_json
     conf = CONFIG.clone
     conf << "\nstore_as json\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -101,6 +101,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.8
 description: Amazon S3 output plugin for Fluentd event collector
 email: frsyuki@gmail.com
 executables: []