Skip to content

Commit 354b161

Browse files
mangalaman93mangalaman93
committed
fix minio v7 imports
1 parent 3d4d051 commit 354b161

File tree

13 files changed

+67
-91
lines changed

13 files changed

+67
-91
lines changed

‎filestore/remote_files.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package filestore
77

88
import (
99
"bufio"
10+
"context"
1011
"io"
1112
"net/url"
1213
"strings"
@@ -28,7 +29,7 @@ func (rf *remoteFiles) Open(path string) (io.ReadCloser, error) {
2829
}
2930

3031
bucket, prefix := rf.mc.ParseBucketAndPrefix(url.Path)
31-
obj, err := rf.mc.GetObject(bucket, prefix, minio.GetObjectOptions{})
32+
obj, err := rf.mc.GetObject(context.Background(), bucket, prefix, minio.GetObjectOptions{})
3233
if err != nil {
3334
return nil, err
3435
}
@@ -58,7 +59,9 @@ func (rf *remoteFiles) FindDataFiles(str string, ext []string) (paths []string)
5859
defer close(c)
5960

6061
bucket, prefix := rf.mc.ParseBucketAndPrefix(url.Path)
61-
for obj := range rf.mc.ListObjectsV2(bucket, prefix, true, c) {
62+
objs := rf.mc.ListObjects(context.Background(), bucket,
63+
minio.ListObjectsOptions{Prefix: prefix, Recursive: true})
64+
for obj := range objs {
6265
if hasAnySuffix(obj.Key, ext) {
6366
paths = append(paths, bucket+"/"+obj.Key)
6467
}
@@ -73,7 +76,7 @@ func (rf *remoteFiles) ChunkReader(file string, key x.Sensitive) (*bufio.Reader,
7376

7477
bucket, prefix := rf.mc.ParseBucketAndPrefix(url.Path)
7578

76-
obj, err := rf.mc.GetObject(bucket, prefix, minio.GetObjectOptions{})
79+
obj, err := rf.mc.GetObject(context.Background(), bucket, prefix, minio.GetObjectOptions{})
7780
x.Check(err)
7881

7982
return chunker.StreamReader(url.Path, key, obj)

‎go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ require (
3434
github.com/hashicorp/vault/api v1.20.0
3535
github.com/klauspost/compress v1.18.0
3636
github.com/mark3labs/mcp-go v0.31.0
37-
github.com/minio/minio-go/v6 v6.0.57
3837
github.com/minio/minio-go/v7 v7.0.92
3938
github.com/paulmach/go.geojson v1.5.0
4039
github.com/pkg/errors v0.9.1
@@ -132,7 +131,6 @@ require (
132131
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
133132
github.com/minio/crc64nvme v1.0.1 // indirect
134133
github.com/minio/md5-simd v1.1.2 // indirect
135-
github.com/minio/sha256-simd v1.0.1 // indirect
136134
github.com/mitchellh/go-homedir v1.1.0 // indirect
137135
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
138136
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -171,7 +169,6 @@ require (
171169
golang.org/x/time v0.11.0 // indirect
172170
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
173171
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
174-
gopkg.in/ini.v1 v1.67.0 // indirect
175172
gopkg.in/yaml.v2 v2.4.0 // indirect
176173
gotest.tools/v3 v3.5.2 // indirect
177174
)

‎go.sum‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj
156156
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
157157
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
158158
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
159-
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
160159
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
161160
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
162161
github.com/eapache/go-resiliency v1.7.0 h1:n3NRTnBn5N0Cbi/IeOHuQn9s2UwVUH7Ga0ZWcP+9JTA=
@@ -304,7 +303,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
304303
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
305304
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
306305
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
307-
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
308306
github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
309307
github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
310308
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -367,14 +365,12 @@ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJk
367365
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
368366
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
369367
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
370-
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
371368
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
372369
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
373370
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
374371
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
375372
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
376373
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
377-
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
378374
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
379375
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
380376
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@@ -384,7 +380,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
384380
github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
385381
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
386382
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
387-
github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
388383
github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
389384
github.com/klauspost/cpuid/v2 v2.0.3/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
390385
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
@@ -417,16 +412,10 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
417412
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
418413
github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY=
419414
github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
420-
github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
421415
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
422416
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
423-
github.com/minio/minio-go/v6 v6.0.57 h1:ixPkbKkyD7IhnluRgQpGSpHdpvNVaW6OD5R9IAO/9Tw=
424-
github.com/minio/minio-go/v6 v6.0.57/go.mod h1:5+R/nM9Pwrh0vqF+HbYYDQ84wdUFPyXHkrdT4AIkifM=
425417
github.com/minio/minio-go/v7 v7.0.92 h1:jpBFWyRS3p8P/9tsRc+NuvqoFi7qAmTCFPoRFmobbVw=
426418
github.com/minio/minio-go/v7 v7.0.92/go.mod h1:vTIc8DNcnAZIhyFsk8EB90AbPjj3j68aWIEQCiPj7d0=
427-
github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
428-
github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
429-
github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
430419
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
431420
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
432421
github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -536,12 +525,9 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
536525
github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
537526
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
538527
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
539-
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
540528
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
541529
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
542530
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
543-
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
544-
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
545531
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
546532
github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
547533
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -644,7 +630,6 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
644630
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
645631
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
646632
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
647-
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
648633
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
649634
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
650635
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -700,7 +685,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
700685
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
701686
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
702687
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
703-
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
704688
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
705689
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
706690
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -834,7 +818,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
834818
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
835819
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
836820
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
837-
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
838821
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
839822
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
840823
golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -979,9 +962,6 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
979962
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
980963
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
981964
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
982-
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
983-
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
984-
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
985965
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
986966
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
987967
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎systest/backup/encryption/backup_test.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020
"time"
2121

22-
minio "github.com/minio/minio-go/v6"
22+
minio "github.com/minio/minio-go/v7"
2323
"github.com/spf13/viper"
2424
"github.com/stretchr/testify/require"
2525

@@ -59,7 +59,7 @@ func TestBackupMinioE(t *testing.T) {
5959
require.NoError(t, err)
6060
mc, err = testutil.NewMinioClient()
6161
require.NoError(t, err)
62-
require.NoError(t, mc.MakeBucket(bucketName, ""))
62+
require.NoError(t, mc.MakeBucket(context.Background(), bucketName, minio.MakeBucketOptions{}))
6363

6464
ctx := context.Background()
6565
require.NoError(t, dg.Alter(ctx, &api.Operation{DropAll: true}))
@@ -371,10 +371,8 @@ func dirCleanup(t *testing.T) {
371371
}
372372

373373
func copyToLocalFs(t *testing.T) {
374-
// List all the folders in the bucket.
375-
lsCh1 := make(chan struct{})
376-
defer close(lsCh1)
377-
objectCh1 := mc.ListObjectsV2(bucketName, "", false, lsCh1)
374+
objectCh1 := mc.ListObjects(context.Background(), bucketName,
375+
minio.ListObjectsOptions{Prefix: "", Recursive: false})
378376
for object := range objectCh1 {
379377
require.NoError(t, object.Err)
380378
if object.Key != "manifest.json" {
@@ -383,13 +381,13 @@ func copyToLocalFs(t *testing.T) {
383381
}
384382

385383
// Get all the files in that folder and copy them to the local filesystem.
386-
lsCh2 := make(chan struct{})
387-
objectCh2 := mc.ListObjectsV2(bucketName, "", true, lsCh2)
384+
objectCh2 := mc.ListObjects(context.Background(), bucketName,
385+
minio.ListObjectsOptions{Prefix: "", Recursive: true})
388386
for object := range objectCh2 {
389387
require.NoError(t, object.Err)
390388
dstFile := backupDir + "/" + object.Key
391-
require.NoError(t, mc.FGetObject(bucketName, object.Key, dstFile, minio.GetObjectOptions{}))
389+
require.NoError(t, mc.FGetObject(context.Background(),
390+
bucketName, object.Key, dstFile, minio.GetObjectOptions{}))
392391
}
393-
close(lsCh2)
394392
}
395393
}

‎systest/backup/minio-large/backup_test.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"testing"
1919
"time"
2020

21-
minio "github.com/minio/minio-go/v6"
21+
minio "github.com/minio/minio-go/v7"
2222
"github.com/stretchr/testify/require"
2323
"google.golang.org/grpc"
2424
"google.golang.org/grpc/credentials"
@@ -56,7 +56,7 @@ func TestBackupMinioLarge(t *testing.T) {
5656

5757
mc, err = testutil.NewMinioClient()
5858
require.NoError(t, err)
59-
require.NoError(t, mc.MakeBucket(bucketName, ""))
59+
require.NoError(t, mc.MakeBucket(ctx, bucketName, minio.MakeBucketOptions{}))
6060

6161
// Setup the schema and make sure each group is assigned one predicate.
6262
setupTablets(t, dg)
@@ -220,10 +220,8 @@ func dirCleanup(t *testing.T) {
220220
}
221221

222222
func copyToLocalFs(t *testing.T) {
223-
// List all the folders in the bucket.
224-
lsCh1 := make(chan struct{})
225-
defer close(lsCh1)
226-
objectCh1 := mc.ListObjectsV2(bucketName, "", false, lsCh1)
223+
objectCh1 := mc.ListObjects(context.Background(), bucketName,
224+
minio.ListObjectsOptions{Prefix: "", Recursive: false})
227225
for object := range objectCh1 {
228226
require.NoError(t, object.Err)
229227
if object.Key != "manifest.json" {
@@ -232,14 +230,13 @@ func copyToLocalFs(t *testing.T) {
232230
}
233231

234232
// Get all the files in that folder and copy them to the local filesystem.
235-
lsCh2 := make(chan struct{})
236-
objectCh2 := mc.ListObjectsV2(bucketName, "", true, lsCh2)
233+
objectCh2 := mc.ListObjects(context.Background(), bucketName,
234+
minio.ListObjectsOptions{Prefix: "", Recursive: true})
237235
for object := range objectCh2 {
238236
require.NoError(t, object.Err)
239237
dstFile := backupDir + "/" + object.Key
240-
err := mc.FGetObject(bucketName, object.Key, dstFile, minio.GetObjectOptions{})
238+
err := mc.FGetObject(context.Background(), bucketName, object.Key, dstFile, minio.GetObjectOptions{})
241239
require.NoError(t, err)
242240
}
243-
close(lsCh2)
244241
}
245242
}

‎systest/backup/minio/backup_test.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020
"time"
2121

22-
minio "github.com/minio/minio-go/v6"
22+
minio "github.com/minio/minio-go/v7"
2323
"github.com/stretchr/testify/require"
2424
"google.golang.org/grpc"
2525
"google.golang.org/grpc/credentials"
@@ -56,7 +56,7 @@ func TestBackupMinio(t *testing.T) {
5656

5757
mc, err = testutil.NewMinioClient()
5858
require.NoError(t, err)
59-
require.NoError(t, mc.MakeBucket(bucketName, ""))
59+
require.NoError(t, mc.MakeBucket(context.Background(), bucketName, minio.MakeBucketOptions{}))
6060

6161
ctx := context.Background()
6262
require.NoError(t, dg.Alter(ctx, &api.Operation{DropAll: true}))
@@ -383,10 +383,8 @@ func dirCleanup(t *testing.T) {
383383
}
384384

385385
func copyToLocalFs(t *testing.T) {
386-
// List all the folders in the bucket.
387-
lsCh1 := make(chan struct{})
388-
defer close(lsCh1)
389-
objectCh1 := mc.ListObjectsV2(bucketName, "", false, lsCh1)
386+
objectCh1 := mc.ListObjects(context.Background(), bucketName,
387+
minio.ListObjectsOptions{Prefix: "", Recursive: false})
390388
for object := range objectCh1 {
391389
require.NoError(t, object.Err)
392390
if object.Key != "manifest.json" {
@@ -395,13 +393,13 @@ func copyToLocalFs(t *testing.T) {
395393
}
396394

397395
// Get all the files in that folder and copy them to the local filesystem.
398-
lsCh2 := make(chan struct{})
399-
objectCh2 := mc.ListObjectsV2(bucketName, "", true, lsCh2)
396+
objectCh2 := mc.ListObjects(context.Background(), bucketName,
397+
minio.ListObjectsOptions{Prefix: "", Recursive: true})
400398
for object := range objectCh2 {
401399
require.NoError(t, object.Err)
402400
dstFile := backupDir + "/" + object.Key
403-
require.NoError(t, mc.FGetObject(bucketName, object.Key, dstFile, minio.GetObjectOptions{}))
401+
require.NoError(t, mc.FGetObject(context.Background(),
402+
bucketName, object.Key, dstFile, minio.GetObjectOptions{}))
404403
}
405-
close(lsCh2)
406404
}
407405
}

‎systest/bulk_live/common/bulk_live_fixture.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ func newSuiteInternal(t *testing.T, opts suiteOpts) *bsuite {
6868

6969
mc, err := testutil.NewMinioClient()
7070
require.NoError(t, err)
71-
if ok, err := mc.BucketExists(rootBucket); !ok {
71+
if ok, err := mc.BucketExists(t.Context(), rootBucket); !ok {
7272
require.NoError(t, err)
73-
require.NoError(t, mc.MakeBucket(rootBucket, ""))
73+
require.NoError(t, mc.MakeBucket(t.Context(), rootBucket, minio.MakeBucketOptions{}))
7474
}
75-
_, err = mc.FPutObject(rootBucket, "rdfs.rdf", rdfFile, minio.PutObjectOptions{})
75+
_, err = mc.FPutObject(t.Context(), rootBucket, "rdfs.rdf", rdfFile, minio.PutObjectOptions{})
7676
require.NoError(t, err)
77-
_, err = mc.FPutObject(rootBucket, "schema.txt", schemaFile, minio.PutObjectOptions{})
77+
_, err = mc.FPutObject(t.Context(), rootBucket, "schema.txt", schemaFile, minio.PutObjectOptions{})
7878
require.NoError(t, err)
79-
_, err = mc.FPutObject(rootBucket, "gql_schema.txt", gqlSchemaFile, minio.PutObjectOptions{})
79+
_, err = mc.FPutObject(t.Context(), rootBucket, "gql_schema.txt", gqlSchemaFile, minio.PutObjectOptions{})
8080
require.NoError(t, err)
8181
}
8282

‎systest/cloud/cloud_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"testing"
1515
"time"
1616

17+
minio "github.com/minio/minio-go/v7"
1718
"github.com/stretchr/testify/require"
1819

1920
"github.com/dgraph-io/dgo/v250/protos/api"
@@ -150,7 +151,7 @@ func TestEnvironmentAccess(t *testing.T) {
150151
bucketname := "dgraph-export"
151152
mc, err := testutil.NewMinioClient()
152153
require.NoError(t, err)
153-
require.NoError(t, mc.MakeBucket(bucketname, ""))
154+
require.NoError(t, mc.MakeBucket(context.Background(), bucketname, minio.MakeBucketOptions{}))
154155
minioDest := "minio://minio:9001/dgraph-export?secure=false"
155156

156157
// Export without the minio creds should fail for non-galaxy.
@@ -165,5 +166,4 @@ func TestEnvironmentAccess(t *testing.T) {
165166
// Galaxy guardian should provide the credentials as well.
166167
resp = testutil.Export(t, galaxyToken, minioDest, "accesskey", "secretkey")
167168
require.Zero(t, len(resp.Errors))
168-
169169
}

0 commit comments

Comments
 (0)