"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
bisync: reject --max-delete above 100
nielashbedfe4a48363
diff --git a/cmd/bisync/cmd.go b/cmd/bisync/cmd.goindex b39c2f454..a107f4d3b 100644--- a/cmd/bisync/cmd.go+++ b/cmd/bisync/cmd.go@@ -204,22 +204,23 @@ var commandDefinition = &cobra.Command{},}-func (opt *Options) applyContext(ctx context.Context) {+func (opt *Options) applyContext(ctx context.Context) error {maxDelete := DefaultMaxDeleteci := fs.GetConfig(ctx)+ if ci.MaxDelete > 100 {+ return fmt.Errorf("--max-delete is a percentage for bisync and must be from 0 to 100, not %d", ci.MaxDelete)+ }if ci.MaxDelete >= 0 {maxDelete = int(ci.MaxDelete)}if maxDelete < 0 {maxDelete = 0}- if maxDelete > 100 {- maxDelete = 100- }opt.MaxDelete = maxDelete// reset MaxDelete for fs/operations, bisync handles this parameter speciallyci.MaxDelete = -1opt.DryRun = ci.DryRun+ return nil}func (opt *Options) setDryRun(ctx context.Context) context.Context {diff --git a/cmd/bisync/operations.go b/cmd/bisync/operations.goindex 5d6379d3e..05b5d061e 100644--- a/cmd/bisync/operations.go+++ b/cmd/bisync/operations.go@@ -74,7 +74,9 @@ func Bisync(ctx context.Context, fs1, fs2 fs.Fs, optArg *Options) (err error) {opt := *optArg // ensure that input is never changed// applyContext changes the config, so give it a copyctx, _ = fs.AddConfig(ctx)- opt.applyContext(ctx)+ if err = opt.applyContext(ctx); err != nil {+ return err+ }b := &bisyncRun{fs1: fs1,fs2: fs2,diff --git a/cmd/bisync/rc_test.go b/cmd/bisync/rc_test.goindex 495b6605b..5431f27f3 100644--- a/cmd/bisync/rc_test.go+++ b/cmd/bisync/rc_test.go@@ -21,9 +21,8 @@ func newRcBisync(t *testing.T, n int) (path1, path2 string, run func(in rc.Param}// newRcBisyncCtx creates Path1 with n files, resyncs it to Path2, and returns-// the paths and a function which runs sync/bisync on them as an rc job. The-// jobs run in ctx, whose config stands in for the flags the rcd was started-// with.+// the paths and a function which runs sync/bisync on them as an rc job in+// ctx, whose config stands in for the flags the rcd was started withfunc newRcBisyncCtx(ctx context.Context, t *testing.T, n int) (path1, path2 string, run func(in rc.Params) error) {if *fstest.RemoteName != "" {t.Skip("Skipping test on non local remote")@@ -39,15 +38,15 @@ func newRcBisyncCtx(ctx context.Context, t *testing.T, n int) (path1, path2 stri}call := rc.Calls.Get("sync/bisync")require.NotNil(t, call)- run = func(in rc.Params) error {+ runIn := func(ctx context.Context, in rc.Params) error {in["path1"] = path1in["path2"] = path2in["workdir"] = workdir_, _, err := jobs.NewJob(ctx, call.Fn, in)return err}- require.NoError(t, run(rc.Params{"resync": true}))- return path1, path2, run+ require.NoError(t, runIn(context.Background(), rc.Params{"resync": true}))+ return path1, path2, func(in rc.Params) error { return runIn(ctx, in) }}func TestRcDryRun(t *testing.T) {@@ -80,20 +79,21 @@ func TestRcMaxDelete(t *testing.T) {for _, test := range []struct {name stringin rc.Params- wantErr bool+ wantErr string}{- {"default", rc.Params{}, false},- {"maxDelete", rc.Params{"maxDelete": 5}, true},- {"max_delete allows", rc.Params{"max_delete": 20}, false},- {"max_delete aborts", rc.Params{"max_delete": 5}, true},- {"_config MaxDelete aborts", rc.Params{"_config": rc.Params{"MaxDelete": 5}}, true},+ {"default", rc.Params{}, ""},+ {"maxDelete", rc.Params{"maxDelete": 5}, "too many deletes"},+ {"max_delete allows", rc.Params{"max_delete": 20}, ""},+ {"max_delete aborts", rc.Params{"max_delete": 5}, "too many deletes"},+ {"_config MaxDelete aborts", rc.Params{"_config": rc.Params{"MaxDelete": 5}}, "too many deletes"},+ {"max_delete over 100", rc.Params{"max_delete": 500}, "--max-delete"},} {t.Run(test.name, func(t *testing.T) {path1, path2, run := newRcBisync(t, 10)require.NoError(t, os.Remove(filepath.Join(path1, "file0.txt")))err := run(test.in)- if test.wantErr {- assert.ErrorContains(t, err, "too many deletes")+ if test.wantErr != "" {+ assert.ErrorContains(t, err, test.wantErr)assert.FileExists(t, filepath.Join(path2, "file0.txt"))} else {require.NoError(t, err)@@ -105,10 +105,20 @@ func TestRcMaxDelete(t *testing.T) {// Test a --max-delete the rcd was started with applies, as on the command linefunc TestRcMaxDeleteFromRcd(t *testing.T) {- ctx, ci := fs.AddConfig(context.Background())- ci.MaxDelete = 5- path1, path2, run := newRcBisyncCtx(ctx, t, 10)- require.NoError(t, os.Remove(filepath.Join(path1, "file0.txt")))- assert.ErrorContains(t, run(rc.Params{}), "too many deletes")- assert.FileExists(t, filepath.Join(path2, "file0.txt"))+ for _, test := range []struct {+ maxDelete int64+ wantErr string+ }{+ {5, "too many deletes"},+ {500, "--max-delete"},+ } {+ t.Run(fmt.Sprint(test.maxDelete), func(t *testing.T) {+ ctx, ci := fs.AddConfig(context.Background())+ ci.MaxDelete = test.maxDelete+ path1, path2, run := newRcBisyncCtx(ctx, t, 10)+ require.NoError(t, os.Remove(filepath.Join(path1, "file0.txt")))+ assert.ErrorContains(t, run(rc.Params{}), test.wantErr)+ assert.FileExists(t, filepath.Join(path2, "file0.txt"))+ })+ }}diff --git a/docs/content/bisync.md b/docs/content/bisync.mdindex 09aca5c40..85d0f833b 100644--- a/docs/content/bisync.md+++ b/docs/content/bisync.md@@ -1951,6 +1951,7 @@ modtime was less than a second earlier than the one in the listing.`_config` or the flat `dry_run` option.- Fixed an issue causing the rc `sync/bisync` call to ignore the global`--max-delete` and use a limit of 0% when `maxDelete` was not set.+- `--max-delete` now enforces a maximum of 100.### `v1.74.2`