Skip to content

Commit

Permalink
Merge branch 'release-1.20.32'
Browse files Browse the repository at this point in the history
* release-1.20.32:
  Bumping version to 1.20.32
  Update S3 Object Lambda references
  • Loading branch information
aws-sdk-python-automation committed Mar 18, 2021
2 parents ff0bcbe + 6340220 commit 94c44d2
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .changes/1.20.32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"category": "s3",
"description": "Updated mislabeled exceptions for S3 Object Lambda",
"type": "bugfix"
}
]
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
CHANGELOG
=========

1.20.32
=======

* bugfix:s3: Updated mislabeled exceptions for S3 Object Lambda


1.20.31
=======

Expand Down
2 changes: 1 addition & 1 deletion botocore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import re
import logging

__version__ = '1.20.31'
__version__ = '1.20.32'


class NullHandler(logging.Handler):
Expand Down
11 changes: 7 additions & 4 deletions botocore/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1524,12 +1524,15 @@ def __init__(self, endpoint_resolver, region=None,

def register(self, event_emitter):
event_emitter.register('before-sign.s3', self.set_endpoint)
event_emitter.register('before-call.s3.WriteGetObjectResponse', self.update_endpoint_to_banner)
event_emitter.register(
'before-call.s3.WriteGetObjectResponse',
self.update_endpoint_to_s3_object_lambda
)

def update_endpoint_to_banner(self, params, context, **kwargs):
def update_endpoint_to_s3_object_lambda(self, params, context, **kwargs):
if self._use_accelerate_endpoint:
raise UnsupportedS3ConfigurationError(
msg='S3 client does not support accelerate endpoints for banner operations',
msg='S3 client does not support accelerate endpoints for S3 Object Lambda operations',
)

self._override_signing_name(context, 's3-object-lambda')
Expand Down Expand Up @@ -1589,7 +1592,7 @@ def _validate_accesspoint_supported(self, request):
raise UnsupportedS3AccesspointConfigurationError(
msg=(
'Client does not support s3 dualstack configuration '
'when a banner access point ARN is specified.'
'when an S3 Object Lambda access point ARN is specified.'
)
)
outpost_name = request.context['s3_accesspoint'].get('outpost_name')
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
# The short X.Y version.
version = '1.20.'
# The full version, including alpha/beta/rc tags.
release = '1.20.31'
release = '1.20.32'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1932,7 +1932,7 @@ def test_register(self):
mock.call('before-sign.s3', self.endpoint_setter.set_endpoint),
mock.call(
'before-call.s3.WriteGetObjectResponse',
self.endpoint_setter.update_endpoint_to_banner,
self.endpoint_setter.update_endpoint_to_s3_object_lambda,
)
])

Expand Down

0 comments on commit 94c44d2

Please sign in to comment.