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.

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

Fix S3 URL Handler for good #19285

Merged
merged 3 commits into from
Jun 10, 2023
Merged

Fix S3 URL Handler for good #19285

merged 3 commits into from
Jun 10, 2023

Conversation

thejcannon
Copy link
Member

See https://github.com/boto/botocore/blob/0c833f28b1d87883c7aeb4aed8a05860af1ec34a/botocore/compat.py#L37 this type should work in all cases.

I tried both locally and in my CI (token auth)

Also UGH 😓

@thejcannon thejcannon added the category:internal CI, fixes for not-yet-released features, etc. label Jun 9, 2023
@thejcannon thejcannon added this to the 2.16.x milestone Jun 9, 2023
@thejcannon thejcannon requested review from benjyw and huonw June 9, 2023 16:37
@thejcannon thejcannon changed the title Fix AWS for good Fix S3 URL Handler for good Jun 9, 2023
Copy link
Contributor

@huonw huonw left a comment

Choose a reason for hiding this comment

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

Yay! Approved because it supposedly works, but... I don't understand the moving parts, so I'm surprised that this is:

  1. importing from http rather than botocore
  2. no longer explicitly setting the header as previously suggested was necessary as a workaround

Could you clarify those?

I also suspect this needs cherry-picking tagging?

@thejcannon
Copy link
Member Author

At first I was hesitant to use the botocore type, but I decided to go for it.

For 2, now that we're using the correct type, we no longer are hitting the previous bug (the real type is mapping-like but not a dict. Using a dict made us need to workaround. Using the real type responds exactly as expected because, well, it's the real type).

@huonw
Copy link
Contributor

huonw commented Jun 10, 2023

Makes sense, thanks for explaining! 👍

@thejcannon thejcannon enabled auto-merge (squash) June 10, 2023 02:10
@thejcannon thejcannon merged commit 80465d7 into main Jun 10, 2023
@thejcannon thejcannon deleted the jcannon/fixaws-for-good branch June 10, 2023 02:27
github-actions bot pushed a commit that referenced this pull request Jun 10, 2023
See
https://github.com/boto/botocore/blob/0c833f28b1d87883c7aeb4aed8a05860af1ec34a/botocore/compat.py#L37
this type should work in all cases.

I tried both locally and in my CI (token auth)

Also UGH 😓
github-actions bot pushed a commit that referenced this pull request Jun 10, 2023
See
https://github.com/boto/botocore/blob/0c833f28b1d87883c7aeb4aed8a05860af1ec34a/botocore/compat.py#L37
this type should work in all cases.

I tried both locally and in my CI (token auth)

Also UGH 😓
thejcannon added a commit that referenced this pull request Jun 10, 2023
See
https://github.com/boto/botocore/blob/0c833f28b1d87883c7aeb4aed8a05860af1ec34a/botocore/compat.py#L37
this type should work in all cases.

I tried both locally and in my CI (token auth)

Also UGH 😓

Co-authored-by: Joshua Cannon <[email protected]>
thejcannon added a commit that referenced this pull request Jun 10, 2023
See
https://github.com/boto/botocore/blob/0c833f28b1d87883c7aeb4aed8a05860af1ec34a/botocore/compat.py#L37
this type should work in all cases.

I tried both locally and in my CI (token auth)

Also UGH 😓

Co-authored-by: Joshua Cannon <[email protected]>
@kaos kaos mentioned this pull request Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:internal CI, fixes for not-yet-released features, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants