logstash-input-s3 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d9ab89a4d7925dbaaa02b021b1bbe803426a5c2e5285c1239d72950563fc27
-  data.tar.gz: 40aafdb8002e940fcc08f72d119299567dda77210dedcaf436df9a273858ecf1
+  metadata.gz: a4e1cc2ba334eb9e35fc68cc6a773e13b9b7de5bc6c3b4ee40cf98903d140323
+  data.tar.gz: a43fe645c1016095639e092fa4d3e8e8b77384dd17190a712a0eaa5163e68854
 SHA512:
-  metadata.gz: 12730fa07325e2549ac32c8b7a629464c3a1d789992c5e07bd3f1bf43ad11b353886882678d00c27a14a7e0e675eaaa4002187f5141d078308de8e3e480d67d3
-  data.tar.gz: 24c61bb4d995ef2615cf9ea769ad36d88965eb758e8a9d205394a887ca6f1cac47211e76c42c81e8499f1ab818e072ee50e52431de045e1018402af947f61df3
+  metadata.gz: e10a6e21aa62270ce5f78c269fb3abf0a28b0755f78b0cb7adcc76183be460472327bdabbc94fab51c35774ae930d25846084ad3b9b0e95bd9e021c995c08bbd
+  data.tar.gz: 23b6882049688b1cd57ccba4b8aa247103bf5b9f91011f1aa426e81280c3b4ca701bf88fd96e278968c7e38fd58a01980a830b4ce2bb9ad8e034cfe07113de79

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.6.0
+ - Fixed unprocessed file with the same `last_modified` in ingestion. [#220](https://github.com/logstash-plugins/logstash-input-s3/pull/220)
+
+## 3.5.2
+ - [DOC]Added note that only AWS S3 is supported. No other S3 compatible storage solutions are supported. [#208](https://github.com/logstash-plugins/logstash-input-s3/issues/208)
+
+## 3.5.1
+ - [DOC]Added example for `exclude_pattern` and reordered option descriptions [#204](https://github.com/logstash-plugins/logstash-input-s3/issues/204)
+ 
 ## 3.5.0
  - Added support for including objects restored from Glacier or Glacier Deep [#199](https://github.com/logstash-plugins/logstash-input-s3/issues/199)
  - Added `gzip_pattern` option, enabling more flexible determination of whether a file is gzipped [#165](https://github.com/logstash-plugins/logstash-input-s3/issues/165)

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-s3.svg)](https://travis-ci.org/logstash-plugins/logstash-input-s3)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-s3.svg)](https://travis-ci.com/logstash-plugins/logstash-input-s3)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/docs/index.asciidoc

@@ -23,6 +23,9 @@ include::{include_path}/plugin_header.asciidoc[]
 
 Stream events from files from a S3 bucket.
 
+IMPORTANT: The S3 input plugin only supports AWS S3. 
+Other S3 compatible storage solutions are not supported.
+
 Each line from each file generates an event.
 Files ending in `.gz` are handled as gzip'ed files.
 
@@ -80,6 +83,29 @@ This plugin uses the AWS SDK and supports several ways to get credentials, which
 4. Environment variables `AMAZON_ACCESS_KEY_ID` and `AMAZON_SECRET_ACCESS_KEY`
 5. IAM Instance Profile (available when running inside EC2)
 
+
+[id="plugins-{type}s-{plugin}-additional_settings"]
+===== `additional_settings`
+
+  * Value type is <<hash,hash>>
+  * Default value is `{}`
+
+Key-value pairs of settings and corresponding values used to parametrize
+the connection to s3. See full list in https://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html[the AWS SDK documentation]. Example:
+
+[source,ruby]
+    input {
+      s3 {
+        "access_key_id" => "1234"
+        "secret_access_key" => "secret"
+        "bucket" => "logstash-test"
+        "additional_settings" => {
+          "force_path_style" => true
+          "follow_redirects" => false
+        }
+      }
+    }
+
 [id="plugins-{type}s-{plugin}-aws_credentials_file"]
 ===== `aws_credentials_file` 
 
@@ -157,7 +183,20 @@ guaranteed to work correctly with the AWS SDK.
   * Value type is <<string,string>>
   * Default value is `nil`
 
-Ruby style regexp of keys to exclude from the bucket
+Ruby style regexp of keys to exclude from the bucket.
+
+Note that files matching the pattern are skipped _after_ they have been listed. 
+Consider using <<plugins-{type}s-{plugin}-prefix>> instead where possible.
+
+Example:
+
+[source,ruby]
+-----
+"exclude_pattern" => "\/2020\/04\/"
+-----
+
+This pattern excludes all logs containing "/2020/04/" in the path.
+
 
 [id="plugins-{type}s-{plugin}-gzip_pattern"]
 ===== `gzip_pattern`
@@ -167,28 +206,6 @@ Ruby style regexp of keys to exclude from the bucket
 
 Regular expression used to determine whether an input file is in gzip format.
 
-[id="plugins-{type}s-{plugin}-additional_settings"]
-===== `additional_settings`
-
-  * Value type is <<hash,hash>>
-  * Default value is `{}`
-
-Key-value pairs of settings and corresponding values used to parametrize
-the connection to s3. See full list in https://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html[the AWS SDK documentation]. Example:
-
-[source,ruby]
-    input {
-      s3 {
-        "access_key_id" => "1234"
-        "secret_access_key" => "secret"
-        "bucket" => "logstash-test"
-        "additional_settings" => {
-          "force_path_style" => true
-          "follow_redirects" => false
-        }
-      }
-    }
-
 [id="plugins-{type}s-{plugin}-include_object_properties"]
 ===== `include_object_properties`
 

data/lib/logstash/inputs/s3.rb

@@ -86,6 +86,8 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
   # default to an expression that matches *.gz and *.gzip file extensions
   config :gzip_pattern, :validate => :string, :default => "\.gz(ip)?$"
 
+  CUTOFF_SECOND = 3
+
   def register
     require "fileutils"
     require "digest/md5"
@@ -126,7 +128,7 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
   end # def run
 
   def list_new_files
-    objects = {}
+    objects = []
     found = false
     begin
       @s3bucket.objects(:prefix => @prefix).each do |log|
@@ -138,10 +140,12 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
           @logger.debug('Object Zero Length', :key => log.key)
         elsif !sincedb.newer?(log.last_modified)
           @logger.debug('Object Not Modified', :key => log.key)
+        elsif log.last_modified > (Time.now - CUTOFF_SECOND).utc # file modified within last two seconds will be processed in next cycle
+          @logger.debug('Object Modified After Cutoff Time', :key => log.key)
         elsif (log.storage_class == 'GLACIER' || log.storage_class == 'DEEP_ARCHIVE') && !file_restored?(log.object)
           @logger.debug('Object Archived to Glacier', :key => log.key)
         else
-          objects[log.key] = log.last_modified
+          objects << log
           @logger.debug("Added to objects[]", :key => log.key, :length => objects.length)
         end
       end
@@ -149,7 +153,7 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
     rescue Aws::Errors::ServiceError => e
       @logger.error("Unable to list objects in bucket", :exception => e.class, :message => e.message, :backtrace => e.backtrace, :prefix => prefix)
     end
-    objects.keys.sort {|a,b| objects[a] <=> objects[b]}
+    objects.sort_by { |log| log.last_modified }
   end # def fetch_new_files
 
   def backup_to_bucket(object)
@@ -171,11 +175,11 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
   def process_files(queue)
     objects = list_new_files
 
-    objects.each do |key|
+    objects.each do |log|
       if stop?
         break
       else
-        process_log(queue, key)
+        process_log(queue, log)
       end
     end
   end # def process_files
@@ -367,19 +371,22 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
     end
   end
 
-  def process_log(queue, key)
-    @logger.debug("Processing", :bucket => @bucket, :key => key)
-    object = @s3bucket.object(key)
+  def process_log(queue, log)
+    @logger.debug("Processing", :bucket => @bucket, :key => log.key)
+    object = @s3bucket.object(log.key)
 
-    filename = File.join(temporary_directory, File.basename(key))
+    filename = File.join(temporary_directory, File.basename(log.key))
     if download_remote_file(object, filename)
       if process_local_log(queue, filename, object)
-        lastmod = object.last_modified
-        backup_to_bucket(object)
-        backup_to_dir(filename)
-        delete_file_from_bucket(object)
-        FileUtils.remove_entry_secure(filename, true)
-        sincedb.write(lastmod)
+        if object.last_modified == log.last_modified
+          backup_to_bucket(object)
+          backup_to_dir(filename)
+          delete_file_from_bucket(object)
+          FileUtils.remove_entry_secure(filename, true)
+          sincedb.write(log.last_modified)
+        else
+          @logger.info("#{log.key} is updated at #{object.last_modified} and will process in the next cycle")
+        end
       end
     else
       FileUtils.remove_entry_secure(filename, true)

data/logstash-input-s3.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-s3'
-  s.version         = '3.5.0'
+  s.version         = '3.6.0'
   s.licenses        = ['Apache-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

@@ -24,6 +24,7 @@ describe LogStash::Inputs::S3 do
       "sincedb_path" => File.join(sincedb_path, ".sincedb")
     }
   }
+  let(:cutoff) { LogStash::Inputs::S3::CUTOFF_SECOND }
 
 
   before do
@@ -33,10 +34,11 @@ describe LogStash::Inputs::S3 do
   end
 
   context "when interrupting the plugin" do
-    let(:config) { super.merge({ "interval" => 5 }) }
+    let(:config) { super().merge({ "interval" => 5 }) }
+    let(:s3_obj) { double(:key => "awesome-key", :last_modified => Time.now.round, :content_length => 10, :storage_class => 'STANDARD', :object => double(:data => double(:restore => nil)) ) }
 
     before do
-      expect_any_instance_of(LogStash::Inputs::S3).to receive(:list_new_files).and_return(TestInfiniteS3Object.new)
+      expect_any_instance_of(LogStash::Inputs::S3).to receive(:list_new_files).and_return(TestInfiniteS3Object.new(s3_obj))
     end
 
     it_behaves_like "an interruptible input plugin"
@@ -115,11 +117,12 @@ describe LogStash::Inputs::S3 do
   describe "#list_new_files" do
     before { allow_any_instance_of(Aws::S3::Bucket).to receive(:objects) { objects_list } }
 
-    let!(:present_object) {double(:key => 'this-should-be-present', :last_modified => Time.now, :content_length => 10, :storage_class => 'STANDARD', :object => double(:data => double(:restore => nil)) ) }
-    let!(:archived_object) {double(:key => 'this-should-be-archived', :last_modified => Time.now, :content_length => 10, :storage_class => 'GLACIER', :object => double(:data => double(:restore => nil)) ) }
-    let!(:deep_archived_object) {double(:key => 'this-should-be-archived', :last_modified => Time.now, :content_length => 10, :storage_class => 'GLACIER', :object => double(:data => double(:restore => nil)) ) }
-    let!(:restored_object) {double(:key => 'this-should-be-restored-from-archive', :last_modified => Time.now, :content_length => 10, :storage_class => 'GLACIER', :object => double(:data => double(:restore => 'ongoing-request="false", expiry-date="Thu, 01 Jan 2099 00:00:00 GMT"')) ) }
-    let!(:deep_restored_object) {double(:key => 'this-should-be-restored-from-deep-archive', :last_modified => Time.now, :content_length => 10, :storage_class => 'DEEP_ARCHIVE', :object => double(:data => double(:restore => 'ongoing-request="false", expiry-date="Thu, 01 Jan 2099 00:00:00 GMT"')) ) }
+    let!(:present_object_after_cutoff) {double(:key => 'this-should-not-be-present', :last_modified => Time.now, :content_length => 10, :storage_class => 'STANDARD', :object => double(:data => double(:restore => nil)) ) }
+    let!(:present_object) {double(:key => 'this-should-be-present', :last_modified => Time.now - cutoff, :content_length => 10, :storage_class => 'STANDARD', :object => double(:data => double(:restore => nil)) ) }
+    let!(:archived_object) {double(:key => 'this-should-be-archived', :last_modified => Time.now  - cutoff, :content_length => 10, :storage_class => 'GLACIER', :object => double(:data => double(:restore => nil)) ) }
+    let!(:deep_archived_object) {double(:key => 'this-should-be-archived', :last_modified => Time.now - cutoff, :content_length => 10, :storage_class => 'GLACIER', :object => double(:data => double(:restore => nil)) ) }
+    let!(:restored_object) {double(:key => 'this-should-be-restored-from-archive', :last_modified => Time.now  - cutoff, :content_length => 10, :storage_class => 'GLACIER', :object => double(:data => double(:restore => 'ongoing-request="false", expiry-date="Thu, 01 Jan 2099 00:00:00 GMT"')) ) }
+    let!(:deep_restored_object) {double(:key => 'this-should-be-restored-from-deep-archive', :last_modified => Time.now  - cutoff, :content_length => 10, :storage_class => 'DEEP_ARCHIVE', :object => double(:data => double(:restore => 'ongoing-request="false", expiry-date="Thu, 01 Jan 2099 00:00:00 GMT"')) ) }
     let(:objects_list) {
       [
         double(:key => 'exclude-this-file-1', :last_modified => Time.now - 2 * day, :content_length => 100, :storage_class => 'STANDARD'),
@@ -127,7 +130,8 @@ describe LogStash::Inputs::S3 do
         archived_object,
         restored_object,
         deep_restored_object,
-        present_object
+        present_object,
+        present_object_after_cutoff
       ]
     }
 
@@ -135,7 +139,7 @@ describe LogStash::Inputs::S3 do
       plugin = LogStash::Inputs::S3.new(config.merge({ "exclude_pattern" => "^exclude" }))
       plugin.register
 
-      files = plugin.list_new_files
+      files = plugin.list_new_files.map { |item| item.key }
       expect(files).to include(present_object.key)
       expect(files).to include(restored_object.key)
       expect(files).to include(deep_restored_object.key)
@@ -143,6 +147,7 @@ describe LogStash::Inputs::S3 do
       expect(files).to_not include('exclude/logstash')    # matches exclude pattern
       expect(files).to_not include(archived_object.key)   # archived
       expect(files).to_not include(deep_archived_object.key)   # archived
+      expect(files).to_not include(present_object_after_cutoff.key)   # after cutoff
       expect(files.size).to eq(3)
     end
 
@@ -150,7 +155,7 @@ describe LogStash::Inputs::S3 do
       plugin = LogStash::Inputs::S3.new(config)
       plugin.register
 
-      files = plugin.list_new_files
+      files = plugin.list_new_files.map { |item| item.key }
       expect(files).to include(present_object.key)
       expect(files).to include(restored_object.key)
       expect(files).to include(deep_restored_object.key)
@@ -158,6 +163,7 @@ describe LogStash::Inputs::S3 do
       expect(files).to include('exclude/logstash')      # no exclude pattern given
       expect(files).to_not include(archived_object.key) # archived
       expect(files).to_not include(deep_archived_object.key)   # archived
+      expect(files).to_not include(present_object_after_cutoff.key)   # after cutoff
       expect(files.size).to eq(5)
     end
 
@@ -204,7 +210,7 @@ describe LogStash::Inputs::S3 do
                                                          'backup_to_bucket' => config['bucket']}))
         plugin.register
 
