diff --git a/go.mod b/go.mod index 2f3da95a9..eae7cef35 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go v46.1.0+incompatible github.com/Azure/go-autorest/autorest v0.11.6 // indirect github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect - github.com/cenkalti/backoff v2.2.1+incompatible + github.com/cenkalti/backoff/v4 v4.0.2 github.com/cespare/xxhash/v2 v2.1.1 github.com/dchest/siphash v1.2.2 github.com/dnaeon/go-vcr v1.0.1 // indirect diff --git a/go.sum b/go.sum index 886cf7be8..48d05947e 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs= +github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= diff --git a/internal/backend/backend_retry.go b/internal/backend/backend_retry.go index 372d0a98f..d47be2396 100644 --- a/internal/backend/backend_retry.go +++ b/internal/backend/backend_retry.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/cenkalti/backoff" + "github.com/cenkalti/backoff/v4" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/restic" ) diff --git a/internal/backend/backend_retry_test.go b/internal/backend/backend_retry_test.go index db8fbbcf5..1cc18df1f 100644 --- a/internal/backend/backend_retry_test.go +++ b/internal/backend/backend_retry_test.go @@ -33,9 +33,7 @@ func TestBackendSaveRetry(t *testing.T) { }, } - retryBackend := RetryBackend{ - Backend: be, - } + retryBackend := NewRetryBackend(be, 10, nil) data := test.Random(23, 5*1024*1024+11241) err := retryBackend.Save(context.TODO(), restic.Handle{}, restic.NewByteReader(data)) @@ -73,9 +71,7 @@ func TestBackendListRetry(t *testing.T) { }, } - retryBackend := RetryBackend{ - Backend: be, - } + retryBackend := NewRetryBackend(be, 10, nil) var listed []string err := retryBackend.List(context.TODO(), restic.PackFile, func(fi restic.FileInfo) error { @@ -104,9 +100,7 @@ func TestBackendListRetryErrorFn(t *testing.T) { }, } - retryBackend := RetryBackend{ - Backend: be, - } + retryBackend := NewRetryBackend(be, 10, nil) var ErrTest = errors.New("test error") @@ -162,10 +156,7 @@ func TestBackendListRetryErrorBackend(t *testing.T) { } const maxRetries = 2 - retryBackend := RetryBackend{ - MaxTries: maxRetries, - Backend: be, - } + retryBackend := NewRetryBackend(be, maxRetries, nil) var listed []string err := retryBackend.List(context.TODO(), restic.PackFile, func(fi restic.FileInfo) error { @@ -234,9 +225,7 @@ func TestBackendLoadRetry(t *testing.T) { return failingReader{data: data, limit: limit}, nil } - retryBackend := RetryBackend{ - Backend: be, - } + retryBackend := NewRetryBackend(be, 10, nil) var buf []byte err := retryBackend.Load(context.TODO(), restic.Handle{}, 0, 0, func(rd io.Reader) (err error) {