aws-sdk-s3 1.74.0 → 1.79.0

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

@@ -29,6 +29,9 @@ module Aws
       # @param [String, Pathname, File, Tempfile] source The file to upload.
       # @option options [required, String] :bucket The bucket to upload to.
       # @option options [required, String] :key The key for the object.
+      # @option options [Proc] :progress_callback
+      #   A Proc that will be called when each chunk of the upload is sent.
+      #   It will be invoked with [bytes_read], [total_sizes]
       # @return [void]
       def upload(source, options = {})
         if File.size(source) >= multipart_threshold
@@ -49,11 +52,19 @@ module Aws
       end
 
       def put_object(source, options)
+        if (callback = options.delete(:progress_callback))
+          options[:on_chunk_sent] = single_part_progress(callback)
+        end
         open_file(source) do |file|
           @client.put_object(options.merge(body: file))
         end
       end
 
+      def single_part_progress(progress_callback)
+        proc do |_chunk, bytes_read, total_size|
+          progress_callback.call([bytes_read], [total_size])
+        end
+      end
     end
   end
 end

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

@@ -39,6 +39,9 @@ module Aws
       # @param [String, Pathname, File, Tempfile] source The file to upload.
       # @option options [required, String] :bucket The bucket to upload to.
       # @option options [required, String] :key The key for the object.
+      # @option options [Proc] :progress_callback
+      #   A Proc that will be called when each chunk of the upload is sent.
+      #   It will be invoked with [bytes_read], [total_sizes]
       # @return [void]
       def upload(source, options = {})
         if File.size(source) < MIN_PART_SIZE
@@ -68,7 +71,7 @@ module Aws
       def upload_parts(upload_id, source, options)
         pending = PartList.new(compute_parts(upload_id, source, options))
         completed = PartList.new
-        errors = upload_in_threads(pending, completed)
+        errors = upload_in_threads(pending, completed, options)
         if errors.empty?
           completed.to_a.sort_by { |part| part[:part_number] }
         else
@@ -127,12 +130,21 @@ module Aws
         end
       end
 
-      def upload_in_threads(pending, completed)
+      def upload_in_threads(pending, completed, options)
         threads = []
+        if (callback = options[:progress_callback])
+          progress = MultipartProgress.new(pending, callback)
+        end
         @thread_count.times do
           thread = Thread.new do
             begin
               while part = pending.shift
+                if progress
+                  part[:on_chunk_sent] =
+                    proc do |_chunk, bytes, _total|
+                      progress.call(part[:part_number], bytes)
+                    end
+                end
                 resp = @client.upload_part(part)
                 part[:body].close
                 completed.push(etag: resp.etag, part_number: part[:part_number])
@@ -182,11 +194,34 @@ module Aws
           @mutex.synchronize { @parts.clear }
         end
 
+        def size
+          @mutex.synchronize { @parts.size }
+        end
+
+        def part_sizes
+          @mutex.synchronize { @parts.map { |p| p[:body].size } }
+        end
+
         def to_a
           @mutex.synchronize { @parts.dup }
         end
 
       end
+
+      # @api private
+      class MultipartProgress
+        def initialize(parts, progress_callback)
+          @bytes_sent = Array.new(parts.size, 0)
+          @total_sizes = parts.part_sizes
+          @progress_callback = progress_callback
+        end
+
+        def call(part_number, bytes_read)
+          # part numbers start at 1
+          @bytes_sent[part_number - 1] = bytes_read
+          @progress_callback.call(@bytes_sent, @total_sizes)
+        end
+      end
     end
   end
 end

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

@@ -302,7 +302,7 @@ module Aws::S3
     #     request_payer: "requester", # accepts requester
     #   })
     # @param [Hash] options ({})
-    # @option options [String, IO] :body
+    # @option options [String, StringIO, File] :body
     #   Object data.
     # @option options [Integer] :content_length
     #   Size of the body in bytes. This parameter is useful when the size of

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