-        files = plugin.list_new_files
+        files = plugin.list_new_files.map { |item| item.key }
         expect(files).to include(present_object.key)
         expect(files).to_not include('mybackup-log-1') # matches backup prefix
         expect(files.size).to eq(1)
@@ -218,7 +224,7 @@ describe LogStash::Inputs::S3 do
       allow_any_instance_of(LogStash::Inputs::S3::SinceDB::File).to receive(:read).and_return(Time.now - day)
       plugin.register
 
-      files = plugin.list_new_files
+      files = plugin.list_new_files.map { |item| item.key }
       expect(files).to include(present_object.key)
       expect(files).to include(restored_object.key)
       expect(files).to include(deep_restored_object.key)
@@ -226,6 +232,7 @@ describe LogStash::Inputs::S3 do
       expect(files).to_not include('exclude/logstash')    # too old
       expect(files).to_not include(archived_object.key)   # archived
       expect(files).to_not include(deep_archived_object.key) # archived
+      expect(files).to_not include(present_object_after_cutoff.key)   # after cutoff
       expect(files.size).to eq(3)
     end
 
@@ -241,13 +248,14 @@ describe LogStash::Inputs::S3 do
 
         plugin = LogStash::Inputs::S3.new(config.merge({ 'prefix' => prefix }))
         plugin.register
