Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 14:50:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

S3: fix empty directory detection

Browse Source 
when listing empty directory MinIO returns no contents while S3 returns
1 object with the key equal to the prefix. Make detection work in both
cases

Fixes #227
This commit is contained in:
Nicola Murino
2020-11-23 15:36:42 +01:00
parent dccc583b5d
commit 99cd1ccfe5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vfs/s3fs.go
View File

@@ -652,7 +652,7 @@ func (fs *S3Fs) hasContents(name string) (bool, error) {
prefix += "/" prefix += "/"
} }
} }
maxResults := int64(1) maxResults := int64(2)
ctx, cancelFn := context.WithDeadline(context.Background(), time.Now().Add(fs.ctxTimeout)) ctx, cancelFn := context.WithDeadline(context.Background(), time.Now().Add(fs.ctxTimeout))
defer cancelFn() defer cancelFn()
results, err := fs.svc.ListObjectsV2WithContext(ctx, &s3.ListObjectsV2Input{ results, err := fs.svc.ListObjectsV2WithContext(ctx, &s3.ListObjectsV2Input{
@@ -664,7 +664,16 @@ func (fs *S3Fs) hasContents(name string) (bool, error) {
if err != nil { if err != nil {
return false, err return false, err
} }
return len(results.Contents) > 0, nil // MinIO returns no contents while S3 returns 1 object
// with the key equal to the prefix for empty directories
for _, obj := range results.Contents {
name, _ := fs.resolve(obj.Key, prefix)
if name == "" || name == "/" {
continue
}
return true, nil
}
return false, nil
} }
func (fs *S3Fs) headObject(name string) (*s3.HeadObjectOutput, error) { func (fs *S3Fs) headObject(name string) (*s3.HeadObjectOutput, error) {