gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve explicit directory markers with octet-stream MIME (#8726)

Browse Source 
* Preserve octet-stream MIME on explicit directory markers

* Run empty directory marker regression in CI

* Run S3 Spark workflow for filer changes
This commit is contained in:
Chris Lu
2026-03-21 19:31:56 -07:00
committed by GitHub
parent 7f0cf72574
commit d6a872c4b9
5 changed files with 127 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/s3/normal/s3_list_empty_directory_test.go
View File

@@ -221,6 +221,42 @@ func TestS3ListObjectsEmptyDirectoryMarkers(t *testing.T) {
assert.Equal(t, []string{"docs/", "docs/readme.txt", "readme.txt"}, allKeys,
"paginated listing should return all keys including marker and its child")
})
t.Run("ListExplicitDirectoryMarkerWithOctetStreamContentType", func(t *testing.T) {
bucketWithContentType := createTestBucket(t, cluster, "test-explicit-dir-")
objectKey := "test-content/empty/"
_, err := cluster.s3Client.PutObject(&s3.PutObjectInput{
Bucket: aws.String(bucketWithContentType),
Key: aws.String(objectKey),
Body: bytes.NewReader([]byte{}),
ContentType: aws.String("application/octet-stream"),
})
require.NoError(t, err, "failed to create explicit directory marker with octet-stream content type")
headResp, err := cluster.s3Client.HeadObject(&s3.HeadObjectInput{
Bucket: aws.String(bucketWithContentType),
Key: aws.String(objectKey),
})
require.NoError(t, err, "directory marker should exist via HeadObject")
assert.Equal(t, "application/octet-stream", aws.StringValue(headResp.ContentType))
respV1, err := cluster.s3Client.ListObjects(&s3.ListObjectsInput{
Bucket: aws.String(bucketWithContentType),
Prefix: aws.String("test-content"),
})
require.NoError(t, err)
assert.Equal(t, []string{objectKey}, collectKeysV1(respV1.Contents),
"explicit empty directory markers with octet-stream content type should be listed")
respV2, err := cluster.s3Client.ListObjectsV2(&s3.ListObjectsV2Input{
Bucket: aws.String(bucketWithContentType),
Prefix: aws.String("test-content"),
})
require.NoError(t, err)
assert.Equal(t, []string{objectKey}, collectKeys(respV2.Contents),
"explicit empty directory markers with octet-stream content type should be listed")
})
}
func collectKeys(contents []*s3.Object) []string {