TrueCloudLab/restic
16
0
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade minio sdk to v7

Browse source 
This changes are primarily straightforward modifications to pass the
parameters in the now expected way.
This commit is contained in:
Michael Eischer 2020-09-19 21:57:02 +02:00
parent 5fd3dbccb7
commit 307a6ba3a3
6 changed files with 60 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/backend/s3/s3_test.go
View file

@ -107,7 +107,7 @@ type MinioTestConfig struct {
func createS3(t testing.TB, cfg MinioTestConfig, tr http.RoundTripper) (be restic.Backend, err error) {
for i := 0; i < 10; i++ {
be, err = s3.Create(cfg.Config, tr)
be, err = s3.Create(context.TODO(), cfg.Config, tr)
if err != nil {
t.Logf("s3 open: try %d: error %v", i, err)
time.Sleep(500 * time.Millisecond)
@ -154,7 +154,7 @@ func newMinioTestSuite(ctx context.Context, t testing.TB) *test.Suite {
return nil, err
}
exists, err := be.Test(context.TODO(), restic.Handle{Type: restic.ConfigFile})
exists, err := be.Test(ctx, restic.Handle{Type: restic.ConfigFile})
if err != nil {
return nil, err
}
@ -169,7 +169,7 @@ func newMinioTestSuite(ctx context.Context, t testing.TB) *test.Suite {
// OpenFn is a function that opens a previously created temporary repository.
Open: func(config interface{}) (restic.Backend, error) {
cfg := config.(MinioTestConfig)
return s3.Open(cfg.Config, tr)
return s3.Open(ctx, cfg.Config, tr)
},
// CleanupFn removes data created during the tests.
@ -248,7 +248,7 @@ func newS3TestSuite(t testing.TB) *test.Suite {
Create: func(config interface{}) (restic.Backend, error) {
cfg := config.(s3.Config)
be, err := s3.Create(cfg, tr)
be, err := s3.Create(context.TODO(), cfg, tr)
if err != nil {
return nil, err
}
@ -268,14 +268,14 @@ func newS3TestSuite(t testing.TB) *test.Suite {
// OpenFn is a function that opens a previously created temporary repository.
Open: func(config interface{}) (restic.Backend, error) {
cfg := config.(s3.Config)
return s3.Open(cfg, tr)
return s3.Open(context.TODO(), cfg, tr)
},
// CleanupFn removes data created during the tests.
Cleanup: func(config interface{}) error {
cfg := config.(s3.Config)
be, err := s3.Open(cfg, tr)
be, err := s3.Open(context.TODO(), cfg, tr)
if err != nil {
return err
}