aws-sdk-s3 1.149.0 → 1.149.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d91f16763c42e349f2e6d50ff4f37926096c5148ae5f78b953685e4d2f171e
-  data.tar.gz: 2e72de55c5c10a86437e89200db3b357bb89f083ca5b1c044c20ed90143b66b4
+  metadata.gz: f7e829d836e606576346cf328245de26a473222ab50d8d8b7fbbecc88efebb92
+  data.tar.gz: bcf4d589ca8ae7caebd3f1ea07da416ed3c01221309dbd27768313173c96ba70
 SHA512:
-  metadata.gz: '078c6651b2bc5d4c4cf9abb678303f3dc41250eb24ee66fcbbb22d9c96064dc8dbade173862964021948234fff6e9d38b4a9eb255949891fc047a0b06ac785f6'
-  data.tar.gz: d17a3204313a0977ee8f108c057fefbcbca80eb48e54e146274be01b9f2d9d4c33502cf2474c49fffe560d4a134d8e985a0f8db7a3f83ff533b898e725236473
+  metadata.gz: 79cbefd5b7c02a53da10516def3cb467a379074f9eebfbdbbec29d440101bb9331f79c9cd6369fbdde56c65ba724a431cf6931f9630e121416ab2251ef672ddc
+  data.tar.gz: 174a2ad0bb115e7d13c5d97131d2ed6338ce26f8e24fa40aa7708ecb4015d6ac5ea354e04461443097317236dd1803bac8161d17dc7013b6471c88fe79328e21

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.149.1 (2024-05-06)
+------------------
+
+* Issue - Fix bug where destination bucket default encryption was inadvertently overridden by source object encryption.
+
 1.149.0 (2024-04-30)
 ------------------
 
@@ -167,7 +172,7 @@ Unreleased Changes
 1.123.2 (2023-06-12)
 ------------------
 
-* Issue - Fix issue when decrypting noncurrent versions of objects when using client side encryption (#2866). 
+* Issue - Fix issue when decrypting noncurrent versions of objects when using client side encryption (#2866).
 
 1.123.1 (2023-06-02)
 ------------------

data/VERSION

@@ -1 +1 @@
-1.149.0
+1.149.1

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

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

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

@@ -138,9 +138,7 @@ module Aws
       end
 
       def source_metadata(options)
-        if options[:content_length]
-          return { content_length: options.delete(:content_length) }
-        end
+        return options.slice(:content_length) if options[:content_length]
 
         client = options[:copy_source_client] || @client
 
@@ -150,11 +148,15 @@ module Aws
           bucket, key = options[:copy_source].match(/([^\/]+?)\/(.+)/)[1,2]
         end
 
-        key = CGI.unescape(key)
-        opts = { bucket: bucket, key: key }
-        opts[:version_id] = version_id if version_id
-        opts[:part_number] = options[:part_number] if options[:part_number]
-        client.head_object(opts).to_h
+        head_opts = { bucket: bucket, key: CGI.unescape(key) }.tap { |opts|
+          opts[:version_id]  = version_id if version_id
+          opts[:part_number] = options[:part_number] if options[:part_number]
+        }
+
+        client.head_object(head_opts).to_h.tap { |head|
+          head.delete(:server_side_encryption)
+          head.delete(:ssekms_key_id)
+        }
       end
 
       def default_part_size(source_size)

data/lib/aws-sdk-s3.rb

@@ -73,6 +73,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @!group service
 module Aws::S3
 
-  GEM_VERSION = '1.149.0'
+  GEM_VERSION = '1.149.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.149.0
+  version: 1.149.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms