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

S3:list_object_versions(): Fix delimiter to take prefix into account (#5562)

Browse Source
This commit is contained in:
Bert Blommers 2022-10-14 13:49:33 +00:00 committed by GitHub
parent 121e3eadb8
commit 5f7f3e6e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/s3/models.py
View File

@ -1631,10 +1631,12 @@ class S3Backend(BaseBackend, CloudWatchMetricProvider):
# Filter for keys that start with prefix # Filter for keys that start with prefix
if not name.startswith(prefix): if not name.startswith(prefix):
continue continue
# separate out all keys that contain delimiter # separate keys that contain the same string between the prefix and the first occurrence of the delimiter
if delimiter and delimiter in name: if delimiter and delimiter in name[len(prefix) :]:
index = name.index(delimiter) + len(delimiter) end_of_delimiter = (
prefix_including_delimiter = name[0:index] len(prefix) + name[len(prefix) :].index(delimiter) + len(delimiter)
)
prefix_including_delimiter = name[0:end_of_delimiter]
common_prefixes.append(prefix_including_delimiter) common_prefixes.append(prefix_including_delimiter)
continue continue

14
tests/test_s3/test_s3.py
View File

@ -2463,6 +2463,20 @@ def test_list_object_versions_with_delimiter():
{"key11-without-data", "key12-without-data", "key13-without-data"} {"key11-without-data", "key12-without-data", "key13-without-data"}
) )
# Delimiter with Prefix being the entire key
response = s3.list_object_versions(
Bucket=bucket_name, Prefix="key1-with-data", Delimiter="-"
)
response.should.have.key("Versions").length_of(3)
response.shouldnt.have.key("CommonPrefixes")
# Delimiter without prefix
response = s3.list_object_versions(Bucket=bucket_name, Delimiter="-with-")
response["CommonPrefixes"].should.have.length_of(8)
response["CommonPrefixes"].should.contain({"Prefix": "key1-with-"})
# Should return all keys -without-data
response.should.have.key("Versions").length_of(24)
@mock_s3 @mock_s3
def test_list_object_versions_with_delimiter_for_deleted_objects(): def test_list_object_versions_with_delimiter_for_deleted_objects():