logstash-output-s3 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a45d07d1d55ba2247ea058ca57be461f7773d9
-  data.tar.gz: c45f5e22b868918990ef27f5c2d2b1682f7ad93e
+  metadata.gz: d62c917fb80e5d23d3805867be54c62391c9d118
+  data.tar.gz: ded80a07e55c538ad48da433dc2cd5cb07509f5e
 SHA512:
-  metadata.gz: d05449f29cd48dbbf75372bae6a2b4a6722b23b34e3653f435f1edf49ee56caa473dc52972a4812888b600f8055c98b08ec4002f887cd38646941ffe05814887
-  data.tar.gz: 63ec9d6444fc8046aeaf05d81a7ea2a2e6e05b9d986538713d7e3357aa430ee1d3f6f49a7ae0ab15f1dd4950767aa8e13e8e1b8be72205167b132596f8348492
+  metadata.gz: fd6617e4be2b6c0abb035c96e21c1a99141bcb66a6f764c6168c34c6762d3bbfac096956ef570759fde88e787f867c5a96ff9d203836af1a5491fc395e4e3386
+  data.tar.gz: 0def00c7a109bb34a07ef2e96ffe6c017dcf0fdec5329e5432497264d7261a18d4cfa71390e0047c5f3f47cf383246bc609aeef4d6c27c7922af779a55822d29

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.0.6
+  - Fix: Use the right `signature_version` for the SDK v2 #129
+  - Fix an issue to prevent the output to upload empty file to S3 #128
+  - Docs: Update the doc to show the new format of the remote file #126
+
 ## 4.0.5
   - Delete the file on disk after they are succesfully uploaded to S3 #122 #120
   - Added logging when an exception occur in the Uploader's `on_complete` callback

data/CONTRIBUTORS

@@ -2,6 +2,7 @@ The following is a list of people who have contributed ideas, code, bug
 reports, or in general have helped logstash along its way.
 
 Contributors:
+* Chad Bean (chadbean)
 * Colin Surprenant (colinsurprenant)
 * Helmut Duregger (hduregger)
 * Jordan Sissel (jordansissel)

data/lib/logstash/outputs/s3.rb

@@ -28,12 +28,12 @@ Aws.eager_autoload!
 #
 # S3 output files have the following format
 #
-# ls.s3.ip-10-228-27-95.2013-04-18T10.00.tag_hello.part0.txt
+# ls.s3.312bc026-2f5d-49bc-ae9f-5940cf4ad9a6.2013-04-18T10.00.tag_hello.part0.txt
 #
 #
 # |=======
 # | ls.s3 | indicate logstash plugin s3 |
-# | ip-10-228-27-95 | indicates the ip of your machine. |
+# | 312bc026-2f5d-49bc-ae9f-5940cf4ad9a6 | a new, random uuid per file. |
 # | 2013-04-18T10.00 | represents the time whenever you specify time_file. |
 # | tag_hello | this indicates the event's tag. |
 # | part0 | this means if you indicate size_file then it will generate more parts if you file.size > size_file. When a file is full it will be pushed to the bucket and then deleted from the temporary directory. If a file is empty, it is simply deleted.  Empty files will not be pushed |
@@ -268,7 +268,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
 
   def full_options
     options = Hash.new
-    options[:s3_signature_version] = @signature_version if @signature_version
+    options[:signature_version] = @signature_version if @signature_version
     options.merge(aws_options_hash)
   end
 

data/lib/logstash/outputs/s3/temporary_file_factory.rb

@@ -109,8 +109,14 @@ module LogStash
 
           def size
             # to get the current file size
-            @gzip_writer.flush
-            @gzip_writer.to_io.size
+            if @gzip_writer.pos == 0
+              # Ensure a zero file size is returned when nothing has
+              # yet been written to the gzip file.
+              0
+            else
+              @gzip_writer.flush
+              @gzip_writer.to_io.size
+            end
           end
 
           def fsync

data/logstash-output-s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-s3'
-  s.version         = '4.0.5'
+  s.version         = '4.0.6'
   s.licenses        = ['Apache-2.0']
   s.summary         = "This plugin was created for store the logstash's events into Amazon Simple Storage Service (Amazon S3)"
   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/outputs/s3/temporary_file_factory_spec.rb

@@ -20,6 +20,10 @@ describe LogStash::Outputs::S3::TemporaryFileFactory do
       expect(File.exist?(subject.current.path)).to be_truthy
     end
 
+    it "returns a size equal to zero after file creation" do
+      expect(subject.current.size).to eq(0)
+    end
+
     it "create a temporary file when initialized" do
       expect(subject.current).to be_kind_of(LogStash::Outputs::S3::TemporaryFile)
     end

data/spec/outputs/s3_spec.rb

@@ -33,13 +33,13 @@ describe LogStash::Outputs::S3 do
       it "should set the signature version if specified" do
         ["v2", "v4"].each do |version|
           s3 = described_class.new(options.merge({ "signature_version" => version }))
-          expect(s3.full_options).to include(:s3_signature_version => version)
+          expect(s3.full_options).to include(:signature_version => version)
         end
       end
 
       it "should omit the option completely if not specified" do
         s3 = described_class.new(options)
-        expect(s3.full_options.has_key?(:s3_signature_version)).to eql(false)
+        expect(s3.full_options.has_key?(:signature_version)).to eql(false)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-s3
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement