aws-sdk-s3 1.232.1 → 1.232.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94c399221f0a258a78a6339e0887c7cfed857495e036fc96dc1c71552eeb02a
-  data.tar.gz: b000a464b400582cdc17a7295d7601a718e51b91169c1a1af03e8712584d6cdd
+  metadata.gz: 1e53747d17067bcac309f1ce7937b8c9a05760df36e34c63f9da0c2dd428f3ad
+  data.tar.gz: 5c0eaa9a807e3035ca1550cdef86e340a48c1cc715ec81d0ff26dcf1d892f13d
 SHA512:
-  metadata.gz: ebd8b1083b8e6421dafeeed2ac4ad91d7810fdedf5d88d56c7a3e75d81636cd57ddc7e20cb97824db9acf1858a3e4f8a63155b48610fa39eebafce059d9576ee
-  data.tar.gz: f0f726ac4e9239ea0cae007668b7f8720c6ec2a314c8fe72b5db0220be5cc1508d2269634f759ab8522da78e151814d9b2d0753b1493cc5afd0a7be9b098944c
+  metadata.gz: 2477bd4aa0776bbb4e050c3104d43289bb7885dd962b121215f35411435fe4ad1bfcbb0becc8e8167dc6684da467a36c8c6fa0c4d00d79844cf7fc50fcfa613a
+  data.tar.gz: cd587d89b38d9fdf9c92f1ec3f1925dff7361d6505d27d191fb81171e020fa9222bf8351f3e1ac2beffc2c9870eeff60d30b842a0494b1f3bd93956839fe9edc

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 Unreleased Changes
 ------------------
 