-        expect(plugin.list_new_files).to eq([present_object.key])
+        expect(plugin.list_new_files.map { |item| item.key }).to eq([present_object.key])
     end
 
     it 'should sort return object sorted by last_modification date with older first' do
       objects = [
         double(:key => 'YESTERDAY', :last_modified => Time.now - day, :content_length => 5, :storage_class => 'STANDARD'),
         double(:key => 'TODAY', :last_modified => Time.now, :content_length => 5, :storage_class => 'STANDARD'),
+        double(:key => 'TODAY_BEFORE_CUTOFF', :last_modified => Time.now - cutoff, :content_length => 5, :storage_class => 'STANDARD'),
         double(:key => 'TWO_DAYS_AGO', :last_modified => Time.now - 2 * day, :content_length => 5, :storage_class => 'STANDARD')
       ]
 
@@ -256,7 +264,7 @@ describe LogStash::Inputs::S3 do
 
       plugin = LogStash::Inputs::S3.new(config)
       plugin.register
-      expect(plugin.list_new_files).to eq(['TWO_DAYS_AGO', 'YESTERDAY', 'TODAY'])
+      expect(plugin.list_new_files.map { |item| item.key }).to eq(['TWO_DAYS_AGO', 'YESTERDAY', 'TODAY_BEFORE_CUTOFF'])
     end
 
     describe "when doing backup on the s3" do
