logstash-input-google_cloud_storage 0.10.0-java → 0.11.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e78557c8bf094bfd04130b57015071baadd85453f4f697589352da83e40fdeb6
-  data.tar.gz: 0320d090a6bf8dc24676ab59ea59c401cb6aa18c8d4206a1df69017de7901617
+  metadata.gz: c20c2d9f755771cdb30a741b03fcb29d11deeff6b075a568d97ccfe0e7881752
+  data.tar.gz: 6be0b906561133eb665431e33c2671c8406c77a77a898f9dbf3a6a908261982b
 SHA512:
-  metadata.gz: c9fd651ea1779ec2e824f11975ff95e3f3b3d3be809c150e590d60e2d500ab2fc78d4f1058326ba7c7058f75a1be3d693bb7f0317ab3de4f9ad30cd8e8a73188
-  data.tar.gz: 5935af6d43c06e4c766fed2b64e5d5c01ebed026edfb157ab1f27ff06af3111a5dff83df35a6f36f8fa4b0304fb04c1edc4bdfefe12de3598f3539ab24b4b2de
+  metadata.gz: '0082d0401dc705db1cd4d66d185e20ad97afb7371029100225d154f537441b0b6d8acc3fc2bdde14f498f0c843b016ae2777b95f528a89b91f243e84dfaa2df3'
+  data.tar.gz: f5f6161ad1dc40c5be341153118c2c1b52c91e8af3c3c221c9dc77fdddd911d14681aedcd30662a2f60030c78e5422e2a415dfb24a5df8d740221c774ecf6fd3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.0
+
+- Change gzip file detection to use mime type instead of extension
+
 ## 0.10.0
 
 - Updated JAR dependencies.

data/CONTRIBUTORS

@@ -4,6 +4,7 @@ reports, or in general have helped logstash along its way.
 Contributors:
 * Google LLC.
 * Joseph Lewis III - jlewisiii@google.com
+* Claus Strommer - Green Brick Labs
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/lib/logstash/inputs/cloud_storage/file_reader.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'zlib'
+require 'mimemagic'
 
 module LogStash
   module Inputs
@@ -22,7 +23,8 @@ module LogStash
 
         # gzip? returns true if the given filename has a gzip file extension.
         def self.gzip?(filename)
-          filename.end_with? '.gz'
+          magic = MimeMagic.by_magic(::File.open(filename))
+          magic ? magic.subtype == "gzip" : false
         end
 
         def self.read_plain_lines(filename, &block)

data/logstash-input-google_cloud_storage.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-google_cloud_storage'
-  s.version       = '0.10.0'
+  s.version       = '0.11.1'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Plugin to import log data from Google Cloud Storage (GCS).'
   s.description   = 'This gem is a Logstash plugin required to be installed on top of the '\
@@ -40,10 +40,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'logstash-core-plugin-api', '~> 2.0'
   s.add_runtime_dependency 'stud', '>= 0.0.22'
+  s.add_runtime_dependency 'mimemagic', '>= 0.3.3'
 
   s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
 
   # Java
-  s.add_development_dependency 'jar-dependencies', '~> 0.3.4'
+  s.add_development_dependency 'jar-dependencies', '~> 0.4.0'
   s.platform = 'java'
 end

data/spec/fixtures/gzip/simple.gz.log

@@ -0,0 +1,2 @@
+hello
+world

data/spec/fixtures/gzip/simple.log

@@ -0,0 +1,2 @@
+hello
+world

data/spec/fixtures/gzip/simpledir.gz/log

@@ -0,0 +1,2 @@
+hello
+world

data/spec/inputs/cloud_storage/file_reader_spec.rb

@@ -8,18 +8,19 @@ describe LogStash::Inputs::CloudStorage::FileReader do
   describe '#gzip?' do
     GzipTest = Struct.new('GzipTest', :path, :expected)
 
-    it 'is true when the file ends with .gz' do
+    it 'is true when the file has .gz mimetype' do
       cases = [
-        GzipTest.new('simple.gz', true),
-        GzipTest.new('subdir/simple.gz', true),
-        GzipTest.new('/abs/path.gz', true),
-        GzipTest.new('path.log.gz', true),
-
-        GzipTest.new('path.log.gzip', false),
-        GzipTest.new('simple.log', false),
-        GzipTest.new('simple.gz/foo', false),
-        GzipTest.new('simple.gz.log', false),
-        GzipTest.new('foo.tgz', false)
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.gz'), true),
+        GzipTest.new(::File.join(::Dir.pwd, 'spec', 'fixtures', 'gzip', 'simple.gz'), true),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.log.gz'), true),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.gzip'), true),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simplegz'), true),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.tgz'), true),
+
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.log'), false),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simpledir.gz/log'), false),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.gz.log'), false),
+        GzipTest.new(::File.join('.', 'spec', 'fixtures', 'gzip', 'simple.log'), false),
       ]
 
       cases.each do |test|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-google_cloud_storage
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: java
 authors:
 - Elastic
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  name: mimemagic
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -72,7 +86,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
   name: jar-dependencies
   prerelease: false
   type: :development
@@ -80,7 +94,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
 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
@@ -105,6 +119,14 @@ files:
 - lib/logstash/inputs/google_cloud_storage.rb
 - logstash-input-google_cloud_storage.gemspec
 - spec/fixtures/credentials.json
+- spec/fixtures/gzip/simple.gz
+- spec/fixtures/gzip/simple.gz.log
+- spec/fixtures/gzip/simple.gzip
+- spec/fixtures/gzip/simple.log
+- spec/fixtures/gzip/simple.log.gz
+- spec/fixtures/gzip/simple.tgz
+- spec/fixtures/gzip/simpledir.gz/log
+- spec/fixtures/gzip/simplegz
 - spec/fixtures/helloworld.log
 - spec/fixtures/helloworld.log.gz
 - spec/inputs/cloud_storage/blob_adapter_spec.rb
@@ -181,6 +203,14 @@ specification_version: 4
 summary: Plugin to import log data from Google Cloud Storage (GCS).
 test_files:
 - spec/fixtures/credentials.json
+- spec/fixtures/gzip/simple.gz
+- spec/fixtures/gzip/simple.gz.log
+- spec/fixtures/gzip/simple.gzip
+- spec/fixtures/gzip/simple.log
+- spec/fixtures/gzip/simple.log.gz
+- spec/fixtures/gzip/simple.tgz
+- spec/fixtures/gzip/simpledir.gz/log
+- spec/fixtures/gzip/simplegz
 - spec/fixtures/helloworld.log
 - spec/fixtures/helloworld.log.gz
 - spec/inputs/cloud_storage/blob_adapter_spec.rb