+1.232.3 (2026-09-28)
+------------------
+
+* Issue - Remove `:thread_count` from transfer options even when a custom `:executor` is configured on `TransferManager`, fixing an `ArgumentError` raised on single-part `upload_file` calls.
+
+* Issue - Fix `:thread_count` being ignored by the deprecated `Object#download_file`, which always used the default thread count.
+
+1.232.2 (2026-09-25)
+------------------
+
+* Issue - Ensure the internally-created executor is shutdown on error in `TransferManager` and `Aws::S3::Object` resource methods, preventing leaked worker threads on multipart transfer failures (#3419).
+
 1.232.1 (2026-09-16)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.232.1
+1.232.3

data/lib/aws-sdk-s3/client.rb

@@ -24209,7 +24209,7 @@ module Aws::S3
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.232.1'
+      context[:gem_version] = '1.232.3'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-s3/customizations/object.rb

@@ -406,17 +406,20 @@ module Aws
       def upload_stream(options = {}, &block)
         upload_opts = options.merge(bucket: bucket_name, key: key)
         executor = DefaultExecutor.new(max_threads: upload_opts.delete(:thread_count))
-        uploader = MultipartStreamUploader.new(
-          client: client,
-          executor: executor,
-          tempfile: upload_opts.delete(:tempfile),
-          part_size: upload_opts.delete(:part_size)
-        )
-        Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
-          uploader.upload(upload_opts, &block)
+        begin
+          uploader = MultipartStreamUploader.new(
+            client: client,
+            executor: executor,
+            tempfile: upload_opts.delete(:tempfile),
+            part_size: upload_opts.delete(:part_size)
+          )
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
+            uploader.upload(upload_opts, &block)
+          end
+          true
+        ensure
+          executor.shutdown
         end
-        executor.shutdown
-        true
       end
       deprecated(:upload_stream, use: 'Aws::S3::TransferManager#upload_stream', version: 'next major version')
 
@@ -480,17 +483,20 @@ module Aws
       def upload_file(source, options = {})
         upload_opts = options.merge(bucket: bucket_name, key: key)
         executor = DefaultExecutor.new(max_threads: upload_opts.delete(:thread_count))
-        uploader = FileUploader.new(
-          client: client,
-          executor: executor,
-          multipart_threshold: upload_opts.delete(:multipart_threshold)
-        )
-        response = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
-          uploader.upload(source, upload_opts)
+        begin
+          uploader = FileUploader.new(
+            client: client,
+            executor: executor,
+            multipart_threshold: upload_opts.delete(:multipart_threshold)
+          )
+          response = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
+            uploader.upload(source, upload_opts)
+          end
+          yield response if block_given?
+          true
+        ensure
+          executor.shutdown
         end
-        yield response if block_given?
-        executor.shutdown
-        true
       end
       deprecated(:upload_file, use: 'Aws::S3::TransferManager#upload_file', version: 'next major version')
 
@@ -561,13 +567,16 @@ module Aws
       # @see Client#head_object
       def download_file(destination, options = {})
         download_opts = options.merge(bucket: bucket_name, key: key)
-        executor = DefaultExecutor.new(max_threads: download_opts.delete([:thread_count]))
-        downloader = FileDownloader.new(client: client, executor: executor)
-        Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
-          downloader.download(destination, download_opts)
+        executor = DefaultExecutor.new(max_threads: download_opts.delete(:thread_count))
+        begin
+          downloader = FileDownloader.new(client: client, executor: executor)
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
+            downloader.download(destination, download_opts)
+          end
+          true
+        ensure
+          executor.shutdown
         end
-        executor.shutdown
-        true
       end
       deprecated(:download_file, use: 'Aws::S3::TransferManager#download_file', version: 'next major version')
 

data/lib/aws-sdk-s3/transfer_manager.rb

@@ -160,11 +160,14 @@ module Aws
       #   * `:errors` - Array of errors for failed downloads (only present when failures occur)
       def download_directory(destination, bucket:, **options)
         Aws::Plugins::UserAgent.metric('S3_TRANSFER', 'S3_TRANSFER_DOWNLOAD_DIRECTORY') do
-          executor = @executor || DefaultExecutor.new(max_threads: options.delete(:thread_count))
-          downloader = DirectoryDownloader.new(client: @client, executor: executor, logger: @logger)
-          result = downloader.download(destination, bucket: bucket, **options)
-          executor.shutdown unless @executor
-          result
+          thread_count = options.delete(:thread_count)
+          executor = @executor || DefaultExecutor.new(max_threads: thread_count)
+          begin
+            downloader = DirectoryDownloader.new(client: @client, executor: executor, logger: @logger)
+            downloader.download(destination, bucket: bucket, **options)
+          ensure
+            executor.shutdown unless @executor
+          end
         end
       end
 
@@ -245,11 +248,15 @@ module Aws
       # @see Client#head_object
       def download_file(destination, bucket:, key:, **options)
         download_opts = options.merge(bucket: bucket, key: key)
-        executor = @executor || DefaultExecutor.new(max_threads: download_opts.delete(:thread_count))
-        downloader = FileDownloader.new(client: @client, executor: executor)
-        downloader.download(destination, download_opts)
-        executor.shutdown unless @executor
-        true
+        thread_count = download_opts.delete(:thread_count)
+        executor = @executor || DefaultExecutor.new(max_threads: thread_count)
+        begin
+          downloader = FileDownloader.new(client: @client, executor: executor)
+          downloader.download(destination, download_opts)
+          true
+        ensure
+          executor.shutdown unless @executor
+        end
       end
 
       # Uploads all files under the given directory to the provided S3 bucket.
@@ -360,11 +367,14 @@ module Aws
       #   * `:errors` - Array of error objects for failed uploads (only present when failures occur)
       def upload_directory(source, bucket:, **options)
         Aws::Plugins::UserAgent.metric('S3_TRANSFER', 'S3_TRANSFER_UPLOAD_DIRECTORY') do
-          executor = @executor || DefaultExecutor.new(max_threads: options.delete(:thread_count))
-          uploader = DirectoryUploader.new(client: @client, executor: executor, logger: @logger)
-          result = uploader.upload(source, bucket, **options.merge(http_chunk_size: resolve_http_chunk_size(options)))
-          executor.shutdown unless @executor
-          result
+          thread_count = options.delete(:thread_count)
+          executor = @executor || DefaultExecutor.new(max_threads: thread_count)
+          begin
+            uploader = DirectoryUploader.new(client: @client, executor: executor, logger: @logger)
+            uploader.upload(source, bucket, **options.merge(http_chunk_size: resolve_http_chunk_size(options)))
+          ensure
+            executor.shutdown unless @executor
+          end
         end
       end
 
@@ -443,18 +453,21 @@ module Aws
       def upload_file(source, bucket:, key:, **options)
         upload_opts = options.merge(bucket: bucket, key: key)
         http_chunk_size = resolve_http_chunk_size(upload_opts)
-
-        executor = @executor || DefaultExecutor.new(max_threads: upload_opts.delete(:thread_count))
-        uploader = FileUploader.new(
-          multipart_threshold: upload_opts.delete(:multipart_threshold),
-          http_chunk_size: http_chunk_size,
-          client: @client,
-          executor: executor
-        )
-        response = uploader.upload(source, upload_opts)
-        yield response if block_given?
-        executor.shutdown unless @executor
-        true
+        thread_count = upload_opts.delete(:thread_count)
+        executor = @executor || DefaultExecutor.new(max_threads: thread_count)
+        begin
+          uploader = FileUploader.new(
+            multipart_threshold: upload_opts.delete(:multipart_threshold),
+            http_chunk_size: http_chunk_size,
+            client: @client,
+            executor: executor
+          )
+          response = uploader.upload(source, upload_opts)
+          yield response if block_given?
+          true
+        ensure
+          executor.shutdown unless @executor
+        end
       end
 
       # Uploads a stream in a streaming fashion to S3.
@@ -511,16 +524,20 @@ module Aws
       # @see Client#upload_part
       def upload_stream(bucket:, key:, **options, &block)
         upload_opts = options.merge(bucket: bucket, key: key)
-        executor = @executor || DefaultExecutor.new(max_threads: upload_opts.delete(:thread_count))
-        uploader = MultipartStreamUploader.new(
-          client: @client,
-          executor: executor,
-          tempfile: upload_opts.delete(:tempfile),
-          part_size: upload_opts.delete(:part_size)
-        )
-        uploader.upload(upload_opts, &block)
-        executor.shutdown unless @executor
-        true
+        thread_count = upload_opts.delete(:thread_count)
+        executor = @executor || DefaultExecutor.new(max_threads: thread_count)
+        begin
+          uploader = MultipartStreamUploader.new(
+            client: @client,
+            executor: executor,
+            tempfile: upload_opts.delete(:tempfile),
+            part_size: upload_opts.delete(:part_size)
+          )
+          uploader.upload(upload_opts, &block)
+          true
+        ensure
+          executor.shutdown unless @executor
+        end
       end
 
       private

data/lib/aws-sdk-s3.rb

@@ -75,7 +75,7 @@ module Aws::S3
   autoload :ObjectVersion, 'aws-sdk-s3/object_version'
   autoload :EventStreams, 'aws-sdk-s3/event_streams'
 
-  GEM_VERSION = '1.232.1'
+  GEM_VERSION = '1.232.3'
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.232.1
+  version: 1.232.3
 platform: ruby
 authors:
 - Amazon Web Services