@@ -983,7 +983,7 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
-    # @option options [String, IO] :body
+    # @option options [String, StringIO, File] :body
     #   Object data.
     # @option options [String] :cache_control
     #   Can be used to specify caching behavior along the request/reply chain.

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

@@ -48,8 +48,24 @@ module Aws::S3
       data[:last_modified]
     end
 
-    # The entity tag is an MD5 hash of the object. ETag reflects only
-    # changes to the contents of an object, not its metadata.
+    # The entity tag is a hash of the object. The ETag reflects changes only
+    # to the contents of an object, not its metadata. The ETag may or may
+    # not be an MD5 digest of the object data. Whether or not it is depends
+    # on how the object was created and how it is encrypted as described
+    # below:
+    #
+    # * Objects created by the PUT Object, POST Object, or Copy operation,
+    #   or through the AWS Management Console, and are encrypted by SSE-S3
+    #   or plaintext, have ETags that are an MD5 digest of their object
+    #   data.
+    #
+    # * Objects created by the PUT Object, POST Object, or Copy operation,
+    #   or through the AWS Management Console, and are encrypted by SSE-C or
+    #   SSE-KMS, have ETags that are not an MD5 digest of their object data.
+    #
+    # * If an object is created by either the Multipart Upload or Part Copy
+    #   operation, the ETag is not an MD5 digest, regardless of the method
+    #   of encryption.
     # @return [String]
     def etag
       data[:etag]
@@ -733,7 +749,7 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
-    # @option options [String, IO] :body
+    # @option options [String, StringIO, File] :body
     #   Object data.
     # @option options [String] :cache_control
     #   Can be used to specify caching behavior along the request/reply chain.

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

@@ -37,7 +37,9 @@ each bucket. [Go here for more information](http://docs.aws.amazon.com/AmazonS3/
         class OptionHandler < Seahorse::Client::Handler
           def call(context)
             # Support client configuration and per-operation configuration
-            accelerate = context.params.delete(:use_accelerate_endpoint)
+            if context.params.is_a?(Hash)
+              accelerate = context.params.delete(:use_accelerate_endpoint)
+            end
             if accelerate.nil?
               accelerate = context.config.use_accelerate_endpoint
             end

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

@@ -22,7 +22,9 @@ for all operations.
         # @api private
         class OptionHandler < Seahorse::Client::Handler
           def call(context)
-            dualstack = context.params.delete(:use_dualstack_endpoint)
+            if context.params.is_a?(Hash)
+              dualstack = context.params.delete(:use_dualstack_endpoint)
+            end
             dualstack = context.config.use_dualstack_endpoint if dualstack.nil?
             context[:use_dualstack_endpoint] = dualstack
             @handler.call(context)

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

@@ -20,7 +20,7 @@ This should only be disabled for local testing.
         class Handler < Seahorse::Client::Handler
 
           def call(context)
-            compute_key_md5(context)
+            compute_key_md5(context) if context.params.is_a?(Hash)
             @handler.call(context)
           end
 

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

@@ -41,7 +41,7 @@ module Aws
       #  signer = Aws::S3::Presigner.new
       #  url = signer.presigned_url(:get_object, bucket: "bucket", key: "key")
       #
-      # @param [Symbol] :method Symbolized method name of the operation you want
+      # @param [Symbol] method Symbolized method name of the operation you want
       #   to presign.
       #
       # @option params [Integer] :expires_in (900) The number of seconds
@@ -89,7 +89,7 @@ module Aws
       #    :get_object, bucket: "bucket", key: "key"
       #  )
       #
-      # @param [Symbol] :method Symbolized method name of the operation you want
+      # @param [Symbol] method Symbolized method name of the operation you want
       #   to presign.
       #
       # @option params [Integer] :expires_in (900) The number of seconds

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

@@ -41,7 +41,7 @@ module Aws::S3
     #     acl: "private", # accepts private, public-read, public-read-write, authenticated-read
     #     bucket: "BucketName", # required
     #     create_bucket_configuration: {
-    #       location_constraint: "EU", # accepts EU, eu-west-1, us-west-1, us-west-2, ap-south-1, ap-southeast-1, ap-southeast-2, ap-northeast-1, sa-east-1, cn-north-1, eu-central-1
+    #       location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-north-1, eu-south-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2
     #     },
     #     grant_full_control: "GrantFullControl",
     #     grant_read: "GrantRead",

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

@@ -1517,7 +1517,7 @@ module Aws::S3
     #   data as a hash:
     #
     #       {
-    #         location_constraint: "EU", # accepts EU, eu-west-1, us-west-1, us-west-2, ap-south-1, ap-southeast-1, ap-southeast-2, ap-northeast-1, sa-east-1, cn-north-1, eu-central-1
+    #         location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-north-1, eu-south-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2
     #       }
     #
     # @!attribute [rw] location_constraint
@@ -1555,7 +1555,7 @@ module Aws::S3
     #         acl: "private", # accepts private, public-read, public-read-write, authenticated-read
     #         bucket: "BucketName", # required
     #         create_bucket_configuration: {
-    #           location_constraint: "EU", # accepts EU, eu-west-1, us-west-1, us-west-2, ap-south-1, ap-southeast-1, ap-southeast-2, ap-northeast-1, sa-east-1, cn-north-1, eu-central-1
+    #           location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-north-1, eu-south-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2
     #         },
     #         grant_full_control: "GrantFullControl",
     #         grant_read: "GrantRead",
@@ -2457,7 +2457,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] key
-    #   Name of the tag.
+    #   Name of the object key.
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -7042,7 +7042,7 @@ module Aws::S3
     #   in the subsequent request to get next set of objects. Amazon S3
     #   lists objects in alphabetical order Note: This element is returned
     #   only if you have delimiter request parameter specified. If response
