logstash-integration-aws 7.3.1-java → 7.3.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31fe097a73e2ad72dda848f754960f593158928d0aa81aa462c1f51401126d1
-  data.tar.gz: 151acafe5078e56a528fe96e536ec58e7d55716258890918b740de5bbfaa9de5
+  metadata.gz: 5de807b604a7c7b513a947ecfe3b1e2ff664a11e790d9d0c8fba44936dba93ca
+  data.tar.gz: 2de325079a6b11b8b0ffcc86109b9021949678219b317e2b62de341e54d8184e
 SHA512:
-  metadata.gz: 286fc8fe7a69ef39b9e923d4579e632e87be2b756963f2d3658bce23789e231eb1a75552110e92c3d7936f4e7cecc49ca2b0a1046065a319791beca1adc931e7
-  data.tar.gz: a06b19d5689ed3ee0e0d93425eb69d413733feaf204f0ceaca4b8d30a425e36b48eb7296a8c400164fd437d6a28771a186f8f12d437e37f9593b1d0e6dccc30f
+  metadata.gz: 37e64051e6c1e813f9ca17f6f069a295edba6f1c9f8515d7c1efbf1196e3d5d2fa28055e1cd694d014951fd668e35c9c334caf4ebdf4bee3513c1caa265d47e3
+  data.tar.gz: '068c47c3e715e38cb694a5a862cce34754305679a8bdca7d2c51fb4023d31240c8bcded1cf3ea70eabb00b7c925db6d9bfeea1a27afd17a0e6ed35a3cddf3e98'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.3.3
+  - Replace deprecated `Aws::S3::Object#upload_file` in favor of `Aws::S3::TransferManager#upload_file` [#67](https://github.com/logstash-plugins/logstash-integration-aws/pull/67)
+
+## 7.3.2
+  - Fix: replace deprecated `File.exists?` with `File.exist?` for Ruby 3.4 (JRuby 10) compatibility [#65](https://github.com/logstash-plugins/logstash-integration-aws/pull/65)
+
 ## 7.3.1
   - Re-packaging the plugin [#63](https://github.com/logstash-plugins/logstash-integration-aws/pull/63)
 

data/VERSION

@@ -1 +1 @@
-7.3.1
+7.3.3

data/lib/logstash/inputs/s3.rb

@@ -117,7 +117,7 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
     end
 
     unless @backup_to_dir.nil?
-      Dir.mkdir(@backup_to_dir, 0700) unless File.exists?(@backup_to_dir)
+      Dir.mkdir(@backup_to_dir, 0700) unless File.exist?(@backup_to_dir)
     end
 
     FileUtils.mkdir_p(@temporary_directory) unless Dir.exist?(@temporary_directory)
@@ -451,7 +451,7 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
 
       # @return [Time]
       def read
-        if ::File.exists?(@sincedb_path)
+        if ::File.exist?(@sincedb_path)
           content = ::File.read(@sincedb_path).chomp.strip
           # If the file was created but we didn't have the time to write to it
           return content.empty? ? Time.new(0) : Time.parse(content)

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "logstash/util"
-require "aws-sdk-core"
+require "aws-sdk-s3"
 
 module LogStash
   module Outputs
@@ -18,6 +18,7 @@ module LogStash
 
         def initialize(bucket, logger, threadpool = DEFAULT_THREADPOOL, retry_count: Float::INFINITY, retry_delay: 1)
           @bucket = bucket
+          @transfer_manager = Aws::S3::TransferManager.new(client: bucket.client)
           @workers_pool = threadpool
           @logger = logger
           @retry_count = retry_count
@@ -37,8 +38,7 @@ module LogStash
 
           tries = 0
           begin
-            obj = bucket.object(file.key)
-            obj.upload_file(file.path, upload_options)
+            @transfer_manager.upload_file(file.path, bucket: bucket.name, key: file.key, **upload_options)
           rescue Errno::ENOENT => e
             logger.error("File doesn't exist! Unrecoverable error.", :exception => e.class, :message => e.message, :path => file.path, :backtrace => e.backtrace)
           rescue => e

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

@@ -2,6 +2,7 @@
 require "stud/temporary"
 require "socket"
 require "fileutils"
+require "aws-sdk-s3"
 
 module LogStash
   module Outputs
@@ -39,11 +40,11 @@ module LogStash
             f.write(content)
             f.fsync
 
-            obj = bucket_resource.object(key)
-            obj.upload_file(f, upload_options)
+            transfer_manager = Aws::S3::TransferManager.new(client: bucket_resource.client)
+            transfer_manager.upload_file(f.path, bucket: bucket_resource.name, key: key, **upload_options)
 
             begin
-              obj.delete
+              bucket_resource.object(key).delete
             rescue
               # Try to remove the files on the remote bucket,
               # but don't raise any errors if that doesn't work.

data/lib/logstash/plugin_mixins/aws_config/v2.rb

@@ -47,7 +47,7 @@ module LogStash::PluginMixins::AwsConfig::V2
     if @use_aws_bundled_ca
       aws_core_library = Gem.loaded_specs['aws-sdk-core']&.full_gem_path or fail("AWS Core library not available")
       opts[:ssl_ca_bundle] = File.expand_path('ca-bundle.crt', aws_core_library).tap do |aws_core_ca_bundle|
-        fail("AWS Core CA bundle not found") unless File.exists?(aws_core_ca_bundle)
+        fail("AWS Core CA bundle not found") unless File.exist?(aws_core_ca_bundle)
       end
     end
 

data/lib/logstash-integration-aws_jars.rb

@@ -1,4 +1,4 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.3.1')
+require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.3.3')

data/spec/inputs/s3_spec.rb

@@ -314,7 +314,7 @@ describe LogStash::Inputs::S3 do
 
           plugin.backup_to_dir(source_file)
 
-          expect(File.exists?(backup_file)).to eq(true)
+          expect(File.exist?(backup_file)).to eq(true)
         end
       end
     end

data/spec/outputs/s3/uploader_spec.rb

@@ -43,26 +43,22 @@ describe LogStash::Outputs::S3::Uploader do
   end
 
   it "retries errors indefinitely" do
-    s3 = double("s3").as_null_object
-
-    allow(bucket).to receive(:object).with(file.key).and_return(s3)
+    tm = subject.instance_variable_get(:@transfer_manager)
 
     expect(logger).to receive(:warn).with(any_args)
-    expect(s3).to receive(:upload_file).with(any_args).and_raise(RuntimeError.new('UPLOAD FAILED')).exactly(5).times
-    expect(s3).to receive(:upload_file).with(any_args).and_return(true)
+    expect(tm).to receive(:upload_file).with(file.path, hash_including(bucket: bucket_name, key: file.key)).and_raise(RuntimeError.new('UPLOAD FAILED')).exactly(5).times
+    expect(tm).to receive(:upload_file).with(file.path, hash_including(bucket: bucket_name, key: file.key)).and_return(true)
 
     subject.upload(file)
   end
 
   it "retries errors specified times" do
     subject = described_class.new(bucket, logger, threadpool, retry_count: 3, retry_delay: 0.01)
-    s3 = double("s3").as_null_object
-
-    allow(bucket).to receive(:object).with(file.key).and_return(s3)
+    tm = subject.instance_variable_get(:@transfer_manager)
 
     expect(logger).to receive(:warn).with(any_args).exactly(3).times
     expect(logger).to receive(:error).with(any_args).once
-    expect(s3).to receive(:upload_file).with(file.path, {}).and_raise(RuntimeError).at_least(1).times
+    expect(tm).to receive(:upload_file).with(file.path, hash_including(bucket: bucket_name, key: file.key)).and_raise(RuntimeError).at_least(1).times
 
     subject.upload(file)
   end

data/spec/outputs/s3/write_bucket_permission_validator_spec.rb

@@ -1,11 +1,13 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
+require "aws-sdk-s3"
 require "logstash/outputs/s3/write_bucket_permission_validator"
 
 describe LogStash::Outputs::S3::WriteBucketPermissionValidator do
   let(:logger) { spy(:logger ) }
   let(:bucket_name) { "foobar" }
   let(:obj) { double("s3_object") }
+  let(:tm) { double("transfer_manager") }
   let(:client) { Aws::S3::Client.new(stub_responses: true) }
   let(:bucket) { Aws::S3::Bucket.new(bucket_name, :client => client) }
   let(:upload_options) { {} }
@@ -13,13 +15,14 @@ describe LogStash::Outputs::S3::WriteBucketPermissionValidator do
   subject { described_class.new(logger) }
 
   before do
-    expect(bucket).to receive(:object).with(any_args).and_return(obj)
+    allow(Aws::S3::TransferManager).to receive(:new).with(client: client).and_return(tm)
+    allow(bucket).to receive(:object).with(any_args).and_return(obj)
   end
 
   context 'when using upload_options' do
     let(:upload_options) {{ :server_side_encryption => true }}
     it 'they are passed through to upload_file' do
-      expect(obj).to receive(:upload_file).with(anything, upload_options)
+      expect(tm).to receive(:upload_file).with(anything, hash_including(upload_options))
       expect(obj).to receive(:delete).and_return(true)
       expect(subject.valid?(bucket, upload_options)).to be_truthy
     end
@@ -28,13 +31,13 @@ describe LogStash::Outputs::S3::WriteBucketPermissionValidator do
 
   context "when permissions are sufficient" do
     it "returns true" do
-      expect(obj).to receive(:upload_file).with(any_args).and_return(true)
+      expect(tm).to receive(:upload_file).with(any_args).and_return(true)
       expect(obj).to receive(:delete).and_return(true)
       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(tm).to receive(:upload_file).with(any_args).and_return(true)
       expect(obj).to receive(:delete).and_raise(StandardError)
       expect(subject.valid?(bucket, upload_options)).to be_truthy
     end
@@ -42,7 +45,7 @@ describe LogStash::Outputs::S3::WriteBucketPermissionValidator do
 
   context "when permission aren't sufficient" do
     it "returns false" do
-      expect(obj).to receive(:upload_file).with(any_args).and_raise(StandardError)
+      expect(tm).to receive(:upload_file).with(any_args).and_raise(StandardError)
       expect(subject.valid?(bucket, upload_options)).to be_falsey
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-aws
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.3.3
 platform: java
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 2026-01-31 00:00:00.000000000 Z
+date: 2026-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -407,7 +407,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/unit/outputs/sqs_spec.rb
-- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.3.1/logstash-integration-aws-7.3.1.jar
+- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.3.3/logstash-integration-aws-7.3.3.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0