fluent-plugin-s3 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 337c5d2366c1bc76613288e4a23a2f53a9192078
-  data.tar.gz: 50f1f97309df5a9ea20cea5da671b0cb451d2f0e
+  metadata.gz: 01ffa7311e94a67b2a4e73f48b3aaa0ae79c497c
+  data.tar.gz: 6f3e4f4c8b6545b08281c5253fc9c96b842e3342
 SHA512:
-  metadata.gz: 258e52f9de5e1966a7ae34229a7ccecee0e40a140f2837937a91218d4b85a6e7f66dc0d24f99fe8d3787e7a37cf49a0b2a22144132ba3a69579eb2ad907cfdc0
-  data.tar.gz: 410167969eddbc747058485898eea4c5048a1df14ff0ae4c3b06759cd931bd589cb31627adc767cd63c42279fab9f3cf3ffd3a4b53442dc173999f82f736d859
+  metadata.gz: 8c0ad9f1ff459c3b0e8cfd61d19250235fec011c6dca6b045437b38eb875a5589942fa1b3396db28b761249c60d57be54c3e632872b9b454bf4d4f9f7e6d7509
+  data.tar.gz: 9aac421b910d26bee7c678cde9f544dd343ea798fcef4e371c50d2f4616c2309a26d58f5a49090812750868ccb01683e2cc6b75fa68e34c83bd7588b2938b0ae

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.8.4 - 2017/06/26
+
+  * in_s3: Fix object handling for URL encoded key
+  * Improve error message for startup API error
+
+
 Release 0.8.3 - 2017/05/09
 
   * Add tmp_dir parameter to change the directory for tempfile

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/lib/fluent/plugin/in_s3.rb

@@ -11,6 +11,7 @@ module Fluent
       require 'zlib'
       require 'time'
       require 'tempfile'
+      require 'cgi/util'
 
       @extractor = nil
     end
@@ -223,12 +224,12 @@ module Fluent
       @bucket.objects.first
       log.debug("Succeeded to verify API keys")
     rescue => e
-      raise "can't call S3 API. Please check your aws_key_id / aws_sec_key or s3_region configuration. error = #{e.inspect}"
+      raise "can't call S3 API. Please check your credentials or s3_region configuration. error = #{e.inspect}"
     end
 
     def process(body)
       s3 = body["Records"].first["s3"]
-      key = s3["object"]["key"]
+      key = CGI.unescape(s3["object"]["key"])
 
       io = @bucket.object(key).get.body
       content = @extractor.extract(io)

data/lib/fluent/plugin/out_s3.rb

@@ -349,7 +349,7 @@ module Fluent
     rescue Aws::S3::Errors::NoSuchBucket
       # ignore NoSuchBucket Error because ensure_bucket checks it.
     rescue => e
-      raise "can't call S3 API. Please check your aws_key_id / aws_sec_key or s3_region configuration. error = #{e.inspect}"
+      raise "can't call S3 API. Please check your credentials or s3_region configuration. error = #{e.inspect}"
     end
 
     def setup_credentials

data/test/test_in_s3.rb

@@ -183,6 +183,42 @@ class S3InputTest < Test::Unit::TestCase
     end
   end
 
+  def test_one_record_url_encoded
+    setup_mocks
+    d = create_driver(CONFIG + "\ncheck_apikey_on_start false\nstore_as text\nformat none\n")
+    d.expect_emit("input.s3", @time, {"message" => "aaa"})
+
+    s3_object = stub(Object.new)
+    s3_response = stub(Object.new)
+    s3_response.body { StringIO.new("aaa") }
+    s3_object.get { s3_response }
+    @s3_bucket.object('test key').at_least(1) { s3_object }
+
+    body = {
+      "Records" => [
+        {
+          "s3" => {
+            "object" => {
+              "key" => "test+key"
+            }
+          }
+        }
+      ]
+    }
+    message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
+    @sqs_poller.get_messages(anything, anything) do |config, stats|
+      config.before_request.call(stats) if config.before_request
+      stats.request_count += 1
+      if stats.request_count >= 1
+        d.instance.instance_variable_set(:@running, false)
+      end
+      [message]
+    end
+    assert_nothing_raised {
+      d.run
+    }
+  end
+
   def test_one_record_multi_line
     setup_mocks
     d = create_driver(CONFIG + "\ncheck_apikey_on_start false\nstore_as text\nformat none\n")

metadata

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