Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Support streaming upload from requests. (#3062)

Browse Source 
* Fix: Support streaming upload from requests.

* [FIX] style.

Co-authored-by: Gordon Cassie <gordon.cassie@closingfolders.com>
This commit is contained in:
Gordon Cassie 2020-06-11 01:50:50 -04:00 committed by GitHub
parent dcde2570b1
commit b88f166099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/core/models.py
View File

@ -184,6 +184,8 @@ class CallbackResponse(responses.CallbackResponse):
body = None body = None
elif isinstance(request.body, six.text_type): elif isinstance(request.body, six.text_type):
body = six.BytesIO(six.b(request.body)) body = six.BytesIO(six.b(request.body))
elif hasattr(request.body, "read"):
body = six.BytesIO(request.body.read())
else: else:
body = six.BytesIO(request.body) body = six.BytesIO(request.body)
req = Request.from_values( req = Request.from_values(

16
tests/test_s3/test_s3.py
View File

@ -1040,6 +1040,22 @@ def test_s3_object_in_public_bucket_using_multiple_presigned_urls():
assert response.status_code == 200, "Failed on req number {}".format(i) assert response.status_code == 200, "Failed on req number {}".format(i)
@mock_s3
def test_streaming_upload_from_file_to_presigned_url():
s3 = boto3.resource("s3")
bucket = s3.Bucket("test-bucket")
bucket.create()
bucket.put_object(Body=b"ABCD", Key="file.txt")
params = {"Bucket": "test-bucket", "Key": "file.txt"}
presigned_url = boto3.client("s3").generate_presigned_url(
"put_object", params, ExpiresIn=900
)
with open(__file__, "rb") as f:
response = requests.get(presigned_url, data=f)
assert response.status_code == 200
@mock_s3 @mock_s3
def test_s3_object_in_private_bucket(): def test_s3_object_in_private_bucket():
s3 = boto3.resource("s3") s3 = boto3.resource("s3")