-    #   does not include the NextMaker and it is truncated, you can use the
+    #   does not include the NextMarker and it is truncated, you can use the
     #   value of the last Key in the response as the marker in the
     #   subsequent request to get the next set of object keys.
     #   @return [String]
@@ -8140,8 +8140,25 @@ module Aws::S3
     #   @return [Time]
     #
     # @!attribute [rw] etag
-    #   The entity tag is an MD5 hash of the object. ETag reflects only
-    #   changes to the contents of an object, not its metadata.
+    #   The entity tag is a hash of the object. The ETag reflects changes
+    #   only to the contents of an object, not its metadata. The ETag may or
+    #   may not be an MD5 digest of the object data. Whether or not it is
+    #   depends on how the object was created and how it is encrypted as
+    #   described below:
+    #
+    #   * Objects created by the PUT Object, POST Object, or Copy operation,
+    #     or through the AWS Management Console, and are encrypted by SSE-S3
+    #     or plaintext, have ETags that are an MD5 digest of their object
+    #     data.
+    #
+    #   * Objects created by the PUT Object, POST Object, or Copy operation,
+    #     or through the AWS Management Console, and are encrypted by SSE-C
+    #     or SSE-KMS, have ETags that are not an MD5 digest of their object
+    #     data.
+    #
+    #   * If an object is created by either the Multipart Upload or Part
+    #     Copy operation, the ETag is not an MD5 digest, regardless of the
+    #     method of encryption.
     #   @return [String]
     #
     # @!attribute [rw] size
@@ -10553,7 +10570,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] key
-    #   Name of the tag.
+    #   Name of the object key.
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -12453,7 +12470,7 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] key
-    #   Name of the tag.
+    #   Name of the object key.
     #   @return [String]
     #
     # @!attribute [rw] value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.74.0
+  version: 1.79.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms
@@ -47,7 +47,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.102.1
+        version: 3.104.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.102.1
+        version: 3.104.3
 description: Official AWS Ruby gem for Amazon Simple Storage Service (Amazon S3).
   This gem is part of the AWS SDK for Ruby.
 email: