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

Merge pull request #904 from ambrusadrianz/master

Browse Source 
Fixed S3 copyObject compatibility with the Java AWS SDK
This commit is contained in:
Steve Pulec 2017-04-15 23:46:21 -04:00 committed by GitHub
commit e9bf74d8e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/s3/responses.py
View File

@ -506,7 +506,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
upload_id = query['uploadId'][0] upload_id = query['uploadId'][0]
part_number = int(query['partNumber'][0]) part_number = int(query['partNumber'][0])
if 'x-amz-copy-source' in request.headers: if 'x-amz-copy-source' in request.headers:
src = request.headers.get("x-amz-copy-source") src = request.headers.get("x-amz-copy-source").lstrip("/")
src_bucket, src_key = src.split("/", 1) src_bucket, src_key = src.split("/", 1)
src_range = request.headers.get( src_range = request.headers.get(
'x-amz-copy-source-range', '').split("bytes=")[-1] 'x-amz-copy-source-range', '').split("bytes=")[-1]
@ -541,7 +541,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
if 'x-amz-copy-source' in request.headers: if 'x-amz-copy-source' in request.headers:
# Copy key # Copy key
src_key_parsed = urlparse(request.headers.get("x-amz-copy-source")) src_key_parsed = urlparse(request.headers.get("x-amz-copy-source"))
src_bucket, src_key = src_key_parsed.path.split("/", 1) src_bucket, src_key = src_key_parsed.path.lstrip("/").split("/", 1)
src_version_id = parse_qs(src_key_parsed.query).get( src_version_id = parse_qs(src_key_parsed.query).get(
'versionId', [None])[0] 'versionId', [None])[0]
self.backend.copy_key(src_bucket, src_key, bucket_name, key_name, self.backend.copy_key(src_bucket, src_key, bucket_name, key_name,