Merge pull request #2717 from bblommers/feature/s3_illegallocationconstraint
S3 Feature: Add IllegalLocationConstraintException
This commit is contained in:
Steve Pulec
GitHub
commit
e40d75359a
@ -127,6 +127,18 @@ class InvalidRequest(S3ClientError):
|
||||
)
|
||||
|
||||
|
||||
class IllegalLocationConstraintException(S3ClientError):
|
||||
code = 400
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(IllegalLocationConstraintException, self).__init__(
|
||||
"IllegalLocationConstraintException",
|
||||
"The unspecified location constraint is incompatible for the region specific endpoint this request was sent to.",
|
||||
*args,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
|
||||
class MalformedXML(S3ClientError):
|
||||
code = 400
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ from .exceptions import (
|
||||
InvalidPartOrder,
|
||||
MalformedXML,
|
||||
MalformedACLError,
|
||||
IllegalLocationConstraintException,
|
||||
InvalidNotificationARN,
|
||||
InvalidNotificationEvent,
|
||||
ObjectNotInActiveTierError,
|
||||
@ -585,6 +586,15 @@ class ResponseObject(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
|
||||
next_continuation_token = None
|
||||
return result_keys, is_truncated, next_continuation_token
|
||||
|
||||
def _body_contains_location_constraint(self, body):
|
||||
if body:
|
||||
try:
|
||||
xmltodict.parse(body)["CreateBucketConfiguration"]["LocationConstraint"]
|
||||
return True
|
||||
except KeyError:
|
||||
pass
|
||||
return False
|
||||
|
||||
def _bucket_response_put(
|
||||
self, request, body, region_name, bucket_name, querystring
|
||||
):
|
||||
@ -680,10 +690,16 @@ class ResponseObject(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
|
||||
return ""
|
||||
|
||||
else:
|
||||
# us-east-1, the default AWS region behaves a bit differently
|
||||
# - you should not use it as a location constraint --> it fails
|
||||
# - querying the location constraint returns None
|
||||
# - LocationConstraint has to be specified if outside us-east-1
|
||||
if (
|
||||
region_name != DEFAULT_REGION_NAME
|
||||
and not self._body_contains_location_constraint(body)
|
||||
):
|
||||
raise IllegalLocationConstraintException()
|
||||
if body:
|
||||
# us-east-1, the default AWS region behaves a bit differently
|
||||
# - you should not use it as a location constraint --> it fails
|
||||
# - querying the location constraint returns None
|
||||
try:
|
||||
forced_region = xmltodict.parse(body)["CreateBucketConfiguration"][
|
||||
"LocationConstraint"
|
||||
|
||||
@ -37,7 +37,7 @@ def bucket_name_from_url(url):
|
||||
|
||||
REGION_URL_REGEX = re.compile(
|
||||
r"^https?://(s3[-\.](?P<region1>.+)\.amazonaws\.com/(.+)|"
|
||||
r"(.+)\.s3-(?P<region2>.+)\.amazonaws\.com)/?"
|
||||
r"(.+)\.s3[-\.](?P<region2>.+)\.amazonaws\.com)/?"
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -86,14 +86,14 @@ def lambda_handler(event, context):
|
||||
|
||||
@mock_lambda
|
||||
def test_list_functions():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
result = conn.list_functions()
|
||||
result["Functions"].should.have.length_of(0)
|
||||
|
||||
|
||||
@mock_lambda
|
||||
def test_invoke_requestresponse_function():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
Runtime="python2.7",
|
||||
@ -163,7 +163,7 @@ def test_invoke_requestresponse_function_with_arn():
|
||||
|
||||
@mock_lambda
|
||||
def test_invoke_event_function():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
Runtime="python2.7",
|
||||
@ -193,11 +193,11 @@ if settings.TEST_SERVER_MODE:
|
||||
@mock_ec2
|
||||
@mock_lambda
|
||||
def test_invoke_function_get_ec2_volume():
|
||||
conn = boto3.resource("ec2", "us-west-2")
|
||||
vol = conn.create_volume(Size=99, AvailabilityZone="us-west-2")
|
||||
conn = boto3.resource("ec2", _lambda_region)
|
||||
vol = conn.create_volume(Size=99, AvailabilityZone=_lambda_region)
|
||||
vol = conn.Volume(vol.id)
|
||||
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
Runtime="python3.7",
|
||||
@ -227,14 +227,14 @@ if settings.TEST_SERVER_MODE:
|
||||
@mock_ec2
|
||||
@mock_lambda
|
||||
def test_invoke_function_from_sns():
|
||||
logs_conn = boto3.client("logs", region_name="us-west-2")
|
||||
sns_conn = boto3.client("sns", region_name="us-west-2")
|
||||
logs_conn = boto3.client("logs", region_name=_lambda_region)
|
||||
sns_conn = boto3.client("sns", region_name=_lambda_region)
|
||||
sns_conn.create_topic(Name="some-topic")
|
||||
topics_json = sns_conn.list_topics()
|
||||
topics = topics_json["Topics"]
|
||||
topic_arn = topics[0]["TopicArn"]
|
||||
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
result = conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
Runtime="python2.7",
|
||||
@ -277,7 +277,7 @@ def test_invoke_function_from_sns():
|
||||
|
||||
@mock_lambda
|
||||
def test_create_based_on_s3_with_missing_bucket():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.create_function.when.called_with(
|
||||
FunctionName="testFunction",
|
||||
@ -297,12 +297,15 @@ def test_create_based_on_s3_with_missing_bucket():
|
||||
@mock_s3
|
||||
@freeze_time("2015-01-01 00:00:00")
|
||||
def test_create_function_from_aws_bucket():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
zip_content = get_test_zip_file2()
|
||||
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
result = conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -350,7 +353,7 @@ def test_create_function_from_aws_bucket():
|
||||
@mock_lambda
|
||||
@freeze_time("2015-01-01 00:00:00")
|
||||
def test_create_function_from_zipfile():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
zip_content = get_test_zip_file1()
|
||||
result = conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -395,12 +398,15 @@ def test_create_function_from_zipfile():
|
||||
@mock_s3
|
||||
@freeze_time("2015-01-01 00:00:00")
|
||||
def test_get_function():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file1()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -464,7 +470,10 @@ def test_get_function():
|
||||
def test_get_function_by_arn():
|
||||
bucket_name = "test-bucket"
|
||||
s3_conn = boto3.client("s3", "us-east-1")
|
||||
s3_conn.create_bucket(Bucket=bucket_name)
|
||||
s3_conn.create_bucket(
|
||||
Bucket=bucket_name,
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket=bucket_name, Key="test.zip", Body=zip_content)
|
||||
@ -489,12 +498,15 @@ def test_get_function_by_arn():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_delete_function():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -525,7 +537,10 @@ def test_delete_function():
|
||||
def test_delete_function_by_arn():
|
||||
bucket_name = "test-bucket"
|
||||
s3_conn = boto3.client("s3", "us-east-1")
|
||||
s3_conn.create_bucket(Bucket=bucket_name)
|
||||
s3_conn.create_bucket(
|
||||
Bucket=bucket_name,
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket=bucket_name, Key="test.zip", Body=zip_content)
|
||||
@ -550,7 +565,7 @@ def test_delete_function_by_arn():
|
||||
|
||||
@mock_lambda
|
||||
def test_delete_unknown_function():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
conn.delete_function.when.called_with(
|
||||
FunctionName="testFunctionThatDoesntExist"
|
||||
).should.throw(botocore.client.ClientError)
|
||||
@ -559,12 +574,15 @@ def test_delete_unknown_function():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_publish():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -609,12 +627,15 @@ def test_list_create_list_get_delete_list():
|
||||
test `list -> create -> list -> get -> delete -> list` integration
|
||||
|
||||
"""
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.list_functions()["Functions"].should.have.length_of(0)
|
||||
|
||||
@ -711,12 +732,15 @@ def test_tags():
|
||||
"""
|
||||
test list_tags -> tag_resource -> list_tags -> tag_resource -> list_tags -> untag_resource -> list_tags integration
|
||||
"""
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
function = conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -768,7 +792,7 @@ def test_tags_not_found():
|
||||
"""
|
||||
Test list_tags and tag_resource when the lambda with the given arn does not exist
|
||||
"""
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
conn.list_tags.when.called_with(
|
||||
Resource="arn:aws:lambda:{}:function:not-found".format(ACCOUNT_ID)
|
||||
).should.throw(botocore.client.ClientError)
|
||||
@ -786,7 +810,7 @@ def test_tags_not_found():
|
||||
|
||||
@mock_lambda
|
||||
def test_invoke_async_function():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
Runtime="python2.7",
|
||||
@ -809,7 +833,7 @@ def test_invoke_async_function():
|
||||
@mock_lambda
|
||||
@freeze_time("2015-01-01 00:00:00")
|
||||
def test_get_function_created_with_zipfile():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
zip_content = get_test_zip_file1()
|
||||
result = conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -855,7 +879,7 @@ def test_get_function_created_with_zipfile():
|
||||
|
||||
@mock_lambda
|
||||
def test_add_function_permission():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
zip_content = get_test_zip_file1()
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -886,7 +910,7 @@ def test_add_function_permission():
|
||||
|
||||
@mock_lambda
|
||||
def test_get_function_policy():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
zip_content = get_test_zip_file1()
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -921,12 +945,15 @@ def test_get_function_policy():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_list_versions_by_function():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -977,12 +1004,15 @@ def test_list_versions_by_function():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_create_function_with_already_exists():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -1014,7 +1044,7 @@ def test_create_function_with_already_exists():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_list_versions_by_function_for_nonexistent_function():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
versions = conn.list_versions_by_function(FunctionName="testFunction")
|
||||
|
||||
assert len(versions["Versions"]) == 0
|
||||
@ -1363,12 +1393,15 @@ def test_delete_event_source_mapping():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_update_configuration():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file2()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
fxn = conn.create_function(
|
||||
FunctionName="testFunction",
|
||||
@ -1411,7 +1444,7 @@ def test_update_configuration():
|
||||
|
||||
@mock_lambda
|
||||
def test_update_function_zip():
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
zip_content_one = get_test_zip_file1()
|
||||
|
||||
@ -1466,13 +1499,16 @@ def test_update_function_zip():
|
||||
@mock_lambda
|
||||
@mock_s3
|
||||
def test_update_function_s3():
|
||||
s3_conn = boto3.client("s3", "us-west-2")
|
||||
s3_conn.create_bucket(Bucket="test-bucket")
|
||||
s3_conn = boto3.client("s3", _lambda_region)
|
||||
s3_conn.create_bucket(
|
||||
Bucket="test-bucket",
|
||||
CreateBucketConfiguration={"LocationConstraint": _lambda_region},
|
||||
)
|
||||
|
||||
zip_content = get_test_zip_file1()
|
||||
s3_conn.put_object(Bucket="test-bucket", Key="test.zip", Body=zip_content)
|
||||
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
|
||||
fxn = conn.create_function(
|
||||
FunctionName="testFunctionS3",
|
||||
@ -1553,7 +1589,7 @@ def test_create_function_with_unknown_arn():
|
||||
|
||||
|
||||
def create_invalid_lambda(role):
|
||||
conn = boto3.client("lambda", "us-west-2")
|
||||
conn = boto3.client("lambda", _lambda_region)
|
||||
zip_content = get_test_zip_file1()
|
||||
with assert_raises(ClientError) as err:
|
||||
conn.create_function(
|
||||
@ -1572,7 +1608,7 @@ def create_invalid_lambda(role):
|
||||
|
||||
def get_role_name():
|
||||
with mock_iam():
|
||||
iam = boto3.client("iam", region_name="us-west-2")
|
||||
iam = boto3.client("iam", region_name=_lambda_region)
|
||||
try:
|
||||
return iam.get_role(RoleName="my-role")["Role"]["Arn"]
|
||||
except ClientError:
|
||||
|
||||
@ -143,7 +143,7 @@ def test_create_stack_with_notification_arn():
|
||||
@mock_s3_deprecated
|
||||
def test_create_stack_from_s3_url():
|
||||
s3_conn = boto.s3.connect_to_region("us-west-1")
|
||||
bucket = s3_conn.create_bucket("foobar")
|
||||
bucket = s3_conn.create_bucket("foobar", location="us-west-1")
|
||||
key = boto.s3.key.Key(bucket)
|
||||
key.key = "template-key"
|
||||
key.set_contents_from_string(dummy_template_json)
|
||||
|
||||
@ -21,7 +21,10 @@ def test_get_resources_s3():
|
||||
# Create 4 buckets
|
||||
for i in range(1, 5):
|
||||
i_str = str(i)
|
||||
s3_client.create_bucket(Bucket="test_bucket" + i_str)
|
||||
s3_client.create_bucket(
|
||||
Bucket="test_bucket" + i_str,
|
||||
CreateBucketConfiguration={"LocationConstraint": "eu-central-1"},
|
||||
)
|
||||
s3_client.put_bucket_tagging(
|
||||
Bucket="test_bucket" + i_str,
|
||||
Tagging={"TagSet": [{"Key": "key" + i_str, "Value": "value" + i_str}]},
|
||||
|
||||
@ -27,6 +27,7 @@ from parameterized import parameterized
|
||||
import six
|
||||
import requests
|
||||
import tests.backport_assert_raises # noqa
|
||||
from moto.s3.responses import DEFAULT_REGION_NAME
|
||||
from nose import SkipTest
|
||||
from nose.tools import assert_raises
|
||||
|
||||
@ -68,7 +69,7 @@ class MyModel(object):
|
||||
self.value = value
|
||||
|
||||
def save(self):
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.put_object(Bucket="mybucket", Key=self.name, Body=self.value)
|
||||
|
||||
|
||||
@ -119,7 +120,7 @@ def test_append_to_value__empty_key():
|
||||
@mock_s3
|
||||
def test_my_model_save():
|
||||
# Create Bucket so that test can run
|
||||
conn = boto3.resource("s3", region_name="us-east-1")
|
||||
conn = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
conn.create_bucket(Bucket="mybucket")
|
||||
####################################
|
||||
|
||||
@ -133,7 +134,7 @@ def test_my_model_save():
|
||||
|
||||
@mock_s3
|
||||
def test_key_etag():
|
||||
conn = boto3.resource("s3", region_name="us-east-1")
|
||||
conn = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
conn.create_bucket(Bucket="mybucket")
|
||||
|
||||
model_instance = MyModel("steve", "is awesome")
|
||||
@ -519,9 +520,9 @@ def test_bucket_with_dash():
|
||||
def test_create_existing_bucket():
|
||||
"Trying to create a bucket that already exists should raise an Error"
|
||||
conn = boto.s3.connect_to_region("us-west-2")
|
||||
conn.create_bucket("foobar")
|
||||
conn.create_bucket("foobar", location="us-west-2")
|
||||
with assert_raises(S3CreateError):
|
||||
conn.create_bucket("foobar")
|
||||
conn.create_bucket("foobar", location="us-west-2")
|
||||
|
||||
|
||||
@mock_s3_deprecated
|
||||
@ -535,7 +536,7 @@ def test_create_existing_bucket_in_us_east_1():
|
||||
us-east-1. In us-east-1 region, you will get 200 OK, but it is no-op (if
|
||||
bucket exists it Amazon S3 will not do anything).
|
||||
"""
|
||||
conn = boto.s3.connect_to_region("us-east-1")
|
||||
conn = boto.s3.connect_to_region(DEFAULT_REGION_NAME)
|
||||
conn.create_bucket("foobar")
|
||||
bucket = conn.create_bucket("foobar")
|
||||
bucket.name.should.equal("foobar")
|
||||
@ -544,7 +545,7 @@ def test_create_existing_bucket_in_us_east_1():
|
||||
@mock_s3_deprecated
|
||||
def test_other_region():
|
||||
conn = S3Connection("key", "secret", host="s3-website-ap-southeast-2.amazonaws.com")
|
||||
conn.create_bucket("foobar")
|
||||
conn.create_bucket("foobar", location="ap-southeast-2")
|
||||
list(conn.get_bucket("foobar").get_all_keys()).should.equal([])
|
||||
|
||||
|
||||
@ -995,7 +996,9 @@ def test_bucket_acl_switching():
|
||||
def test_s3_object_in_public_bucket():
|
||||
s3 = boto3.resource("s3")
|
||||
bucket = s3.Bucket("test-bucket")
|
||||
bucket.create(ACL="public-read")
|
||||
bucket.create(
|
||||
ACL="public-read", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
bucket.put_object(Body=b"ABCD", Key="file.txt")
|
||||
|
||||
s3_anonymous = boto3.resource("s3")
|
||||
@ -1026,7 +1029,9 @@ def test_s3_object_in_public_bucket():
|
||||
def test_s3_object_in_private_bucket():
|
||||
s3 = boto3.resource("s3")
|
||||
bucket = s3.Bucket("test-bucket")
|
||||
bucket.create(ACL="private")
|
||||
bucket.create(
|
||||
ACL="private", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
bucket.put_object(ACL="private", Body=b"ABCD", Key="file.txt")
|
||||
|
||||
s3_anonymous = boto3.resource("s3")
|
||||
@ -1086,19 +1091,51 @@ def test_setting_content_encoding():
|
||||
@mock_s3_deprecated
|
||||
def test_bucket_location():
|
||||
conn = boto.s3.connect_to_region("us-west-2")
|
||||
bucket = conn.create_bucket("mybucket")
|
||||
bucket = conn.create_bucket("mybucket", location="us-west-2")
|
||||
bucket.get_location().should.equal("us-west-2")
|
||||
|
||||
|
||||
@mock_s3
|
||||
def test_bucket_location_us_east_1():
|
||||
cli = boto3.client("s3")
|
||||
def test_bucket_location_default():
|
||||
cli = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
# No LocationConstraint ==> us-east-1
|
||||
cli.create_bucket(Bucket=bucket_name)
|
||||
cli.get_bucket_location(Bucket=bucket_name)["LocationConstraint"].should.equal(None)
|
||||
|
||||
|
||||
@mock_s3
|
||||
def test_bucket_location_nondefault():
|
||||
cli = boto3.client("s3", region_name="eu-central-1")
|
||||
bucket_name = "mybucket"
|
||||
# LocationConstraint set for non default regions
|
||||
resp = cli.create_bucket(
|
||||
Bucket=bucket_name,
|
||||
CreateBucketConfiguration={"LocationConstraint": "eu-central-1"},
|
||||
)
|
||||
cli.get_bucket_location(Bucket=bucket_name)["LocationConstraint"].should.equal(
|
||||
"eu-central-1"
|
||||
)
|
||||
|
||||
|
||||
# Test uses current Region to determine whether to throw an error
|
||||
# Region is retrieved based on current URL
|
||||
# URL will always be localhost in Server Mode, so can't run it there
|
||||
if not settings.TEST_SERVER_MODE:
|
||||
|
||||
@mock_s3
|
||||
def test_s3_location_should_error_outside_useast1():
|
||||
s3 = boto3.client("s3", region_name="eu-west-1")
|
||||
|
||||
bucket_name = "asdfasdfsdfdsfasda"
|
||||
|
||||
with assert_raises(ClientError) as e:
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
e.exception.response["Error"]["Message"].should.equal(
|
||||
"The unspecified location constraint is incompatible for the region specific endpoint this request was sent to."
|
||||
)
|
||||
|
||||
|
||||
@mock_s3_deprecated
|
||||
def test_ranged_get():
|
||||
conn = boto.connect_s3()
|
||||
@ -1222,7 +1259,7 @@ def test_key_with_trailing_slash_in_ordinary_calling_format():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_key_etag():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
s3.put_object(Bucket="mybucket", Key="steve", Body=b"is awesome")
|
||||
resp = s3.get_object(Bucket="mybucket", Key="steve")
|
||||
@ -1231,7 +1268,7 @@ def test_boto3_key_etag():
|
||||
|
||||
@mock_s3
|
||||
def test_website_redirect_location():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
|
||||
s3.put_object(Bucket="mybucket", Key="steve", Body=b"is awesome")
|
||||
@ -1248,7 +1285,7 @@ def test_website_redirect_location():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_objects_truncated_response():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
s3.put_object(Bucket="mybucket", Key="one", Body=b"1")
|
||||
s3.put_object(Bucket="mybucket", Key="two", Body=b"22")
|
||||
@ -1294,7 +1331,7 @@ def test_boto3_list_objects_truncated_response():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_keys_xml_escaped():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
key_name = "Q&A.txt"
|
||||
s3.put_object(Bucket="mybucket", Key=key_name, Body=b"is awesome")
|
||||
@ -1314,7 +1351,7 @@ def test_boto3_list_keys_xml_escaped():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_objects_v2_common_prefix_pagination():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
|
||||
max_keys = 1
|
||||
@ -1343,7 +1380,7 @@ def test_boto3_list_objects_v2_common_prefix_pagination():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_objects_v2_truncated_response():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
s3.put_object(Bucket="mybucket", Key="one", Body=b"1")
|
||||
s3.put_object(Bucket="mybucket", Key="two", Body=b"22")
|
||||
@ -1400,7 +1437,7 @@ def test_boto3_list_objects_v2_truncated_response():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_objects_v2_truncated_response_start_after():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
s3.put_object(Bucket="mybucket", Key="one", Body=b"1")
|
||||
s3.put_object(Bucket="mybucket", Key="two", Body=b"22")
|
||||
@ -1442,7 +1479,7 @@ def test_boto3_list_objects_v2_truncated_response_start_after():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_objects_v2_fetch_owner():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
s3.put_object(Bucket="mybucket", Key="one", Body=b"11")
|
||||
|
||||
@ -1456,7 +1493,7 @@ def test_boto3_list_objects_v2_fetch_owner():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_objects_v2_truncate_combined_keys_and_folders():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
s3.put_object(Bucket="mybucket", Key="1/2", Body="")
|
||||
s3.put_object(Bucket="mybucket", Key="2", Body="")
|
||||
@ -1486,7 +1523,7 @@ def test_boto3_list_objects_v2_truncate_combined_keys_and_folders():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_bucket_create():
|
||||
s3 = boto3.resource("s3", region_name="us-east-1")
|
||||
s3 = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="blah")
|
||||
|
||||
s3.Object("blah", "hello.txt").put(Body="some text")
|
||||
@ -1511,10 +1548,11 @@ def test_bucket_create_duplicate():
|
||||
|
||||
@mock_s3
|
||||
def test_bucket_create_force_us_east_1():
|
||||
s3 = boto3.resource("s3", region_name="us-east-1")
|
||||
s3 = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
with assert_raises(ClientError) as exc:
|
||||
s3.create_bucket(
|
||||
Bucket="blah", CreateBucketConfiguration={"LocationConstraint": "us-east-1"}
|
||||
Bucket="blah",
|
||||
CreateBucketConfiguration={"LocationConstraint": DEFAULT_REGION_NAME},
|
||||
)
|
||||
exc.exception.response["Error"]["Code"].should.equal("InvalidLocationConstraint")
|
||||
|
||||
@ -1522,7 +1560,9 @@ def test_bucket_create_force_us_east_1():
|
||||
@mock_s3
|
||||
def test_boto3_bucket_create_eu_central():
|
||||
s3 = boto3.resource("s3", region_name="eu-central-1")
|
||||
s3.create_bucket(Bucket="blah")
|
||||
s3.create_bucket(
|
||||
Bucket="blah", CreateBucketConfiguration={"LocationConstraint": "eu-central-1"}
|
||||
)
|
||||
|
||||
s3.Object("blah", "hello.txt").put(Body="some text")
|
||||
|
||||
@ -1533,7 +1573,7 @@ def test_boto3_bucket_create_eu_central():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_head_object():
|
||||
s3 = boto3.resource("s3", region_name="us-east-1")
|
||||
s3 = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="blah")
|
||||
|
||||
s3.Object("blah", "hello.txt").put(Body="some text")
|
||||
@ -1551,7 +1591,7 @@ def test_boto3_head_object():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_bucket_deletion():
|
||||
cli = boto3.client("s3", region_name="us-east-1")
|
||||
cli = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
cli.create_bucket(Bucket="foobar")
|
||||
|
||||
cli.put_object(Bucket="foobar", Key="the-key", Body="some value")
|
||||
@ -1582,7 +1622,7 @@ def test_boto3_bucket_deletion():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_get_object():
|
||||
s3 = boto3.resource("s3", region_name="us-east-1")
|
||||
s3 = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="blah")
|
||||
|
||||
s3.Object("blah", "hello.txt").put(Body="some text")
|
||||
@ -1599,7 +1639,7 @@ def test_boto3_get_object():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_get_missing_object_with_part_number():
|
||||
s3 = boto3.resource("s3", region_name="us-east-1")
|
||||
s3 = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="blah")
|
||||
|
||||
with assert_raises(ClientError) as e:
|
||||
@ -1612,7 +1652,7 @@ def test_boto3_get_missing_object_with_part_number():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_head_object_with_versioning():
|
||||
s3 = boto3.resource("s3", region_name="us-east-1")
|
||||
s3 = boto3.resource("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket = s3.create_bucket(Bucket="blah")
|
||||
bucket.Versioning().enable()
|
||||
|
||||
@ -1642,7 +1682,7 @@ def test_boto3_head_object_with_versioning():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_copy_object_with_versioning():
|
||||
client = boto3.client("s3", region_name="us-east-1")
|
||||
client = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
|
||||
client.create_bucket(
|
||||
Bucket="blah", CreateBucketConfiguration={"LocationConstraint": "eu-west-1"}
|
||||
@ -1706,7 +1746,7 @@ def test_boto3_copy_object_with_versioning():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_copy_object_from_unversioned_to_versioned_bucket():
|
||||
client = boto3.client("s3", region_name="us-east-1")
|
||||
client = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
|
||||
client.create_bucket(
|
||||
Bucket="src", CreateBucketConfiguration={"LocationConstraint": "eu-west-1"}
|
||||
@ -1730,7 +1770,7 @@ def test_boto3_copy_object_from_unversioned_to_versioned_bucket():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_deleted_versionings_list():
|
||||
client = boto3.client("s3", region_name="us-east-1")
|
||||
client = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
|
||||
client.create_bucket(Bucket="blah")
|
||||
client.put_bucket_versioning(
|
||||
@ -1747,7 +1787,7 @@ def test_boto3_deleted_versionings_list():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_delete_versioned_bucket():
|
||||
client = boto3.client("s3", region_name="us-east-1")
|
||||
client = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
|
||||
client.create_bucket(Bucket="blah")
|
||||
client.put_bucket_versioning(
|
||||
@ -1762,7 +1802,7 @@ def test_boto3_delete_versioned_bucket():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_get_object_if_modified_since():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "blah"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
|
||||
@ -1782,7 +1822,7 @@ def test_boto3_get_object_if_modified_since():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_head_object_if_modified_since():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "blah"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
|
||||
@ -1804,7 +1844,7 @@ def test_boto3_head_object_if_modified_since():
|
||||
@reduced_min_part_size
|
||||
def test_boto3_multipart_etag():
|
||||
# Create Bucket so that test can run
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
|
||||
upload_id = s3.create_multipart_upload(Bucket="mybucket", Key="the-key")["UploadId"]
|
||||
@ -1848,7 +1888,7 @@ def test_boto3_multipart_etag():
|
||||
@mock_s3
|
||||
@reduced_min_part_size
|
||||
def test_boto3_multipart_part_size():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="mybucket")
|
||||
|
||||
mpu = s3.create_multipart_upload(Bucket="mybucket", Key="the-key")
|
||||
@ -1883,7 +1923,7 @@ def test_boto3_multipart_part_size():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_object_with_tagging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-tags"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -1897,7 +1937,7 @@ def test_boto3_put_object_with_tagging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_bucket_tagging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
|
||||
@ -1944,7 +1984,7 @@ def test_boto3_put_bucket_tagging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_get_bucket_tagging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
s3.put_bucket_tagging(
|
||||
@ -1975,7 +2015,7 @@ def test_boto3_get_bucket_tagging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_delete_bucket_tagging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
|
||||
@ -2002,7 +2042,7 @@ def test_boto3_delete_bucket_tagging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_bucket_cors():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
|
||||
@ -2062,7 +2102,7 @@ def test_boto3_put_bucket_cors():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_get_bucket_cors():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
|
||||
@ -2103,7 +2143,7 @@ def test_boto3_get_bucket_cors():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_delete_bucket_cors():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
s3.put_bucket_cors(
|
||||
@ -2127,7 +2167,7 @@ def test_boto3_delete_bucket_cors():
|
||||
|
||||
@mock_s3
|
||||
def test_put_bucket_acl_body():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="bucket")
|
||||
bucket_owner = s3.get_bucket_acl(Bucket="bucket")["Owner"]
|
||||
s3.put_bucket_acl(
|
||||
@ -2225,7 +2265,7 @@ def test_put_bucket_acl_body():
|
||||
|
||||
@mock_s3
|
||||
def test_put_bucket_notification():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="bucket")
|
||||
|
||||
# With no configuration:
|
||||
@ -2421,7 +2461,7 @@ def test_put_bucket_notification():
|
||||
|
||||
@mock_s3
|
||||
def test_put_bucket_notification_errors():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket="bucket")
|
||||
|
||||
# With incorrect ARNs:
|
||||
@ -2488,7 +2528,7 @@ def test_put_bucket_notification_errors():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_bucket_logging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
log_bucket = "logbucket"
|
||||
wrong_region_bucket = "wrongregionlogbucket"
|
||||
@ -2667,7 +2707,7 @@ def test_boto3_put_bucket_logging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_object_tagging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-tags"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2711,7 +2751,7 @@ def test_boto3_put_object_tagging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_object_tagging_on_earliest_version():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-tags"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2778,7 +2818,7 @@ def test_boto3_put_object_tagging_on_earliest_version():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_object_tagging_on_both_version():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-tags"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2858,7 +2898,7 @@ def test_boto3_put_object_tagging_on_both_version():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_put_object_tagging_with_single_tag():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-tags"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2876,7 +2916,7 @@ def test_boto3_put_object_tagging_with_single_tag():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_get_object_tagging():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-tags"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2905,7 +2945,7 @@ def test_boto3_get_object_tagging():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_object_versions():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-versions"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2927,7 +2967,7 @@ def test_boto3_list_object_versions():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_object_versions_with_versioning_disabled():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-versions"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2950,7 +2990,7 @@ def test_boto3_list_object_versions_with_versioning_disabled():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_list_object_versions_with_versioning_enabled_late():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-versions"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -2978,7 +3018,7 @@ def test_boto3_list_object_versions_with_versioning_enabled_late():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_bad_prefix_list_object_versions():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-versions"
|
||||
bad_prefix = "key-that-does-not-exist"
|
||||
@ -2997,7 +3037,7 @@ def test_boto3_bad_prefix_list_object_versions():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_delete_markers():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-versions-and-unicode-ó"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -3040,7 +3080,7 @@ def test_boto3_delete_markers():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_multiple_delete_markers():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
key = "key-with-versions-and-unicode-ó"
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
@ -3091,7 +3131,7 @@ def test_boto3_multiple_delete_markers():
|
||||
def test_get_stream_gzipped():
|
||||
payload = b"this is some stuff here"
|
||||
|
||||
s3_client = boto3.client("s3", region_name="us-east-1")
|
||||
s3_client = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3_client.create_bucket(Bucket="moto-tests")
|
||||
buffer_ = BytesIO()
|
||||
with GzipFile(fileobj=buffer_, mode="w") as f:
|
||||
@ -3129,7 +3169,7 @@ TEST_XML = """\
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_bucket_name_too_long():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
with assert_raises(ClientError) as exc:
|
||||
s3.create_bucket(Bucket="x" * 64)
|
||||
exc.exception.response["Error"]["Code"].should.equal("InvalidBucketName")
|
||||
@ -3137,7 +3177,7 @@ def test_boto3_bucket_name_too_long():
|
||||
|
||||
@mock_s3
|
||||
def test_boto3_bucket_name_too_short():
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
with assert_raises(ClientError) as exc:
|
||||
s3.create_bucket(Bucket="x" * 2)
|
||||
exc.exception.response["Error"]["Code"].should.equal("InvalidBucketName")
|
||||
@ -3146,7 +3186,7 @@ def test_boto3_bucket_name_too_short():
|
||||
@mock_s3
|
||||
def test_accelerated_none_when_unspecified():
|
||||
bucket_name = "some_bucket"
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
resp = s3.get_bucket_accelerate_configuration(Bucket=bucket_name)
|
||||
resp.shouldnt.have.key("Status")
|
||||
@ -3155,7 +3195,7 @@ def test_accelerated_none_when_unspecified():
|
||||
@mock_s3
|
||||
def test_can_enable_bucket_acceleration():
|
||||
bucket_name = "some_bucket"
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
resp = s3.put_bucket_accelerate_configuration(
|
||||
Bucket=bucket_name, AccelerateConfiguration={"Status": "Enabled"}
|
||||
@ -3171,7 +3211,7 @@ def test_can_enable_bucket_acceleration():
|
||||
@mock_s3
|
||||
def test_can_suspend_bucket_acceleration():
|
||||
bucket_name = "some_bucket"
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
resp = s3.put_bucket_accelerate_configuration(
|
||||
Bucket=bucket_name, AccelerateConfiguration={"Status": "Enabled"}
|
||||
@ -3191,7 +3231,10 @@ def test_can_suspend_bucket_acceleration():
|
||||
def test_suspending_acceleration_on_not_configured_bucket_does_nothing():
|
||||
bucket_name = "some_bucket"
|
||||
s3 = boto3.client("s3")
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
s3.create_bucket(
|
||||
Bucket=bucket_name,
|
||||
CreateBucketConfiguration={"LocationConstraint": "us-west-1"},
|
||||
)
|
||||
resp = s3.put_bucket_accelerate_configuration(
|
||||
Bucket=bucket_name, AccelerateConfiguration={"Status": "Suspended"}
|
||||
)
|
||||
@ -3205,7 +3248,7 @@ def test_suspending_acceleration_on_not_configured_bucket_does_nothing():
|
||||
@mock_s3
|
||||
def test_accelerate_configuration_status_validation():
|
||||
bucket_name = "some_bucket"
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
with assert_raises(ClientError) as exc:
|
||||
s3.put_bucket_accelerate_configuration(
|
||||
@ -3217,7 +3260,7 @@ def test_accelerate_configuration_status_validation():
|
||||
@mock_s3
|
||||
def test_accelerate_configuration_is_not_supported_when_bucket_name_has_dots():
|
||||
bucket_name = "some.bucket.with.dots"
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
s3.create_bucket(Bucket=bucket_name)
|
||||
with assert_raises(ClientError) as exc:
|
||||
s3.put_bucket_accelerate_configuration(
|
||||
@ -3227,7 +3270,7 @@ def test_accelerate_configuration_is_not_supported_when_bucket_name_has_dots():
|
||||
|
||||
|
||||
def store_and_read_back_a_key(key):
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
body = b"Some body"
|
||||
|
||||
@ -3255,7 +3298,7 @@ def test_root_dir_with_empty_name_works():
|
||||
)
|
||||
@mock_s3
|
||||
def test_delete_objects_with_url_encoded_key(key):
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3 = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
bucket_name = "mybucket"
|
||||
body = b"Some body"
|
||||
|
||||
@ -3282,7 +3325,7 @@ def test_delete_objects_with_url_encoded_key(key):
|
||||
@mock_s3
|
||||
@mock_config
|
||||
def test_public_access_block():
|
||||
client = boto3.client("s3")
|
||||
client = boto3.client("s3", region_name=DEFAULT_REGION_NAME)
|
||||
client.create_bucket(Bucket="mybucket")
|
||||
|
||||
# Try to get the public access block (should not exist by default)
|
||||
@ -3349,7 +3392,7 @@ def test_public_access_block():
|
||||
assert ce.exception.response["ResponseMetadata"]["HTTPStatusCode"] == 400
|
||||
|
||||
# Test that things work with AWS Config:
|
||||
config_client = boto3.client("config", region_name="us-east-1")
|
||||
config_client = boto3.client("config", region_name=DEFAULT_REGION_NAME)
|
||||
result = config_client.get_resource_config_history(
|
||||
resourceType="AWS::S3::Bucket", resourceId="mybucket"
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@ from moto import mock_s3_deprecated, mock_s3
|
||||
@mock_s3_deprecated
|
||||
def test_lifecycle_create():
|
||||
conn = boto.s3.connect_to_region("us-west-1")
|
||||
bucket = conn.create_bucket("foobar")
|
||||
bucket = conn.create_bucket("foobar", location="us-west-1")
|
||||
|
||||
lifecycle = Lifecycle()
|
||||
lifecycle.add_rule("myid", "", "Enabled", 30)
|
||||
@ -33,7 +33,9 @@ def test_lifecycle_create():
|
||||
@mock_s3
|
||||
def test_lifecycle_with_filters():
|
||||
client = boto3.client("s3")
|
||||
client.create_bucket(Bucket="bucket")
|
||||
client.create_bucket(
|
||||
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
# Create a lifecycle rule with a Filter (no tags):
|
||||
lfc = {
|
||||
@ -245,7 +247,9 @@ def test_lifecycle_with_filters():
|
||||
@mock_s3
|
||||
def test_lifecycle_with_eodm():
|
||||
client = boto3.client("s3")
|
||||
client.create_bucket(Bucket="bucket")
|
||||
client.create_bucket(
|
||||
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
lfc = {
|
||||
"Rules": [
|
||||
@ -293,7 +297,9 @@ def test_lifecycle_with_eodm():
|
||||
@mock_s3
|
||||
def test_lifecycle_with_nve():
|
||||
client = boto3.client("s3")
|
||||
client.create_bucket(Bucket="bucket")
|
||||
client.create_bucket(
|
||||
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
lfc = {
|
||||
"Rules": [
|
||||
@ -327,7 +333,9 @@ def test_lifecycle_with_nve():
|
||||
@mock_s3
|
||||
def test_lifecycle_with_nvt():
|
||||
client = boto3.client("s3")
|
||||
client.create_bucket(Bucket="bucket")
|
||||
client.create_bucket(
|
||||
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
lfc = {
|
||||
"Rules": [
|
||||
@ -393,7 +401,9 @@ def test_lifecycle_with_nvt():
|
||||
@mock_s3
|
||||
def test_lifecycle_with_aimu():
|
||||
client = boto3.client("s3")
|
||||
client.create_bucket(Bucket="bucket")
|
||||
client.create_bucket(
|
||||
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
lfc = {
|
||||
"Rules": [
|
||||
@ -432,7 +442,7 @@ def test_lifecycle_with_aimu():
|
||||
@mock_s3_deprecated
|
||||
def test_lifecycle_with_glacier_transition():
|
||||
conn = boto.s3.connect_to_region("us-west-1")
|
||||
bucket = conn.create_bucket("foobar")
|
||||
bucket = conn.create_bucket("foobar", location="us-west-1")
|
||||
|
||||
lifecycle = Lifecycle()
|
||||
transition = Transition(days=30, storage_class="GLACIER")
|
||||
@ -451,7 +461,7 @@ def test_lifecycle_with_glacier_transition():
|
||||
@mock_s3_deprecated
|
||||
def test_lifecycle_multi():
|
||||
conn = boto.s3.connect_to_region("us-west-1")
|
||||
bucket = conn.create_bucket("foobar")
|
||||
bucket = conn.create_bucket("foobar", location="us-west-1")
|
||||
|
||||
date = "2022-10-12T00:00:00.000Z"
|
||||
sc = "GLACIER"
|
||||
@ -493,7 +503,7 @@ def test_lifecycle_multi():
|
||||
@mock_s3_deprecated
|
||||
def test_lifecycle_delete():
|
||||
conn = boto.s3.connect_to_region("us-west-1")
|
||||
bucket = conn.create_bucket("foobar")
|
||||
bucket = conn.create_bucket("foobar", location="us-west-1")
|
||||
|
||||
lifecycle = Lifecycle()
|
||||
lifecycle.add_rule(expiration=30)
|
||||
|
||||
@ -11,7 +11,7 @@ from moto import mock_s3
|
||||
|
||||
@mock_s3
|
||||
def test_s3_storage_class_standard():
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
|
||||
# add an object to the bucket with standard storage
|
||||
@ -26,7 +26,9 @@ def test_s3_storage_class_standard():
|
||||
@mock_s3
|
||||
def test_s3_storage_class_infrequent_access():
|
||||
s3 = boto3.client("s3")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.create_bucket(
|
||||
Bucket="Bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-2"}
|
||||
)
|
||||
|
||||
# add an object to the bucket with standard storage
|
||||
|
||||
@ -46,7 +48,9 @@ def test_s3_storage_class_infrequent_access():
|
||||
def test_s3_storage_class_intelligent_tiering():
|
||||
s3 = boto3.client("s3")
|
||||
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.create_bucket(
|
||||
Bucket="Bucket", CreateBucketConfiguration={"LocationConstraint": "us-east-2"}
|
||||
)
|
||||
s3.put_object(
|
||||
Bucket="Bucket",
|
||||
Key="my_key_infrequent",
|
||||
@ -61,7 +65,7 @@ def test_s3_storage_class_intelligent_tiering():
|
||||
|
||||
@mock_s3
|
||||
def test_s3_storage_class_copy():
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.put_object(
|
||||
Bucket="Bucket", Key="First_Object", Body="Body", StorageClass="STANDARD"
|
||||
@ -86,7 +90,7 @@ def test_s3_storage_class_copy():
|
||||
|
||||
@mock_s3
|
||||
def test_s3_invalid_copied_storage_class():
|
||||
s3 = boto3.client("s3")
|
||||
s3 = boto3.client("s3", region_name="us-east-1")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.put_object(
|
||||
Bucket="Bucket", Key="First_Object", Body="Body", StorageClass="STANDARD"
|
||||
@ -119,7 +123,9 @@ def test_s3_invalid_copied_storage_class():
|
||||
@mock_s3
|
||||
def test_s3_invalid_storage_class():
|
||||
s3 = boto3.client("s3")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.create_bucket(
|
||||
Bucket="Bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
# Try to add an object with an invalid storage class
|
||||
with assert_raises(ClientError) as err:
|
||||
@ -137,7 +143,9 @@ def test_s3_invalid_storage_class():
|
||||
@mock_s3
|
||||
def test_s3_default_storage_class():
|
||||
s3 = boto3.client("s3")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.create_bucket(
|
||||
Bucket="Bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
s3.put_object(Bucket="Bucket", Key="First_Object", Body="Body")
|
||||
|
||||
@ -150,7 +158,9 @@ def test_s3_default_storage_class():
|
||||
@mock_s3
|
||||
def test_s3_copy_object_error_for_glacier_storage_class():
|
||||
s3 = boto3.client("s3")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.create_bucket(
|
||||
Bucket="Bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
s3.put_object(
|
||||
Bucket="Bucket", Key="First_Object", Body="Body", StorageClass="GLACIER"
|
||||
@ -169,7 +179,9 @@ def test_s3_copy_object_error_for_glacier_storage_class():
|
||||
@mock_s3
|
||||
def test_s3_copy_object_error_for_deep_archive_storage_class():
|
||||
s3 = boto3.client("s3")
|
||||
s3.create_bucket(Bucket="Bucket")
|
||||
s3.create_bucket(
|
||||
Bucket="Bucket", CreateBucketConfiguration={"LocationConstraint": "us-west-1"}
|
||||
)
|
||||
|
||||
s3.put_object(
|
||||
Bucket="Bucket", Key="First_Object", Body="Body", StorageClass="DEEP_ARCHIVE"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user