logstash-input-s3-sns-sqs 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ebe297717052d3ebfb240a9eb254180eccd365
-  data.tar.gz: 3d9634f79fd6f48b988f5aea5cfdc04e33ee823a
+  metadata.gz: 90767d180f6cd7b2fa9f6a5bcabc1a48145ea6da
+  data.tar.gz: 5edfbb1c18997d348c26b1a64aaebb8d122b6469
 SHA512:
-  metadata.gz: 1168a6a1dd47371ba8e49b228c135a8e7b7db81433cec982be2e49308de856f2d26f715ab4f1bfdac1f6aa9aa6ee6531d0f36fa46320284b5b5c5651e72ccf7c
-  data.tar.gz: 4d073e317dd2be93d24007cc3952706e24d9217afc6f75bf493051dd5a68396cc712c6311e2bbfc700ad1136bf18f9e4538ac633e64e136fc1d521d6bb9bfebe
+  metadata.gz: 40bc21baac61cbcbcd7fe6af69f8a58dc2ad8f77d2869bbc26886232ef864dae3427768077a81e2bb5b5690121d78c01b36c5ec3534b8818be98d46cdee32d2f
+  data.tar.gz: 942de0725fa1befd61163fd9a66a8e151d9149ec44bf5eadaf88ce0a8ddf0a97df12e03df43a91a62d07e53382f9e7cdd9bc070321c6b250c2f8a0010be235b0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+##1.6.0
+- add a test to tmp file deletion
+- revert type folder regex
 ##1.5.9
 - Fix regex for type folder
 ##1.5.8

data/lib/logstash/inputs/s3snssqs.rb

@@ -223,7 +223,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
     if download_remote_file(object, filename)
       if process_local_log( filename, key, folder, instance_codec, queue, bucket, message, size)
         begin
-          FileUtils.remove_entry_secure(filename, true)
+          FileUtils.remove_entry_secure(filename, true) if File.exists? filename
           delete_file_from_bucket(object)
         rescue Exception => e
           @logger.debug("We had problems to delete your file", :file => filename, :error => e)
@@ -231,7 +231,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
       end
     else
       begin
-        FileUtils.remove_entry_secure(filename, true)
+        FileUtils.remove_entry_secure(filename, true) if File.exists? filename
       rescue Exception => e
         @logger.debug("We had problems clean up your tmp dir", :file => filename, :error => e)
       end
@@ -336,7 +336,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
 
   private
   def get_object_folder(key)
-    if match=/#{s3_key_prefix}\/?(?<type_folder>.+)\/.*/.match(key)
+    if match=/#{s3_key_prefix}\/?(?<type_folder>.*?)\/.*/.match(key)
       return match['type_folder']
     else
       return ""

data/logstash-input-s3-sns-sqs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-s3-sns-sqs'
-  s.version         = '1.5.9'
+  s.version         = '1.6.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> sqs."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3-sns-sqs
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement