logstash-input-s3 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3b88def1290e33f7d948bc9d48a62e43ac098be76f98b9b5fdd3745ab9e92e
-  data.tar.gz: f1901fe7e0c0edab44370b28f58c3145dc393a97a0098e7e4020d13534e08f36
+  metadata.gz: c14073f2906b9c1958697f2fac9d9c94f63451194494cb6c2b7152d7884fbf5e
+  data.tar.gz: fd650fb97f1624cb0586c47be4c12d5cfd6742135499474854d2f3f05526ee84
 SHA512:
-  metadata.gz: e5a17bf1aafc53530789724d2fcb9073c8b3b3f99f944044da7806e44a10023f278b3d54d44587238834d74b42b6cb9287561479f368a23c2c8afe552c000ad7
-  data.tar.gz: 8f9c6ba566077a036bd8a6737299bb83f480a35bfe8471fc847d6ef6378000f160b268e2068567e05497cd38ca22a90788bb7e7047b0b0e7cd9ab7ba46b5ac95
+  metadata.gz: 2dbb14ca04cebda808918a9cd2fec7a1fda0c5d41cb39ba30d86e83e3c62e9eb9ed77dd6e24ff77c5e8cdb2338061bf503ea1bad9dddeaffc65694258548d0eb
+  data.tar.gz: b0f938a69ba7968a7dacfba808eb8d4e983c6c2f01990a324e170579574789b3504db2cc670cfe2c290f3417eea3abbc03331bf5b071f697c1efdf3c4db86eb7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.4
+  - Log entry when bucket is empty #150
+
 ## 3.3.3
   - Symbolize hash keys for additional_settings hash #148
 

data/lib/logstash/inputs/s3.rb

@@ -109,18 +109,22 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
   public
   def list_new_files
     objects = {}
-
+    found = false
     begin
       @s3bucket.objects(:prefix => @prefix).each do |log|
+        found = true
         @logger.debug("S3 input: Found key", :key => log.key)
-        unless ignore_filename?(log.key)
+        if !ignore_filename?(log.key)
           if sincedb.newer?(log.last_modified) && log.content_length > 0
             objects[log.key] = log.last_modified
             @logger.debug("S3 input: Adding to objects[]", :key => log.key)
             @logger.debug("objects[] length is: ", :length => objects.length)
           end
+        else
+          @logger.debug('S3 input: Ignoring', :key => log.key)
         end
       end
+      @logger.info('S3 input: No files found in bucket', :prefix => prefix) unless found
     rescue Aws::Errors::ServiceError => e
       @logger.error("S3 input: Unable to list objects in bucket", :prefix => prefix, :message => e.message)
     end

data/logstash-input-s3.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-s3'
-  s.version         = '3.3.3'
+  s.version         = '3.3.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Streams events from files in 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/inputs/s3_spec.rb

@@ -135,6 +135,36 @@ describe LogStash::Inputs::S3 do
       expect(plugin.list_new_files).to eq(objects_list.map(&:key))
     end
 
+    context 'when all files are excluded from a bucket' do
+      let(:objects_list) {
+        [
+            double(:key => 'exclude-this-file-1', :last_modified => Time.now - 2 * day, :content_length => 100),
+            double(:key => 'exclude/logstash', :last_modified => Time.now - 2 * day, :content_length => 50),
+        ]
+      }
+
+      it 'should not log that no files were found in the bucket' do
+        plugin = LogStash::Inputs::S3.new(config.merge({ "exclude_pattern" => "^exclude" }))
+        plugin.register
+        allow(plugin.logger).to receive(:debug).with(anything, anything)
+
+        expect(plugin.logger).not_to receive(:info).with(/No files found/, anything)
+        expect(plugin.logger).to receive(:debug).with(/Ignoring/, anything)
+        expect(plugin.list_new_files).to be_empty
+      end
+    end
+
+    context 'with an empty bucket' do
+      let(:objects_list) { [] }
+
+      it 'should log that no files were found in the bucket' do
+        plugin = LogStash::Inputs::S3.new(config)
+        plugin.register
+        expect(plugin.logger).to receive(:info).with(/No files found/, anything)
+        expect(plugin.list_new_files).to be_empty
+      end
+    end
+
     context "If the bucket is the same as the backup bucket" do
       it 'should ignore files from the bucket if they match the backup prefix' do
         objects_list = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement