Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

S3: Do not unquote the key two times on multipart upload complete #6287

Merged
merged 2 commits into from
May 8, 2023
Merged

S3: Do not unquote the key two times on multipart upload complete #6287

merged 2 commits into from
May 8, 2023

Conversation

vdytyniak-exos
Copy link
Contributor

@vdytyniak-exos vdytyniak-exos commented May 5, 2023 •
edited
Loading

Current implementation unquotes key two times, firstly in self.backend.put_object and then in self.backend.put_object_acl -> self.get_object. To fix this issue I have exposed key_is_clean in put_object_acl and set it to True.

@vdytyniak-exos vdytyniak-exos mentioned this pull request May 5, 2023
Closed
@vdytyniak-exos
Copy link
Contributor Author

vdytyniak-exos commented May 5, 2023 •
edited
Loading

@bblommers I see that you were trying to rerun the check. Do you think it is related to my changes?

bblommers
bblommers requested changes May 5, 2023
View reviewed changes
Copy link
Collaborator

@bblommers bblommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @vdytyniak-exos, appreciate you taking the time to submit a fix for this issue!

The tests are failing because of #6286, so don't worry too much about unrelated tests.

tests/test_s3/test_s3_multipart.py Outdated Show resolved Hide resolved
@bblommers bblommers linked an issue May 5, 2023 that may be closed by this pull request
Motoserver multipart upload failure #6281
Closed
@vdytyniak-exos
Copy link
Contributor Author

vdytyniak-exos commented May 8, 2023 •
edited
Loading

Hi @vdytyniak-exos, appreciate you taking the time to submit a fix for this issue!

The tests are failing because of #6286, so don't worry too much about unrelated tests.

@bblommers Could you please approve the changes?

bblommers
bblommers approved these changes May 8, 2023
View reviewed changes
Copy link
Collaborator

@bblommers bblommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thanks again for fixing this @vdytyniak-exos!

@bblommers bblommers added this to the 4.1.10 milestone May 8, 2023
@bblommers bblommers merged commit 7a4eac0 into getmoto:master May 8, 2023
@bblommers bblommers changed the title Do not unquote the key two times on multipart upload complete S3: Do not unquote the key two times on multipart upload complete May 8, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 8, 2023

This is now part of moto >= 4.1.10.dev2

@vdytyniak-exos
Copy link
Contributor Author

LGTM - thanks again for fixing this @vdytyniak-exos!

@bblommers Glad to fix! When I can expect docker image to be pushed with my fix?

@bblommers
Copy link
Collaborator

bblommers commented May 9, 2023 •
edited
Loading

That happens automatically @vdytyniak-exos ! It's already part of the latest-tag.

Edit: I don't know when exactly we'll release 4.1.10, but I can let you know when that happens.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bblommers bblommers bblommers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.1.10
Development

Successfully merging this pull request may close these issues.

Motoserver multipart upload failure
2 participants
@vdytyniak-exos @bblommers