@@ -451,7 +459,7 @@ describe LogStash::Inputs::S3 do
     end
 
     context 'compressed with gzip extension and using custom gzip_pattern option' do
-      let(:config) { super.merge({ "gzip_pattern" => "gee.zip$" }) }
+      let(:config) { super().merge({ "gzip_pattern" => "gee.zip$" }) }
       let(:log) { double(:key => 'log.gee.zip', :last_modified => Time.now - 2 * day, :content_length => 5, :storage_class => 'STANDARD') }
       let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'compressed.log.gee.zip') }
        include_examples "generated events"
@@ -499,7 +507,7 @@ describe LogStash::Inputs::S3 do
     end
 
     context 'when include_object_properties is set to true' do
-      let(:config) { super.merge({ "include_object_properties" => true }) }
+      let(:config) { super().merge({ "include_object_properties" => true }) }
       let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'uncompressed.log') }
 
       it 'should extract object properties onto [@metadata][s3]' do
@@ -513,7 +521,7 @@ describe LogStash::Inputs::S3 do
     end
 
     context 'when include_object_properties is set to false' do
-      let(:config) { super.merge({ "include_object_properties" => false }) }
+      let(:config) { super().merge({ "include_object_properties" => false }) }
       let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'uncompressed.log') }
 
       it 'should NOT extract object properties onto [@metadata][s3]' do
