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 200 errors implementation #3276

Merged

alexgromero merged 20 commits into boto:develop from alexgromero:s3-200-errors

Oct 21, 2024

Contributor

alexgromero commented Oct 8, 2024

The S3 service may occasionally respond with an HTTP 200 OK status code while including errors in the response body. This PR addresses this handling to ensure accurate error reporting.

codecov-commenter commented Oct 8, 2024 •

edited

Loading

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 94.11765% with 1 line in your changes missing coverage. Please review.

Project coverage is 93.20%. Comparing base (0e229ae) to head (017bacf).
Report is 123 commits behind head on develop.

Files with missing lines	Patch %	Lines
botocore/handlers.py	94.11%	1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3276      +/-   ##
===========================================
+ Coverage    93.17%   93.20%   +0.02%     
===========================================
  Files           66       66              
  Lines        14339    14358      +19     
===========================================
+ Hits         13361    13382      +21     
+ Misses         978      976       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jonathan343 reviewed

View reviewed changes

botocore/handlers.py Outdated Show resolved Hide resolved

tests/functional/test_credentials.py Outdated Show resolved Hide resolved

tests/functional/test_s3.py Show resolved Hide resolved

tests/functional/test_s3.py Outdated Show resolved Hide resolved

tests/unit/test_handlers.py Outdated Show resolved Hide resolved

nateprewitt reviewed

View reviewed changes

tests/functional/test_credentials.py Outdated Show resolved Hide resolved

alexgromero force-pushed the s3-200-errors branch 2 times, most recently from f5a7bb6 to 6e31ea8 Compare

October 8, 2024 21:22

alexgromero requested review from nateprewitt, jonathan343 and SamRemis

October 15, 2024 15:23

SamRemis reviewed

View reviewed changes

botocore/endpoint.py Outdated Show resolved Hide resolved

botocore/model.py Outdated Show resolved Hide resolved

nateprewitt requested changes

View reviewed changes

Contributor

nateprewitt left a comment

Some high level comments of what may make this a bit simpler. We should be able to drop the empty body requirement after our discussion.

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/model.py Outdated Show resolved Hide resolved

botocore/endpoint.py Outdated Show resolved Hide resolved

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/model.py Outdated Show resolved Hide resolved

tests/functional/configured_endpoint_urls/test_configured_endpoint_url.py Outdated Show resolved Hide resolved

tests/functional/test_s3.py Show resolved Hide resolved

tests/functional/test_s3.py Outdated Show resolved Hide resolved

alexgromero force-pushed the s3-200-errors branch from b08fd43 to e3f275a Compare

October 17, 2024 14:42

alexgromero and others added 10 commits

October 17, 2024 10:46


          S3 200 errors implementation

3a865b0


          add changelog

c0e9871


          move _has_modeled_body function and update tests that need bodies

e181670


          fix test comment

aa936fa


          deprecate original handler. update implementation and tests

9f975e6


          Update botocore/handlers.py

5948f9b

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update botocore/handlers.py

e258a3f

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update botocore/model.py

6269bf5

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update tests/functional/test_s3.py

44ad31d

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          update implementation and clean up tests

bd5d4ad

alexgromero force-pushed the s3-200-errors branch from e3f275a to bd5d4ad Compare

October 17, 2024 14:46

alexgromero requested review from nateprewitt and SamRemis

October 17, 2024 15:03

SamRemis reviewed

View reviewed changes

tests/unit/test_handlers.py Outdated Show resolved Hide resolved

nateprewitt requested changes

View reviewed changes

Contributor

nateprewitt left a comment

Looking good! Have a few minor notes on comments and unit tests. We want to try to be succinct with comments/logging as long messages are often ignored.

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/handlers.py Outdated Show resolved Hide resolved

botocore/handlers.py Outdated Show resolved Hide resolved

tests/unit/test_handlers.py Outdated Show resolved Hide resolved

tests/unit/test_handlers.py Outdated Show resolved Hide resolved

alexgromero and others added 4 commits

October 17, 2024 13:31


          Update botocore/handlers.py

0fdbd82

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update botocore/handlers.py

46d0f2e

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update botocore/handlers.py

d7dcfa1

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update botocore/handlers.py

d21ce1b

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          Update botocore/handlers.py

9cfa059

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>

nateprewitt reviewed

View reviewed changes

.changes/next-release/enhancement-s3-47846.json Outdated Show resolved Hide resolved


          Update .changes/next-release/enhancement-s3-47846.json

4a51dc9

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>

nateprewitt reviewed

View reviewed changes

botocore/handlers.py Outdated Show resolved Hide resolved

alexgromero and others added 2 commits

October 17, 2024 18:35


          Update botocore/handlers.py

ee4dda5

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>


          drop unit tests in favor of functional tests

1e16e8b

alexgromero requested review from nateprewitt and SamRemis

October 18, 2024 14:59


          fix extra space in handlers test

9594dca

nateprewitt requested changes

View reviewed changes

Contributor

nateprewitt left a comment

Looking good! One last thing to fix and then I think we're set.

botocore/handlers.py Outdated Show resolved Hide resolved


          Update botocore/handlers.py

017bacf

Co-authored-by: Nate Prewitt <nate.prewitt@gmail.com>

alexgromero requested a review from nateprewitt

October 18, 2024 15:37

nateprewitt approved these changes

View reviewed changes

Contributor

nateprewitt left a comment

Things look good, assuming tests pass I think this is ready to ship. Great job, @alexgromero!

Contributor

nateprewitt commented Oct 18, 2024

Closing/reopening to rerun tests against fix in #3282.

nateprewitt closed this

nateprewitt reopened this

alexgromero merged commit d64e956 into boto:develop

78 of 79 checks passed

alexgromero deleted the s3-200-errors branch

October 21, 2024 16:26

aws-sdk-python-automation added a commit that referenced this pull request


          Merge branch 'release-1.35.45'

c87e507

* release-1.35.45:
  Bumping version to 1.35.45
  Update to latest models
  S3 200 errors implementation (#3276)
  Fix flakey test by allowing arbitrary warnings during capture (#3282)

bpandola mentioned this pull request

Botocore 1.35.45 breaks S3:SelectObjectContent #3284

Closed

1 task

hswong3i pushed a commit to alvistack/boto-botocore that referenced this pull request


          S3 200 errors implementation (boto#3276)

1842dfb

odormond mentioned this pull request

GetBucketPolicy broken by PR #3276 #3286

Closed

1 task

alexgromero added a commit to alexgromero/botocore that referenced this pull request


          Revert "S3 200 errors implementation (boto#3276)"

1b50e32

This reverts commit d64e956.

This was referenced Oct 23, 2024

Revert S3 200 errors implementation #3287

Closed

Fix S3 200 Error handling #3288

Merged

aemous mentioned this pull request

[v2] S3 200 errors aws/aws-cli#9055

Merged

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

Labels

None yet