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

Merge pull request #2651 from whummer/fix-s3-prefix

Browse Source 
Avoid rendering "None" as S3 Prefix value
This commit is contained in:
Mike Grima 2019-12-27 08:56:06 -08:00 committed by GitHub
commit 79aaad1068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/s3/responses.py
View File

@ -1491,7 +1491,9 @@ S3_ALL_BUCKETS = """<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2
S3_BUCKET_GET_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?> S3_BUCKET_GET_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Name>{{ bucket.name }}</Name> <Name>{{ bucket.name }}</Name>
{% if prefix != None %}
<Prefix>{{ prefix }}</Prefix> <Prefix>{{ prefix }}</Prefix>
{% endif %}
<MaxKeys>{{ max_keys }}</MaxKeys> <MaxKeys>{{ max_keys }}</MaxKeys>
<Delimiter>{{ delimiter }}</Delimiter> <Delimiter>{{ delimiter }}</Delimiter>
<IsTruncated>{{ is_truncated }}</IsTruncated> <IsTruncated>{{ is_truncated }}</IsTruncated>
@ -1523,7 +1525,9 @@ S3_BUCKET_GET_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
S3_BUCKET_GET_RESPONSE_V2 = """<?xml version="1.0" encoding="UTF-8"?> S3_BUCKET_GET_RESPONSE_V2 = """<?xml version="1.0" encoding="UTF-8"?>
<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Name>{{ bucket.name }}</Name> <Name>{{ bucket.name }}</Name>
{% if prefix != None %}
<Prefix>{{ prefix }}</Prefix> <Prefix>{{ prefix }}</Prefix>
{% endif %}
<MaxKeys>{{ max_keys }}</MaxKeys> <MaxKeys>{{ max_keys }}</MaxKeys>
<KeyCount>{{ key_count }}</KeyCount> <KeyCount>{{ key_count }}</KeyCount>
{% if delimiter %} {% if delimiter %}
@ -1684,7 +1688,9 @@ S3_BUCKET_GET_VERSIONING = """<?xml version="1.0" encoding="UTF-8"?>
S3_BUCKET_GET_VERSIONS = """<?xml version="1.0" encoding="UTF-8"?> S3_BUCKET_GET_VERSIONS = """<?xml version="1.0" encoding="UTF-8"?>
<ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01"> <ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01">
<Name>{{ bucket.name }}</Name> <Name>{{ bucket.name }}</Name>
{% if prefix != None %}
<Prefix>{{ prefix }}</Prefix> <Prefix>{{ prefix }}</Prefix>
{% endif %}
<KeyMarker>{{ key_marker }}</KeyMarker> <KeyMarker>{{ key_marker }}</KeyMarker>
<MaxKeys>{{ max_keys }}</MaxKeys> <MaxKeys>{{ max_keys }}</MaxKeys>
<IsTruncated>{{ is_truncated }}</IsTruncated> <IsTruncated>{{ is_truncated }}</IsTruncated>

6
tests/test_s3/test_s3.py
View File

@ -1261,7 +1261,7 @@ def test_boto3_list_objects_truncated_response():
assert listed_object["Key"] == "one" assert listed_object["Key"] == "one"
assert resp["MaxKeys"] == 1 assert resp["MaxKeys"] == 1
assert resp["IsTruncated"] == True assert resp["IsTruncated"] == True
assert resp["Prefix"] == "None" assert resp.get("Prefix") is None
assert resp["Delimiter"] == "None" assert resp["Delimiter"] == "None"
assert "NextMarker" in resp assert "NextMarker" in resp
@ -1274,7 +1274,7 @@ def test_boto3_list_objects_truncated_response():
assert listed_object["Key"] == "three" assert listed_object["Key"] == "three"
assert resp["MaxKeys"] == 1 assert resp["MaxKeys"] == 1
assert resp["IsTruncated"] == True assert resp["IsTruncated"] == True
assert resp["Prefix"] == "None" assert resp.get("Prefix") is None
assert resp["Delimiter"] == "None" assert resp["Delimiter"] == "None"
assert "NextMarker" in resp assert "NextMarker" in resp
@ -1287,7 +1287,7 @@ def test_boto3_list_objects_truncated_response():
assert listed_object["Key"] == "two" assert listed_object["Key"] == "two"
assert resp["MaxKeys"] == 1 assert resp["MaxKeys"] == 1
assert resp["IsTruncated"] == False assert resp["IsTruncated"] == False
assert resp["Prefix"] == "None" assert resp.get("Prefix") is None
assert resp["Delimiter"] == "None" assert resp["Delimiter"] == "None"
assert "NextMarker" not in resp assert "NextMarker" not in resp