aws-sdk-s3 1.220.0 → 1.232.2

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

@@ -161,10 +161,12 @@ module Aws
       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
+          begin
+            downloader = DirectoryDownloader.new(client: @client, executor: executor, logger: @logger)
+            downloader.download(destination, bucket: bucket, **options)
+          ensure
+            executor.shutdown unless @executor
+          end
         end
       end
 
@@ -246,10 +248,13 @@ module Aws
       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
+        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.
@@ -361,10 +366,12 @@ module Aws
       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
+          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
 
@@ -445,16 +452,19 @@ module Aws
         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
+        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.
@@ -512,15 +522,18 @@ module Aws
       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
+        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