logstash-output-s3 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62c917fb80e5d23d3805867be54c62391c9d118
-  data.tar.gz: ded80a07e55c538ad48da433dc2cd5cb07509f5e
+  metadata.gz: 4101484ab3c3ed89b22088de339be1cf010b3753
+  data.tar.gz: 4f31784de1daf62a7673a3e756bff48876c3874f
 SHA512:
-  metadata.gz: fd6617e4be2b6c0abb035c96e21c1a99141bcb66a6f764c6168c34c6762d3bbfac096956ef570759fde88e787f867c5a96ff9d203836af1a5491fc395e4e3386
-  data.tar.gz: 0def00c7a109bb34a07ef2e96ffe6c017dcf0fdec5329e5432497264d7261a18d4cfa71390e0047c5f3f47cf383246bc609aeef4d6c27c7922af779a55822d29
+  metadata.gz: fd14b0db9ce158b3c0d7a00182f7aa6adf7eb5d5c178d958d6103204864fd1dc914929a2f214e67b1b4f0c931abef23f57fde968f423fb4ce62f31f52d79952a
+  data.tar.gz: f56cd39938dbf9191e8d4190b5e38fa60072a8ffb2e876776bcd82a7b84436d349d7056ee81372247ccdc7a88cc5b0635e2f81251c1d560f81777b52a66ca527

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.7
+  - Fix: `#restore_from_crash` should use the same upload options as the normal uploader. #140
+  - Fix: Wrongly named `canned_acl` options, renamed to "public-read", "public-read-write", "authenticated-read", from the documentation http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl
+
 ## 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

data/lib/logstash/outputs/s3.rb

@@ -71,8 +71,8 @@ Aws.eager_autoload!
 #      bucket => "your_bucket"                  (required)
 #      size_file => 2048                        (optional) - Bytes
 #      time_file => 5                           (optional) - Minutes
-#      format => "plain"                        (optional)
-#      canned_acl => "private"                  (optional. Options are "private", "public_read", "public_read_write", "authenticated_read". Defaults to "private" )
+#      codec => "plain"                         (optional)
+#      canned_acl => "private"                  (optional. Options are "private", "public-read", "public-read-write", "authenticated-read". Defaults to "private" )
 #    }
 #
 class LogStash::Outputs::S3 < LogStash::Outputs::Base
@@ -124,7 +124,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
   config :restore, :validate => :boolean, :default => true
 
   # The S3 canned ACL to use when putting the file. Defaults to "private".
-  config :canned_acl, :validate => ["private", "public_read", "public_read_write", "authenticated_read"],
+  config :canned_acl, :validate => ["private", "public-read", "public-read-write", "authenticated-read"],
          :default => "private"
 
   # Specifies wether or not to use S3's server side encryption. Defaults to no encryption.
@@ -372,7 +372,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
       .each do |file|
       temp_file = TemporaryFile.create_from_existing_file(file, temp_folder_path)
       @logger.debug("Recovering from crash and uploading", :file => temp_file.path)
-      @crash_uploader.upload_async(temp_file, :on_complete => method(:clean_temporary_file))
+      @crash_uploader.upload_async(temp_file, :on_complete => method(:clean_temporary_file), :upload_options => upload_options)
     end
   end
 end

data/logstash-output-s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-s3'
-  s.version         = '4.0.6'
+  s.version         = '4.0.7'
   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/integration/restore_from_crash_spec.rb

@@ -7,7 +7,7 @@ require "stud/temporary"
 describe "Restore from crash", :integration => true do
   include_context "setup plugin"
 
-  let(:options) { main_options.merge({ "restore" => true }) }
+  let(:options) { main_options.merge({ "restore" => true, "canned_acl" => "public-read-write" }) }
 
   let(:number_of_files) { 5 }
   let(:dummy_content) { "foobar\n" * 100 }
@@ -33,6 +33,7 @@ describe "Restore from crash", :integration => true do
     try(20) do
       expect(bucket_resource.objects(:prefix => prefix).count).to eq(number_of_files)
       expect(Dir.glob(File.join(temporary_directory, "*")).size).to eq(0)
+      expect(bucket_resource.objects(:prefix => prefix).first.acl.grants.collect(&:permission)).to include("READ", "WRITE")
     end
   end
 end

data/spec/outputs/s3_spec.rb

@@ -45,7 +45,7 @@ describe LogStash::Outputs::S3 do
 
     describe "Access control list" do
       context "when configured" do
-        ["private", "public_read", "public_read_write", "authenticated_read"].each do |permission|
+        ["private", "public-read", "public-read-write", "authenticated-read"].each do |permission|
           it "should return the configured ACL permissions: #{permission}" do
             s3 = described_class.new(options.merge({ "canned_acl" => permission }))
             expect(s3.upload_options).to include(:acl => permission)

metadata

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