[v2] Perform copy with no overwrite using IfNoneMatch #9910
+96
−388
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kdaily
force-pushed
the
nooverwrite-copyobject-with-ifnonematch
branch
from
6183e9e to
a61aa8e
Compare
This commit rolls back changes made to force multipart copies if no overwrite is specified. This includes checking for 0-length files. It also removes the CopyObject argument block list, since IfNoneMatch is now allowed and was the only argument in the list.
Removes the tests for 0 length files and moves some tests to the TestNonMultipartCopy class, since CopyObject accepts IfNoneMatch and no longer needs to force multipart copying.
Update the tests to account for different operations being called, since multipart upload is now not necessary.
kdaily
force-pushed
the
nooverwrite-copyobject-with-ifnonematch
branch
from
a61aa8e to
5dce4bc
Compare
kdaily
commented
Dec 12, 2025
The IfNoneMatch header is set on the CopyObject request
hssyoo
reviewed
Dec 15, 2025
awscli/s3transfer/copies.py
Outdated
| 'IfNoneMatch', | ||
| ] | ||
|
|
||
| COPY_OBJECT_ARGS_BLOCKLIST = [ |
Contributor
There was a problem hiding this comment.
Can we delete the whole property?
Member
Author
There was a problem hiding this comment.
Indeed, and then I should also roll back changes to this test:
awscli/s3transfer/copies.py
Outdated
Comment on lines
143
to
144
| # If it is less than threshold and ifNoneMatch is not in parameters | ||
| # do a regular copy else do multipart copy. |
Contributor
There was a problem hiding this comment.
Update comment to reflect code change
Removes the constant and updates the test using it.
Replace with the previously existing comment since the IfNoneMatch header is no longer used for the copy operation logic.
aemous
reviewed
Dec 15, 2025
hssyoo
approved these changes
Dec 15, 2025
s3transfer does not have a 'no overwrite' flag, which is specific to the CLI.
The test was doing an upload instead of a (bucket-to-bucket) copy. Fixed the test expected responses to match what should be called.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
s3-no-overwritebranch withv2.This PR is merging to the
s3-no-overwritefeature branch.Now that AWS S3 supports the
IfNoneMatchheader onCopyObjectoperations, we no longer need the more complicated solution that forces multipart upload copies for all copy and move operations. Additionally, we don't need to have a special case for 0-byte object. This PR rolls back some of the changes already added and goes back to allowingIfNoneMatchheader to go toCopyObjectoperations.By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.