aws-sdk-s3 1.220.0 → 1.232.2

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

@@ -600,6 +600,39 @@ module Aws::S3
       data[:object_lock_legal_hold_status]
     end
 
+    # The event hold status for this object. This header is only returned if
+    # the requester has the `s3:GetObjectRetention` permission.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
+    # @return [String]
+    def object_lock_event_hold
+      data[:object_lock_event_hold]
+    end
+
+    # The event hold duration in days for this object. Only returned when
+    # the event hold is enabled.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
+    # @return [Integer]
+    def object_lock_event_hold_duration_days
+      data[:object_lock_event_hold_duration_days]
+    end
+
+    # The event hold duration in years for this object. Only returned when
+    # the event hold is enabled.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
+    # @return [Integer]
+    def object_lock_event_hold_duration_years
+      data[:object_lock_event_hold_duration_years]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -824,8 +857,9 @@ module Aws::S3
     #     },
     #     metadata_directive: "COPY", # accepts COPY, REPLACE
     #     tagging_directive: "COPY", # accepts COPY, REPLACE
-    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #     annotation_directive: "COPY", # accepts COPY, EXCLUDE
+    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -841,6 +875,9 @@ module Aws::S3
     #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
     #     object_lock_retain_until_date: Time.now,
     #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #     object_lock_event_hold: "ON", # accepts ON, OFF
+    #     object_lock_event_hold_duration_days: 1,
+    #     object_lock_event_hold_duration_years: 1,
     #     expected_bucket_owner: "AccountId",
     #     expected_source_bucket_owner: "AccountId",
     #   })
@@ -1174,6 +1211,42 @@ module Aws::S3
     #     value of `x-amz-tagging` is the empty value.
     #
     #    </note>
+    # @option options [String] :annotation_directive
+    #   Specifies whether you want to copy annotations from the source object
+    #   or exclude them. If this header isn't specified, `COPY` is the
+    #   default behavior.
+    #
+    #   Valid Values: `COPY | EXCLUDE`
+    #
+    #   You can specify this directive as either an HTTP header
+    #   (`x-amz-object-annotation-directive`) or as a query string parameter.
+    #   Use the query string form when generating presigned URLs that need to
+    #   control annotation copy behavior.
+    #
+    #   When set to `COPY`, you must have `s3:GetObjectAnnotation` permission
+    #   on the source object and `s3:PutObjectAnnotation` permission on the
+    #   destination. Each annotation copied is billed as a separate PUT
+    #   request. If annotations on the source are modified during the copy,
+    #   Amazon S3 returns a retryable error.
+    #
+    #   <note markdown="1"> For directory buckets, annotations are not supported. Use `EXCLUDE` to
+    #   copy objects to directory buckets without errors. If you specify
+    #   `COPY` for a directory bucket, the request returns HTTP 501 (Not
+    #   Implemented).
+    #
+    #    </note>
+    #
+    #   <note markdown="1"> When you copy objects using multipart upload (for example, when the
+    #   Amazon Web Services CLI or Amazon Web Services SDKs use Transfer
+    #   Manager for objects larger than approximately 8 MB), annotations are
+    #   not copied by default. To include annotations, specify `--copy-props
+    #   default` in the Amazon Web Services CLI or the equivalent SDK
+    #   configuration. With this opt-in, the SDK reads source annotations,
+    #   completes the multipart upload, and then writes each annotation to the
+    #   destination. Between the upload completion and the last annotation
+    #   write, the destination object exists without all its annotations.
+    #
+    #    </note>
     # @option options [String] :server_side_encryption
     #   The server-side encryption algorithm used when storing this object in
     #   Amazon S3. Unrecognized or unsupported values won’t write a
@@ -1546,6 +1619,27 @@ module Aws::S3
     #   <note markdown="1"> This functionality is not supported for directory buckets.
     #
     #    </note>
+    # @option options [String] :object_lock_event_hold
+    #   The event hold status to apply to the object copy. Set to `ON` to
+    #   enable or `OFF` to disable.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_days
+    #   The event hold duration in days to apply to the object copy. You
+    #   cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_years
+    #   The event hold duration in years to apply to the object copy. You
+    #   cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
     # @option options [String] :expected_bucket_owner
     #   The account ID of the expected destination bucket owner. If the
     #   account ID that you provide does not match the actual owner of the
@@ -1948,8 +2042,8 @@ module Aws::S3
     #     metadata: {
     #       "MetadataKey" => "MetadataValue",
     #     },
-    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -1962,6 +2056,9 @@ module Aws::S3
     #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
     #     object_lock_retain_until_date: Time.now,
     #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #     object_lock_event_hold: "ON", # accepts ON, OFF
+    #     object_lock_event_hold_duration_days: 1,
+    #     object_lock_event_hold_duration_years: 1,
     #     expected_bucket_owner: "AccountId",
     #     checksum_algorithm: "CRC32", # accepts CRC32, CRC32C, SHA1, SHA256, CRC64NVME, SHA512, MD5, XXHASH64, XXHASH3, XXHASH128
     #     checksum_type: "COMPOSITE", # accepts COMPOSITE, FULL_OBJECT
@@ -2483,6 +2580,27 @@ module Aws::S3
     #   <note markdown="1"> This functionality is not supported for directory buckets.
     #
     #    </note>
+    # @option options [String] :object_lock_event_hold
+    #   Specifies the event hold status to apply to the uploaded object. Set
+    #   to `ON` to enable or `OFF` to disable.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_days
+    #   Specifies the event hold duration in days to apply to the uploaded
+    #   object. You cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_years
+    #   Specifies the event hold duration in years to apply to the uploaded
+    #   object. You cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
     # @option options [String] :expected_bucket_owner
     #   The account ID of the expected bucket owner. If the account ID that
     #   you provide does not match the actual owner of the bucket, the request
@@ -2554,8 +2672,8 @@ module Aws::S3
     #     metadata: {
     #       "MetadataKey" => "MetadataValue",
     #     },
-    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -2568,6 +2686,9 @@ module Aws::S3
     #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
     #     object_lock_retain_until_date: Time.now,
     #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #     object_lock_event_hold: "ON", # accepts ON, OFF
+    #     object_lock_event_hold_duration_days: 1,
+    #     object_lock_event_hold_duration_years: 1,
     #     expected_bucket_owner: "AccountId",
     #   })
     # @param [Hash] options ({})
@@ -3193,6 +3314,27 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html
+    # @option options [String] :object_lock_event_hold
+    #   Specifies the event hold status to apply to this object. Set to `ON`
+    #   to enable or `OFF` to disable.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_days
+    #   Specifies the event hold duration in days to apply to this object. You
+    #   cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_years
+    #   Specifies the event hold duration in years to apply to this object.
+    #   You cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
     # @option options [String] :expected_bucket_owner
     #   The account ID of the expected bucket owner. If the account ID that
     #   you provide does not match the actual owner of the bucket, the request
@@ -3259,7 +3401,7 @@ module Aws::S3
     #           bucket_name: "BucketName", # required
     #           prefix: "LocationPrefix", # required
     #           encryption: {
-    #             encryption_type: "AES256", # required, accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
+    #             encryption_type: "AES256", # required, accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
     #             kms_key_id: "SSEKMSKeyId",
     #             kms_context: "KMSContext",
     #           },
@@ -3290,7 +3432,7 @@ module Aws::S3
     #               value: "MetadataValue",
     #             },
     #           ],
-    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #         },
     #       },
     #     },

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

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require 'thread'
-
 module Aws
   module S3
     # @api private
     class ObjectCopier
-
       # @param [S3::Object] object
       def initialize(object, options = {})
         @object = object
@@ -23,7 +20,7 @@ module Aws
 
       private
 
-      def copy_object(source, target, options)
+      def copy_object(source, target, options) # rubocop:disable Metrics/MethodLength
         target_bucket, target_key = copy_target(target)
         options[:bucket] = target_bucket
         options[:key] = target_key
@@ -38,7 +35,7 @@ module Aws
         end
       end
 
-      def copy_source(source)
+      def copy_source(source) # rubocop:disable Metrics/MethodLength
         case source
         when String then source
         when Hash
@@ -50,54 +47,46 @@ module Aws
         when S3::ObjectVersion
           "#{source.bucket_name}/#{escape(source.object_key)}?versionId=#{source.id}"
         else
-          msg = "expected source to be an Aws::S3::Object, Hash, or String"
-          raise ArgumentError, msg
+          raise ArgumentError, 'expected source to be an Aws::S3::Object, Hash, or String'
         end
       end
 
       def copy_target(target)
         case target
-        when String then target.match(/([^\/]+?)\/(.+)/)[1,2]
+        when String then target.match(%r{([^/]+?)/(.+)})[1, 2]
         when Hash then target.values_at(:bucket, :key)
         when S3::Object then [target.bucket_name, target.key]
         else
-          msg = "expected target to be an Aws::S3::Object, Hash, or String"
-          raise ArgumentError, msg
+          raise ArgumentError, 'expected target to be an Aws::S3::Object, Hash, or String'
         end
       end
 
       def merge_options(source_or_target, options)
-        if Hash === source_or_target
-          source_or_target.inject(options.dup) do |opts, (key, value)|
-            opts[key] = value unless [:bucket, :key, :version_id].include?(key)
-            opts
+        if source_or_target.is_a?(Hash)
+          source_or_target.each_with_object(options.dup) do |(key, value), opts|
+            opts[key] = value unless %i[bucket key version_id].include?(key)
           end
         else
           options.dup
         end
       end
 
-      def apply_source_client(source, options)
-
-        if source.respond_to?(:client)
-          options[:copy_source_client] ||= source.client
-        end
+      def apply_source_client(source, options) # rubocop:disable Metrics/AbcSize
+        options[:copy_source_client] ||= source.client if source.respond_to?(:client)
 
         if options[:copy_source_region]
           config = @object.client.config
-          config = config.each_pair.inject({}) { |h, (k,v)| h[k] = v; h }
+          config = config.each_pair.with_object({}) { |(k, v), h| h[k] = v unless v.nil? }
           config[:region] = options.delete(:copy_source_region)
           options[:copy_source_client] ||= S3::Client.new(config)
         end
 
         options[:copy_source_client] ||= @object.client
-
       end
 
       def escape(str)
         Seahorse::Util.uri_path_escape(str)
       end
-
     end
   end
 end