@@ -525,6 +533,67 @@ describe LogStash::Inputs::S3 do
 
       include_examples "generated events"
     end
+  end
+
+  describe "data loss" do
+    let(:s3_plugin) { LogStash::Inputs::S3.new(config) }
+    let(:queue) { [] }
+
+    before do
+      s3_plugin.register
+    end
+
+    context 'events come after cutoff time' do
+      it 'should be processed in next cycle' do
+        s3_objects = [
+          double(:key => 'TWO_DAYS_AGO', :last_modified => Time.now.round - 2 * day, :content_length => 5, :storage_class => 'STANDARD'),
+          double(:key => 'YESTERDAY', :last_modified => Time.now.round - day, :content_length => 5, :storage_class => 'STANDARD'),
+          double(:key => 'TODAY_BEFORE_CUTOFF', :last_modified => Time.now.round - cutoff, :content_length => 5, :storage_class => 'STANDARD'),
+          double(:key => 'TODAY', :last_modified => Time.now.round, :content_length => 5, :storage_class => 'STANDARD'),
+          double(:key => 'TODAY', :last_modified => Time.now.round, :content_length => 5, :storage_class => 'STANDARD')
+        ]
+        size = s3_objects.length
+
+        allow_any_instance_of(Aws::S3::Bucket).to receive(:objects) { s3_objects }
+        allow_any_instance_of(Aws::S3::Bucket).to receive(:object).and_return(*s3_objects)
+        expect(s3_plugin).to receive(:process_log).at_least(size).and_call_original
+        expect(s3_plugin).to receive(:stop?).and_return(false).at_least(size)
+        expect(s3_plugin).to receive(:download_remote_file).and_return(true).at_least(size)
+        expect(s3_plugin).to receive(:process_local_log).and_return(true).at_least(size)
+
+        # first iteration
+        s3_plugin.process_files(queue)
+
+        # second iteration
+        sleep(cutoff + 1)
+        s3_plugin.process_files(queue)
+      end
+    end
+
+    context 's3 object updated after getting summary' do
+      it 'should not update sincedb' do
+        s3_summary = [
+          double(:key => 'YESTERDAY', :last_modified => Time.now.round - day, :content_length => 5, :storage_class => 'STANDARD'),
+          double(:key => 'TODAY', :last_modified => Time.now.round - (cutoff * 10), :content_length => 5, :storage_class => 'STANDARD')
+        ]
+
+        s3_objects = [
+          double(:key => 'YESTERDAY', :last_modified => Time.now.round - day, :content_length => 5, :storage_class => 'STANDARD'),
+          double(:key => 'TODAY_UPDATED', :last_modified => Time.now.round, :content_length => 5, :storage_class => 'STANDARD')
+        ]
+
+        size = s3_objects.length
+
+        allow_any_instance_of(Aws::S3::Bucket).to receive(:objects) { s3_summary }
+        allow_any_instance_of(Aws::S3::Bucket).to receive(:object).and_return(*s3_objects)
+        expect(s3_plugin).to receive(:process_log).at_least(size).and_call_original
+        expect(s3_plugin).to receive(:stop?).and_return(false).at_least(size)
+        expect(s3_plugin).to receive(:download_remote_file).and_return(true).at_least(size)
+        expect(s3_plugin).to receive(:process_local_log).and_return(true).at_least(size)
 
+        s3_plugin.process_files(queue)
+        expect(s3_plugin.send(:sincedb).read).to eq(s3_summary[0].last_modified)
+      end
+    end
   end
 end

data/spec/integration/s3_spec.rb

@@ -10,6 +10,7 @@ describe LogStash::Inputs::S3, :integration => true, :s3 => true do
 
     upload_file('../fixtures/uncompressed.log' , "#{prefix}uncompressed_1.log")
     upload_file('../fixtures/compressed.log.gz', "#{prefix}compressed_1.log.gz")
+    sleep(LogStash::Inputs::S3::CUTOFF_SECOND + 1)
   end
 
   after do
@@ -28,6 +29,7 @@ describe LogStash::Inputs::S3, :integration => true, :s3 => true do
                                "prefix" => prefix,
                                "temporary_directory" => temporary_directory } }
   let(:backup_prefix) { "backup/" }
+  let(:backup_bucket) { "logstash-s3-input-backup" }
 
   it "support prefix to scope the remote files" do
     events = fetch_events(minimal_settings)
@@ -49,13 +51,17 @@ describe LogStash::Inputs::S3, :integration => true, :s3 => true do
   end
 
   context "remote backup" do
+    before do
+      create_bucket(backup_bucket)
+    end
+
     it "another bucket" do
-      fetch_events(minimal_settings.merge({ "backup_to_bucket" => "logstash-s3-input-backup"}))
-      expect(list_remote_files("", "logstash-s3-input-backup").size).to eq(2)
+      fetch_events(minimal_settings.merge({ "backup_to_bucket" => backup_bucket}))
+      expect(list_remote_files("", backup_bucket).size).to eq(2)
     end
 
     after do
-      delete_bucket("logstash-s3-input-backup")
+      delete_bucket(backup_bucket)
     end
   end
 end

data/spec/support/helpers.rb

@@ -23,6 +23,10 @@ def list_remote_files(prefix, target_bucket = ENV['AWS_LOGSTASH_TEST_BUCKET'])
   bucket.objects(:prefix => prefix).collect(&:key)
 end
 
+def create_bucket(name)
+  s3object.bucket(name).create
+end
+
 def delete_bucket(name)
   s3object.bucket(name).objects.map(&:delete)
   s3object.bucket(name).delete
@@ -33,13 +37,16 @@ def s3object
 end
 
 class TestInfiniteS3Object
+  def initialize(s3_obj)
+    @s3_obj = s3_obj
+  end
+
   def each
     counter = 1
 
     loop do
-      yield "awesome-#{counter}"
+      yield @s3_obj
       counter +=1
     end
   end
-end
-
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement