logstash-output-s3 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a315ceb77a4088e461235d7dc3b1817119fc4e5
-  data.tar.gz: 8c8af8b37bc0fc28e04047bcc28e4e3cb2eeceab
+  metadata.gz: 60f9298913378fe2ddc323e47608446b5c5a86d7
+  data.tar.gz: af5202e4af32c0c4fa7dddbfec8c2555d7ef11d5
 SHA512:
-  metadata.gz: 9f8ce1595416a8073ed3787ab7a157a06e72a5abca3dd73c27d188d6038a114281163abb95fd77ef9d12539e7521e11f680cb9c1d6632b0007800daa1ea52dda
-  data.tar.gz: f103fdbc0246870d301f59e306f182dd459123ee62d78324f6d51511917c97c89751f7ff50976d8e86cc2454d5028a2e373b4ff978760987f7e03874bde1887d
+  metadata.gz: 7944e4f6b681ab943d91a721e9c64dad4d811e9bd2dd7c1cb5169df842361750a95221f2fcb6db895356d0c1a87d8ca96e39f7895a482b65684151da47b1a284
+  data.tar.gz: ee024969ccf2968b408a1fc9e6a78714d02d9a900f47ae6e72b2d3dc81c40e44274798e81fadfa720fa88166b53f0eb6d2dc327a72bcd6ed6a19bc58169dfa2d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.12
+ - Fix bug where output would fail if the s3 bucket had encryption enabled (#146, #155)
+
 ## 4.0.11
  - Fixed a randomly occurring error that logged as a missing `__jcreate_meta` method
 

data/lib/logstash/outputs/s3.rb

@@ -197,7 +197,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
       raise LogStash::ConfigurationError, "Logstash must have the permissions to write to the temporary directory: #{@temporary_directory}"
     end
 
-    if @validate_credentials_on_root_bucket && !WriteBucketPermissionValidator.new(@logger).valid?(bucket_resource)
+    if @validate_credentials_on_root_bucket && !WriteBucketPermissionValidator.new(@logger).valid?(bucket_resource, upload_options)
       raise LogStash::ConfigurationError, "Logstash must have the privileges to write to root bucket `#{@bucket}`, check your credentials or your permissions."
     end
 

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

@@ -13,7 +13,7 @@ module LogStash
           @logger = logger
         end
 
-        def valid?(bucket_resource)
+        def valid?(bucket_resource, upload_options = {})
           begin
             upload_test_file(bucket_resource)
             true
@@ -28,7 +28,7 @@ module LogStash
         end
 
         private
-        def upload_test_file(bucket_resource)
+        def upload_test_file(bucket_resource, upload_options = {})
           generated_at = Time.now
 
           key = "logstash-programmatic-access-test-object-#{generated_at}"
@@ -40,7 +40,7 @@ module LogStash
             f.fsync
 
             obj = bucket_resource.object(key)
-            obj.upload_file(f)
+            obj.upload_file(f, upload_options)
 
             begin
               obj.delete

data/logstash-output-s3.gemspec

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

@@ -9,6 +9,7 @@ describe LogStash::Outputs::S3::WriteBucketPermissionValidator do
   let(:obj) { double("s3_object") }
   let(:client) { Aws::S3::Client.new(stub_responses: true) }
   let(:bucket) { Aws::S3::Bucket.new(bucket_name, :client => client) }
+  let(:upload_options) { {} }
 
   subject { described_class.new(logger) }
 
@@ -20,20 +21,20 @@ describe LogStash::Outputs::S3::WriteBucketPermissionValidator do
     it "returns true" do
       expect(obj).to receive(:upload_file).with(any_args).and_return(true)
       expect(obj).to receive(:delete).and_return(true)
-      expect(subject.valid?(bucket)).to be_truthy
+      expect(subject.valid?(bucket, upload_options)).to be_truthy
     end
 
     it "hides delete errors" do
       expect(obj).to receive(:upload_file).with(any_args).and_return(true)
       expect(obj).to receive(:delete).and_raise(StandardError)
-      expect(subject.valid?(bucket)).to be_truthy
+      expect(subject.valid?(bucket, upload_options)).to be_truthy
     end
   end
 
   context "when permission aren't sufficient" do
     it "returns false" do
       expect(obj).to receive(:upload_file).with(any_args).and_raise(StandardError)
-      expect(subject.valid?(bucket)).to be_falsey
+      expect(subject.valid?(bucket, upload_options)).to be_falsey
     end
   end
 end

data/spec/outputs/s3_spec.rb

@@ -25,7 +25,7 @@ describe LogStash::Outputs::S3 do
 
   before do
     allow(subject).to receive(:bucket_resource).and_return(mock_bucket)
-    allow_any_instance_of(LogStash::Outputs::S3::WriteBucketPermissionValidator).to receive(:valid?).with(mock_bucket).and_return(true)
+    allow_any_instance_of(LogStash::Outputs::S3::WriteBucketPermissionValidator).to receive(:valid?).with(mock_bucket, subject.upload_options).and_return(true)
   end
 
   context "#register configuration validation" do

metadata

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