aws-sdk-s3 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11e9a946e4c62cd4e65425e89902c241af285bde
-  data.tar.gz: a2d9222f53c8f42be08062566e1c918619c6aa44
+  metadata.gz: d7148cc33c898dd318c42d6c85703593aa147bee
+  data.tar.gz: a047d88bc816ca70f830778d228b0bcc9cf20145
 SHA512:
-  metadata.gz: ce6d03f49def68da923382a840324f932f872f552d772abea6ceb16388088584ed18ac87d33279f0b675e594d966b771d21ace3e27f483d23f5602fbb925621e
-  data.tar.gz: e19d2fcdba9c44c11633f40cca6f66f7de128b6f48417ed2368f74dd0bde1dc2342bcfceecf665716431e8d599486be7ecb087ecd6f528f3b536d2987cd96bb9
+  metadata.gz: 99396fcd7b62b692c23dbb0ba3662a241fa87e654de6ddc80e344d1f42b2e8c5f99b354d7a619656def60ca7255dc69a503b46b98d076d84e64a5c67470fc214
+  data.tar.gz: 01d123f13e3b527c55f460fc43d2c7ce0f5d7c31ae8c9ef7caad5c619f2330c492563c029e8bf4021af05cc2289667eef0982cd016222c550727f858b4f82451

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

@@ -6087,7 +6087,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.8.0'
+      context[:gem_version] = '1.8.2'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-s3/encryption/decrypt_handler.rb

@@ -25,6 +25,7 @@ module Aws
         POSSIBLE_ENCRYPTION_FORMATS = %w(
           AES/GCM/NoPadding
           AES/CBC/PKCS5Padding
+          AES/CBC/PKCS7Padding
         )
 
         def call(context)
@@ -162,7 +163,7 @@ module Aws
           # The encrypted object contains both the cipher text
           # plus a trailing auth tag. This decrypter will the body
           # expect for the trailing auth tag.
-          decrypter = IOAuthDecrypter.new(
+          IOAuthDecrypter.new(
             io: http_resp.body,
             encrypted_content_length: content_length - auth_tag_length,
             cipher: cipher)

data/lib/aws-sdk-s3/encryption/kms_cipher_provider.rb

@@ -45,6 +45,8 @@ module Aws
             case envelope['x-amz-cek-alg']
             when 'AES/CBC/PKCS5Padding'
               :CBC
+            when 'AES/CBC/PKCS7Padding'
+              :CBC
             when 'AES/GCM/NoPadding'
               :GCM
             else

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

@@ -89,39 +89,13 @@ module Aws
         if @chunk_size && @chunk_size > file_size
           raise ArgumentError, ":chunk_size shouldn't exceed total file size."
         else
-          default_chunk_size = @chunk_size || [(file_size.to_f / MAX_PARTS).ceil, MIN_CHUNK_SIZE].max.to_i
+          @chunk_size || [(file_size.to_f / MAX_PARTS).ceil, MIN_CHUNK_SIZE].max.to_i
         end
       end
 
-      def sort_files(files)
-        # sort file by start range count or part number
-        files.sort do |a, b|
-          a[/([^\=]+)$/].split('-')[0].to_i <=> b[/([^\=]+)$/].split('-')[0].to_i
-        end
-      end
-
-      def concatenate_parts(fileparts)
-        File.open(@path, 'wb')do |output_path|
-          sort_files(fileparts).each {|part| IO.copy_stream(part, output_path)}
-        end
-      end
-
-      def file_batches(chunks, dir, mode)
-        batches = []
+      def batches(chunks, mode)
         chunks = (1..chunks) if mode.eql? 'part_number'
-        chunks.each_slice(@thread_count) do |slice|
-          batches << map_files(slice, dir, mode)
-        end
-        batches
-      end
-
-      def map_files(slice, dir, mode)
-        case mode
-        when 'range'
-          slice.inject({}) {|h, chunk| h[chunk] = File.join(dir, chunk); h}
-        when 'part_number'
-          slice.inject({}) {|h, part| h[part] = File.join(dir, "part_number=#{part}"); h}
-        end
+        chunks.each_slice(@thread_count).to_a
       end
 
       def multithreaded_get_by_ranges(chunks)
@@ -133,32 +107,28 @@ module Aws
       end
 
       def thread_batches(chunks, param)
-        # create a tmp dir under destination dir for batches
-        dir = Dir.mktmpdir(nil, File.dirname(@path))
-        batches = file_batches(chunks, dir, param)
-        parts = batches.flat_map(&:values)
-        begin
-          batches.each do |batch|
-            threads = []
-            batch.each do |chunk, file|
-              threads << Thread.new do
-                resp = @client.get_object(
-                  :bucket => @bucket,
-                  :key => @key,
-                  param.to_sym => chunk,
-                  :response_target => file
-                )
-              end
+        batches(chunks, param).each do |batch|
+          threads = []
+          batch.each do |chunk|
+            threads << Thread.new do
+              resp = @client.get_object(
+                :bucket => @bucket,
+                :key => @key,
+                param.to_sym => chunk
+              )
+              write(resp)
             end
-            threads.each(&:join)
           end
-          concatenate_parts(parts)
-        ensure
-          # clean up tmp dir
-          FileUtils.remove_entry(dir)
+          threads.each(&:join)
         end
       end
 
+      def write(resp)
+        range, _ = resp.content_range.split(" ").last.split("/")
+        head, _ = range.split("-").map {|s| s.to_i}
+        IO.write(@path, resp.body.read, head)
+      end
+
       def single_request
         @client.get_object(
           bucket: @bucket, key: @key, response_target: @path

data/lib/aws-sdk-s3/plugins/accelerate.rb

@@ -73,7 +73,7 @@ each bucket.  [Go here for more information](http://docs.aws.amazon.com/AmazonS3
           end
 
           def validate_bucket_name!(bucket_name)
-            unless BucketDns.dns_compatible?(bucket_name, ssl = true)
+            unless BucketDns.dns_compatible?(bucket_name, _ssl = true)
               msg = "unable to use `accelerate: true` on buckets with "
               msg << "non-DNS compatible names"
               raise ArgumentError, msg

data/lib/aws-sdk-s3/plugins/dualstack.rb

@@ -38,7 +38,7 @@ for all operations.
           def apply_dualstack_endpoint(context)
             bucket_name = context.params[:bucket]
             region = context.config.region
-            force_path_style = context.config.force_path_style
+            context.config.force_path_style
             dns_suffix = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
 
             if use_bucket_dns?(bucket_name, context)

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

@@ -132,7 +132,7 @@ module Aws
       end
 
       def build_signer(cfg)
-        signer = Aws::Sigv4::Signer.new(
+        Aws::Sigv4::Signer.new(
           service: 's3',
           region: cfg.region,
           credentials_provider: cfg.credentials,

data/lib/aws-sdk-s3.rb

@@ -62,6 +62,6 @@ require_relative 'aws-sdk-s3/customizations'
 # @service
 module Aws::S3
 
-  GEM_VERSION = '1.8.0'
+  GEM_VERSION = '1.8.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms