Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

s3: fix rmdir of the root directory with --s3-directory-markers

Nick Craig-Wood98a8e793bd3f
diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index 4bd0a6fa4..26b7bf963 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -2978,8 +2978,9 @@ func (f *Fs) makeBucket(ctx context.Context, bucket string) error {
// Returns an error if it isn't empty
func (f *Fs) Rmdir(ctx context.Context, dir string) error {
bucket, directory := f.split(dir)
- // Remove directory marker file
- if f.opt.DirectoryMarkers && bucket != "" && dir != "" {
+ // Remove directory marker file, including the one of the root
+ // when it is a directory in the bucket
+ if f.opt.DirectoryMarkers && bucket != "" && directory != "" {
o := &Object{
fs: f,
remote: dir + "/",
diff --git a/backend/s3/s3_internal_test.go b/backend/s3/s3_internal_test.go
index 4b5b93e89..991e485c5 100644
--- a/backend/s3/s3_internal_test.go
+++ b/backend/s3/s3_internal_test.go
@@ -12,6 +12,7 @@ import (
"net/http"
"net/http/httptest"
"path"
+ "slices"
"strings"
"testing"
"time"
@@ -891,6 +892,31 @@ func (f *Fs) InternalTestObjectLock(t *testing.T) {
})
}
+// InternalTestRmdirRoot checks the directory marker of the root of a
+// remote is removed by Rmdir.
+func (f *Fs) InternalTestRmdirRoot(t *testing.T) {
+ if !f.opt.DirectoryMarkers {
+ t.Skip("needs --s3-directory-markers")
+ }
+ ctx := context.Background()
+ dir := "rmdir-root-" + random.String(8)
+ hasDir := func() bool {
+ entries, err := f.List(ctx, "")
+ require.NoError(t, err)
+ return slices.ContainsFunc(entries, func(entry fs.DirEntry) bool {
+ _, isDir := entry.(fs.Directory)
+ return isDir && entry.Remote() == dir
+ })
+ }
+
+ require.NoError(t, f.Mkdir(ctx, dir))
+ require.True(t, hasDir(), "directory marker not made")
+ fDir, err := cache.Get(ctx, bucket.Join(fs.ConfigStringFull(f), dir))
+ require.NoError(t, err)
+ require.NoError(t, fDir.Rmdir(ctx, ""))
+ assert.False(t, hasDir(), "directory marker not removed")
+}
+
func (f *Fs) InternalTest(t *testing.T) {
t.Run("Metadata", f.InternalTestMetadata)
t.Run("NoHead", f.InternalTestNoHead)
@@ -898,6 +924,7 @@ func (f *Fs) InternalTest(t *testing.T) {
t.Run("HasChildren", f.InternalTestHasChildren)
t.Run("Versions", f.InternalTestVersions)
t.Run("ObjectLock", f.InternalTestObjectLock)
+ t.Run("RmdirRoot", f.InternalTestRmdirRoot)
}
var _ fstests.InternalTester = (*Fs)(nil)