logstash-input-s3 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc29d7a88714576ad9dfb0dd152e5026825ba2f
-  data.tar.gz: faddf8e9a48bf01ea30fb1c4c77fe28bb80990e8
+  metadata.gz: 939d76e37b99e18082ac1ce254e2f3cb985badcf
+  data.tar.gz: c343885300f82500f0c2afa414336a7c56d1927f
 SHA512:
-  metadata.gz: 57d6c5a51e9208297edb48168fb83d091368ac9658f4befb0c1a60af1d7f5d2065ef71ff707292a072bac9d7487b8aabdc4639fda517f6d29a5bc5fcafc6db0f
-  data.tar.gz: a7e0dbc17be73c37f24b5595a133b25f9f731ec8c13b882f01af2b55abf2f62e5bf6e30f7a49b4b75ebb94990cb57ba230ce83551da0cbaa29e4f3ff13b16f36
+  metadata.gz: e5126a3db583f404d16bdf1d1e447dd574fa18d4d31e04d2e447e0345d3a9d8f02bbc436ae6a701c049be4b1c53619e6ed58279e723851d6fe6c49825d354a49
+  data.tar.gz: 01e4aebedbca23c9a4133a6c8886450081594cf72803bd90d19a2d542ff815c592362b50539933b04a58247edee8439a6e32f77adf99f5df7eb06ac7555b1f16

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.4
+ - Avoid parsing non string elements #109
+
 ## 3.1.3
  - The plugin will now include the s3 key in the metadata #105
 

data/lib/logstash/inputs/s3.rb

@@ -202,7 +202,7 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
 
   private
   def event_is_metadata?(event)
-    return false if event.get("message").nil?
+    return false unless event.get("message").class == String
     line = event.get("message")
     version_metadata?(line) || fields_metadata?(line)
   end

data/logstash-input-s3.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-s3'
-  s.version         = '3.1.3'
+  s.version         = '3.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from files from a S3 bucket."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/fixtures/json_with_message.log

@@ -0,0 +1,2 @@
+{ "message": ["GET", 32, "/health"] }
+{ "message": true }

data/spec/inputs/s3_spec.rb

@@ -254,6 +254,20 @@ describe LogStash::Inputs::S3 do
       include_examples "generated events"
     end
 
+    context "when event does have a `message` field" do
+      let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'json_with_message.log') }
+      let(:config) {
+        {
+          "access_key_id" => "1234",
+          "secret_access_key" => "secret",
+          "bucket" => "logstash-test",
+          "codec" => "json",
+        }
+      }
+
+      include_examples "generated events"
+    end
+
     context "multiple compressed streams" do
       let(:log) { double(:key => 'log.gz', :last_modified => Time.now - 2 * day) }
       let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'multiple_compressed_streams.gz') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - spec/fixtures/compressed.log.gz
 - spec/fixtures/invalid_utf8.log
 - spec/fixtures/json.log
+- spec/fixtures/json_with_message.log
 - spec/fixtures/multiple_compressed_streams.gz
 - spec/fixtures/uncompressed.log
 - spec/inputs/s3_spec.rb
@@ -142,6 +143,7 @@ test_files:
 - spec/fixtures/compressed.log.gz
 - spec/fixtures/invalid_utf8.log
 - spec/fixtures/json.log
+- spec/fixtures/json_with_message.log
 - spec/fixtures/multiple_compressed_streams.gz
 - spec/fixtures/uncompressed.log
 - spec/inputs/s3_spec.rb