catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add S3 location response. Closes #279.

Browse source
This commit is contained in:
Steve Pulec 2014-12-10 20:44:00 -05:00
commit 4ab3b318eb
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
moto/s3/responses.py
View file

@ -89,6 +89,10 @@ class ResponseObject(object):
return 200, headers, template.render(
bucket_name=bucket_name,
uploads=multiparts)
elif 'location' in querystring:
bucket = self.backend.get_bucket(bucket_name)
template = Template(S3_BUCKET_LOCATION)
return 200, headers, template.render(location=bucket.location)
elif 'versioning' in querystring:
versioning = self.backend.get_bucket_versioning(bucket_name)
template = Template(S3_BUCKET_GET_VERSIONING)
@ -148,7 +152,7 @@ class ResponseObject(object):
return 404, headers, ""
else:
try:
new_bucket = self.backend.create_bucket(bucket_name)
new_bucket = self.backend.create_bucket(bucket_name, region_name)
except BucketAlreadyExists:
if region_name == DEFAULT_REGION_NAME:
# us-east-1 has different behavior
@ -470,6 +474,9 @@ S3_DELETE_BUCKET_WITH_ITEMS_ERROR = """<?xml version="1.0" encoding="UTF-8"?>
<HostId>sdfgdsfgdsfgdfsdsfgdfs</HostId>
</Error>"""
S3_BUCKET_LOCATION = """<?xml version="1.0" encoding="UTF-8"?>
<LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/">{{ location }}</LocationConstraint>"""
S3_BUCKET_VERSIONING = """
<?xml version="1.0" encoding="UTF-8"?>
<VersioningConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">