From 778e9c864f67faa564fd17c1037902772b1e61fb Mon Sep 17 00:00:00 2001 From: Anis Elleuch Date: Tue, 14 Jul 2020 17:38:05 +0100 Subject: [PATCH] Move dependency from minio-go v6 to v7 (#10042) --- cmd/api-errors.go | 4 +- cmd/bootstrap-peer-server.go | 2 +- cmd/bucket-handlers.go | 4 +- cmd/bucket-metadata-sys.go | 2 +- cmd/bucket-metadata.go | 2 +- cmd/bucket-policy.go | 2 +- cmd/common-main.go | 2 +- cmd/config/config.go | 2 +- cmd/config/etcd/dns/etcd_dns.go | 2 +- cmd/encryption-v1_test.go | 2 +- cmd/endpoint-ellipses.go | 2 +- cmd/endpoint.go | 2 +- cmd/endpoint_test.go | 2 +- cmd/erasure-bucket.go | 2 +- cmd/erasure-multipart.go | 2 +- cmd/erasure-object.go | 2 +- cmd/erasure-sets.go | 2 +- cmd/erasure-zones.go | 4 +- cmd/fs-v1.go | 4 +- cmd/gateway-common.go | 2 +- cmd/gateway-unsupported.go | 2 +- cmd/gateway/azure/gateway-azure.go | 2 +- cmd/gateway/gcs/gateway-gcs.go | 2 +- cmd/gateway/gcs/gateway-gcs_test.go | 2 +- cmd/gateway/hdfs/gateway-hdfs-utils.go | 2 +- cmd/gateway/hdfs/gateway-hdfs.go | 2 +- cmd/gateway/s3/gateway-s3-sse.go | 4 +- cmd/gateway/s3/gateway-s3.go | 82 ++++++++++--------- cmd/gateway/s3/gateway-s3_test.go | 2 +- cmd/generic-handlers.go | 2 +- cmd/globals.go | 2 +- cmd/http/listener_test.go | 2 +- cmd/http/server.go | 2 +- cmd/iam-etcd-store.go | 2 +- cmd/iam.go | 2 +- cmd/logger/logger.go | 2 +- cmd/net.go | 2 +- cmd/net_test.go | 2 +- cmd/notification.go | 2 +- cmd/object-api-input-checks.go | 2 +- cmd/object-api-interface.go | 4 +- cmd/object-api-options.go | 2 +- cmd/object-api-utils.go | 2 +- cmd/object-handlers.go | 10 +-- cmd/policy_test.go | 4 +- cmd/postpolicyform_test.go | 2 +- cmd/signature-v4.go | 2 +- cmd/test-utils_test.go | 4 +- cmd/web-handlers.go | 19 +++-- docs/sts/client-grants.go | 4 +- docs/sts/ldap.go | 4 +- docs/sts/web-identity.go | 4 +- go.mod | 13 +-- go.sum | 31 ++++--- pkg/bucket/policy/actionset.go | 2 +- .../policy/condition/binaryequalsfunc.go | 4 +- .../policy/condition/stringequalsfunc.go | 4 +- .../condition/stringequalsignorecasefunc.go | 2 +- pkg/bucket/policy/condition/stringlikefunc.go | 4 +- pkg/bucket/policy/principal.go | 2 +- pkg/bucket/policy/principal_test.go | 2 +- pkg/bucket/policy/resourceset.go | 2 +- pkg/event/config.go | 2 +- pkg/iam/policy/actionset.go | 2 +- pkg/iam/policy/policy.go | 2 +- pkg/iam/policy/resourceset.go | 2 +- pkg/madmin/api.go | 8 +- pkg/madmin/utils.go | 2 +- pkg/s3select/internal/parquet-go/column.go | 2 +- pkg/s3select/internal/parquet-go/reader.go | 2 +- .../internal/parquet-go/reader_test.go | 2 +- .../tools/parquet2csv/parquet2csv.go | 2 +- .../tools/parquet2json/parquet2json.go | 2 +- pkg/s3select/select_test.go | 2 +- 74 files changed, 170 insertions(+), 157 deletions(-) diff --git a/cmd/api-errors.go b/cmd/api-errors.go index 3af53abb3..71f72ccff 100644 --- a/cmd/api-errors.go +++ b/cmd/api-errors.go @@ -27,8 +27,8 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" "google.golang.org/api/googleapi" - minio "github.com/minio/minio-go/v6" - "github.com/minio/minio-go/v6/pkg/tags" + minio "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/config/etcd/dns" "github.com/minio/minio/cmd/crypto" "github.com/minio/minio/cmd/logger" diff --git a/cmd/bootstrap-peer-server.go b/cmd/bootstrap-peer-server.go index b8b5cda7f..92ede4dff 100644 --- a/cmd/bootstrap-peer-server.go +++ b/cmd/bootstrap-peer-server.go @@ -29,7 +29,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/cmd/rest" diff --git a/cmd/bucket-handlers.go b/cmd/bucket-handlers.go index 70cb26e71..6f0c40ce5 100644 --- a/cmd/bucket-handlers.go +++ b/cmd/bucket-handlers.go @@ -30,8 +30,8 @@ import ( "github.com/gorilla/mux" - "github.com/minio/minio-go/v6/pkg/set" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/set" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/config/etcd/dns" "github.com/minio/minio/cmd/crypto" xhttp "github.com/minio/minio/cmd/http" diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go index 66cae850b..dbac1633b 100644 --- a/cmd/bucket-metadata-sys.go +++ b/cmd/bucket-metadata-sys.go @@ -23,7 +23,7 @@ import ( "fmt" "sync" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/tags" bucketsse "github.com/minio/minio/pkg/bucket/encryption" "github.com/minio/minio/pkg/bucket/lifecycle" objectlock "github.com/minio/minio/pkg/bucket/object/lock" diff --git a/cmd/bucket-metadata.go b/cmd/bucket-metadata.go index 30f735c85..118e20960 100644 --- a/cmd/bucket-metadata.go +++ b/cmd/bucket-metadata.go @@ -26,7 +26,7 @@ import ( "path" "time" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/logger" bucketsse "github.com/minio/minio/pkg/bucket/encryption" "github.com/minio/minio/pkg/bucket/lifecycle" diff --git a/cmd/bucket-policy.go b/cmd/bucket-policy.go index 6fff203a3..0128a83df 100644 --- a/cmd/bucket-policy.go +++ b/cmd/bucket-policy.go @@ -25,7 +25,7 @@ import ( "time" jsoniter "github.com/json-iterator/go" - miniogopolicy "github.com/minio/minio-go/v6/pkg/policy" + miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/bucket/policy" diff --git a/cmd/common-main.go b/cmd/common-main.go index 4fc455b3a..05f74bcd4 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -28,7 +28,7 @@ import ( dns2 "github.com/miekg/dns" "github.com/minio/cli" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/config" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" diff --git a/cmd/config/config.go b/cmd/config/config.go index 4ba1f1261..b342acdfe 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -24,7 +24,7 @@ import ( "regexp" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/auth" "github.com/minio/minio/pkg/env" "github.com/minio/minio/pkg/madmin" diff --git a/cmd/config/etcd/dns/etcd_dns.go b/cmd/config/etcd/dns/etcd_dns.go index f94aedac7..eac67c0e9 100644 --- a/cmd/config/etcd/dns/etcd_dns.go +++ b/cmd/config/etcd/dns/etcd_dns.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/coredns/coredns/plugin/etcd/msg" "go.etcd.io/etcd/v3/clientv3" diff --git a/cmd/encryption-v1_test.go b/cmd/encryption-v1_test.go index 75ca56ac7..dd0bf559a 100644 --- a/cmd/encryption-v1_test.go +++ b/cmd/encryption-v1_test.go @@ -23,7 +23,7 @@ import ( "testing" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio-go/v6/pkg/encrypt" + "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio/cmd/crypto" "github.com/minio/sio" ) diff --git a/cmd/endpoint-ellipses.go b/cmd/endpoint-ellipses.go index 92e8b224b..136cc750e 100644 --- a/cmd/endpoint-ellipses.go +++ b/cmd/endpoint-ellipses.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/config" "github.com/minio/minio/pkg/ellipses" "github.com/minio/minio/pkg/env" diff --git a/cmd/endpoint.go b/cmd/endpoint.go index b3e6c0df8..725d3659a 100644 --- a/cmd/endpoint.go +++ b/cmd/endpoint.go @@ -30,7 +30,7 @@ import ( "time" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/config" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/cmd/rest" diff --git a/cmd/endpoint_test.go b/cmd/endpoint_test.go index 0aab439bc..f06695e93 100644 --- a/cmd/endpoint_test.go +++ b/cmd/endpoint_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) func TestNewEndpoint(t *testing.T) { diff --git a/cmd/erasure-bucket.go b/cmd/erasure-bucket.go index a9622ad27..3a015d608 100644 --- a/cmd/erasure-bucket.go +++ b/cmd/erasure-bucket.go @@ -20,7 +20,7 @@ import ( "context" "sort" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/sync/errgroup" ) diff --git a/cmd/erasure-multipart.go b/cmd/erasure-multipart.go index a154e861a..262f8f09b 100644 --- a/cmd/erasure-multipart.go +++ b/cmd/erasure-multipart.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/mimedb" diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index 0eb8ad5d9..01c64a33c 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -25,7 +25,7 @@ import ( "path" "sync" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/tags" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/mimedb" diff --git a/cmd/erasure-sets.go b/cmd/erasure-sets.go index ffeec767a..b4ad91424 100644 --- a/cmd/erasure-sets.go +++ b/cmd/erasure-sets.go @@ -28,7 +28,7 @@ import ( "github.com/dchest/siphash" "github.com/google/uuid" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/config/storageclass" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/bpool" diff --git a/cmd/erasure-zones.go b/cmd/erasure-zones.go index 77949ff9b..719baa3a7 100644 --- a/cmd/erasure-zones.go +++ b/cmd/erasure-zones.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/minio/minio-go/v6/pkg/set" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/set" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/config/storageclass" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" diff --git a/cmd/fs-v1.go b/cmd/fs-v1.go index 5554163b6..a54a75844 100644 --- a/cmd/fs-v1.go +++ b/cmd/fs-v1.go @@ -33,8 +33,8 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio-go/v6/pkg/s3utils" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/config" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" diff --git a/cmd/gateway-common.go b/cmd/gateway-common.go index fbbc1a89b..953c4a5f0 100644 --- a/cmd/gateway-common.go +++ b/cmd/gateway-common.go @@ -29,7 +29,7 @@ import ( "github.com/minio/minio/pkg/hash" xnet "github.com/minio/minio/pkg/net" - minio "github.com/minio/minio-go/v6" + minio "github.com/minio/minio-go/v7" ) var ( diff --git a/cmd/gateway-unsupported.go b/cmd/gateway-unsupported.go index c88ba3a4d..a51f5fdf1 100644 --- a/cmd/gateway-unsupported.go +++ b/cmd/gateway-unsupported.go @@ -22,7 +22,7 @@ import ( "github.com/minio/minio/cmd/logger" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/tags" bucketsse "github.com/minio/minio/pkg/bucket/encryption" "github.com/minio/minio/pkg/bucket/lifecycle" "github.com/minio/minio/pkg/bucket/policy" diff --git a/cmd/gateway/azure/gateway-azure.go b/cmd/gateway/azure/gateway-azure.go index 09e4935fa..cd2592375 100644 --- a/cmd/gateway/azure/gateway-azure.go +++ b/cmd/gateway/azure/gateway-azure.go @@ -41,7 +41,7 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" humanize "github.com/dustin/go-humanize" "github.com/minio/cli" - miniogopolicy "github.com/minio/minio-go/v6/pkg/policy" + miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" "github.com/minio/minio/pkg/bucket/policy" diff --git a/cmd/gateway/gcs/gateway-gcs.go b/cmd/gateway/gcs/gateway-gcs.go index 33437b547..4d9b80065 100644 --- a/cmd/gateway/gcs/gateway-gcs.go +++ b/cmd/gateway/gcs/gateway-gcs.go @@ -38,7 +38,7 @@ import ( "cloud.google.com/go/storage" humanize "github.com/dustin/go-humanize" "github.com/minio/cli" - miniogopolicy "github.com/minio/minio-go/v6/pkg/policy" + miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" "github.com/minio/minio/pkg/bucket/policy" diff --git a/cmd/gateway/gcs/gateway-gcs_test.go b/cmd/gateway/gcs/gateway-gcs_test.go index 8dc008f23..f1e0c1e05 100644 --- a/cmd/gateway/gcs/gateway-gcs_test.go +++ b/cmd/gateway/gcs/gateway-gcs_test.go @@ -28,7 +28,7 @@ import ( "cloud.google.com/go/storage" "google.golang.org/api/googleapi" - miniogo "github.com/minio/minio-go/v6" + miniogo "github.com/minio/minio-go/v7" minio "github.com/minio/minio/cmd" ) diff --git a/cmd/gateway/hdfs/gateway-hdfs-utils.go b/cmd/gateway/hdfs/gateway-hdfs-utils.go index e3664192a..33382d24c 100644 --- a/cmd/gateway/hdfs/gateway-hdfs-utils.go +++ b/cmd/gateway/hdfs/gateway-hdfs-utils.go @@ -19,7 +19,7 @@ package hdfs import ( "strings" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" minio "github.com/minio/minio/cmd" ) diff --git a/cmd/gateway/hdfs/gateway-hdfs.go b/cmd/gateway/hdfs/gateway-hdfs.go index 8a7c0cba0..6ff68c61d 100644 --- a/cmd/gateway/hdfs/gateway-hdfs.go +++ b/cmd/gateway/hdfs/gateway-hdfs.go @@ -34,7 +34,7 @@ import ( "github.com/colinmarc/hdfs/v2" "github.com/colinmarc/hdfs/v2/hadoopconf" "github.com/minio/cli" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" minio "github.com/minio/minio/cmd" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" diff --git a/cmd/gateway/s3/gateway-s3-sse.go b/cmd/gateway/s3/gateway-s3-sse.go index a89af2a0e..c179b7cf3 100644 --- a/cmd/gateway/s3/gateway-s3-sse.go +++ b/cmd/gateway/s3/gateway-s3-sse.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/minio/minio-go/v6/pkg/encrypt" + "github.com/minio/minio-go/v7/pkg/encrypt" minio "github.com/minio/minio/cmd" "github.com/minio/minio/cmd/logger" @@ -785,7 +785,7 @@ func (l *s3EncObjects) DeleteBucket(ctx context.Context, bucket string, forceDel for k := range expParts { l.s3Objects.DeleteObject(ctx, bucket, k, minio.ObjectOptions{}) } - err := l.Client.RemoveBucket(bucket) + err := l.Client.RemoveBucket(ctx, bucket) if err != nil { return minio.ErrorRespToObjectError(err, bucket) } diff --git a/cmd/gateway/s3/gateway-s3.go b/cmd/gateway/s3/gateway-s3.go index 4f3d7887d..21d0cf825 100644 --- a/cmd/gateway/s3/gateway-s3.go +++ b/cmd/gateway/s3/gateway-s3.go @@ -27,13 +27,13 @@ import ( "time" "github.com/minio/cli" - miniogo "github.com/minio/minio-go/v6" - "github.com/minio/minio-go/v6/pkg/credentials" - "github.com/minio/minio-go/v6/pkg/tags" + miniogo "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" + "github.com/minio/minio-go/v7/pkg/tags" minio "github.com/minio/minio/cmd" - "github.com/minio/minio-go/v6/pkg/encrypt" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/encrypt" + "github.com/minio/minio-go/v7/pkg/s3utils" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" @@ -228,7 +228,7 @@ func (g *S3) NewGatewayLayer(creds auth.Credentials) (minio.ObjectLayer, error) probeBucketName := randString(60, rand.NewSource(time.Now().UnixNano()), "probe-bucket-sign-") // Check if the provided keys are valid. - if _, err = clnt.BucketExists(probeBucketName); err != nil { + if _, err = clnt.BucketExists(context.Background(), probeBucketName); err != nil { if miniogo.ToErrorResponse(err).Code != "AccessDenied" { return nil, err } @@ -302,7 +302,7 @@ func (l *s3Objects) MakeBucketWithLocation(ctx context.Context, bucket string, o if s3utils.CheckValidBucketName(bucket) != nil { return minio.BucketNameInvalid{Bucket: bucket} } - err := l.Client.MakeBucket(bucket, opts.Location) + err := l.Client.MakeBucket(ctx, bucket, miniogo.MakeBucketOptions{Region: opts.Location}) if err != nil { return minio.ErrorRespToObjectError(err, bucket) } @@ -311,12 +311,12 @@ func (l *s3Objects) MakeBucketWithLocation(ctx context.Context, bucket string, o // GetBucketInfo gets bucket metadata.. func (l *s3Objects) GetBucketInfo(ctx context.Context, bucket string) (bi minio.BucketInfo, e error) { - buckets, err := l.Client.ListBuckets() + buckets, err := l.Client.ListBuckets(ctx) if err != nil { // Listbuckets may be disallowed, proceed to check if // bucket indeed exists, if yes return success. var ok bool - if ok, err = l.Client.BucketExists(bucket); err != nil { + if ok, err = l.Client.BucketExists(ctx, bucket); err != nil { return bi, minio.ErrorRespToObjectError(err, bucket) } if !ok { @@ -344,7 +344,7 @@ func (l *s3Objects) GetBucketInfo(ctx context.Context, bucket string) (bi minio. // ListBuckets lists all S3 buckets func (l *s3Objects) ListBuckets(ctx context.Context) ([]minio.BucketInfo, error) { - buckets, err := l.Client.ListBuckets() + buckets, err := l.Client.ListBuckets(ctx) if err != nil { return nil, minio.ErrorRespToObjectError(err) } @@ -362,7 +362,7 @@ func (l *s3Objects) ListBuckets(ctx context.Context) ([]minio.BucketInfo, error) // DeleteBucket deletes a bucket on S3 func (l *s3Objects) DeleteBucket(ctx context.Context, bucket string, forceDelete bool) error { - err := l.Client.RemoveBucket(bucket) + err := l.Client.RemoveBucket(ctx, bucket) if err != nil { return minio.ErrorRespToObjectError(err, bucket) } @@ -381,7 +381,7 @@ func (l *s3Objects) ListObjects(ctx context.Context, bucket string, prefix strin // ListObjectsV2 lists all blobs in S3 bucket filtered by prefix func (l *s3Objects) ListObjectsV2(ctx context.Context, bucket, prefix, continuationToken, delimiter string, maxKeys int, fetchOwner bool, startAfter string) (loi minio.ListObjectsV2Info, e error) { - result, err := l.Client.ListObjectsV2(bucket, prefix, continuationToken, fetchOwner, delimiter, maxKeys, startAfter) + result, err := l.Client.ListObjectsV2(bucket, prefix, continuationToken, fetchOwner, delimiter, maxKeys) if err != nil { return loi, minio.ErrorRespToObjectError(err, bucket) } @@ -433,7 +433,7 @@ func (l *s3Objects) GetObject(ctx context.Context, bucket string, key string, st return minio.ErrorRespToObjectError(err, bucket, key) } } - object, _, _, err := l.Client.GetObject(bucket, key, opts) + object, _, _, err := l.Client.GetObject(ctx, bucket, key, opts) if err != nil { return minio.ErrorRespToObjectError(err, bucket, key) } @@ -446,10 +446,8 @@ func (l *s3Objects) GetObject(ctx context.Context, bucket string, key string, st // GetObjectInfo reads object info and replies back ObjectInfo func (l *s3Objects) GetObjectInfo(ctx context.Context, bucket string, object string, opts minio.ObjectOptions) (objInfo minio.ObjectInfo, err error) { - oi, err := l.Client.StatObject(bucket, object, miniogo.StatObjectOptions{ - GetObjectOptions: miniogo.GetObjectOptions{ - ServerSideEncryption: opts.ServerSideEncryption, - }, + oi, err := l.Client.StatObject(ctx, bucket, object, miniogo.StatObjectOptions{ + ServerSideEncryption: opts.ServerSideEncryption, }) if err != nil { return minio.ObjectInfo{}, minio.ErrorRespToObjectError(err, bucket, object) @@ -475,14 +473,19 @@ func (l *s3Objects) PutObject(ctx context.Context, bucket string, object string, ServerSideEncryption: opts.ServerSideEncryption, UserTags: tagMap, } - oi, err := l.Client.PutObject(bucket, object, data, data.Size(), data.MD5Base64String(), data.SHA256HexString(), putOpts) + + ui, err := l.Client.PutObject(ctx, bucket, object, data, data.Size(), data.MD5Base64String(), data.SHA256HexString(), putOpts) if err != nil { return objInfo, minio.ErrorRespToObjectError(err, bucket, object) } // On success, populate the key & metadata so they are present in the notification - oi.Key = object - oi.Metadata = minio.ToMinioClientObjectInfoMetadata(opts.UserDefined) + oi := miniogo.ObjectInfo{ + ETag: ui.ETag, + Size: ui.Size, + Key: object, + Metadata: minio.ToMinioClientObjectInfoMetadata(opts.UserDefined), + } return minio.FromMinioClientObjectInfo(bucket, oi), nil } @@ -511,7 +514,7 @@ func (l *s3Objects) CopyObject(ctx context.Context, srcBucket string, srcObject srcInfo.UserDefined[k] = v[0] } - if _, err = l.Client.CopyObject(srcBucket, srcObject, dstBucket, dstObject, srcInfo.UserDefined); err != nil { + if _, err = l.Client.CopyObject(ctx, srcBucket, srcObject, dstBucket, dstObject, srcInfo.UserDefined); err != nil { return objInfo, minio.ErrorRespToObjectError(err, srcBucket, srcObject) } return l.GetObjectInfo(ctx, dstBucket, dstObject, dstOpts) @@ -519,7 +522,7 @@ func (l *s3Objects) CopyObject(ctx context.Context, srcBucket string, srcObject // DeleteObject deletes a blob in bucket func (l *s3Objects) DeleteObject(ctx context.Context, bucket string, object string, opts minio.ObjectOptions) (minio.ObjectInfo, error) { - err := l.Client.RemoveObject(bucket, object) + err := l.Client.RemoveObject(ctx, bucket, object, miniogo.RemoveObjectOptions{}) if err != nil { return minio.ObjectInfo{}, minio.ErrorRespToObjectError(err, bucket, object) } @@ -546,7 +549,7 @@ func (l *s3Objects) DeleteObjects(ctx context.Context, bucket string, objects [] // ListMultipartUploads lists all multipart uploads. func (l *s3Objects) ListMultipartUploads(ctx context.Context, bucket string, prefix string, keyMarker string, uploadIDMarker string, delimiter string, maxUploads int) (lmi minio.ListMultipartsInfo, e error) { - result, err := l.Client.ListMultipartUploads(bucket, prefix, keyMarker, uploadIDMarker, delimiter, maxUploads) + result, err := l.Client.ListMultipartUploads(ctx, bucket, prefix, keyMarker, uploadIDMarker, delimiter, maxUploads) if err != nil { return lmi, err } @@ -571,7 +574,7 @@ func (l *s3Objects) NewMultipartUpload(ctx context.Context, bucket string, objec ServerSideEncryption: o.ServerSideEncryption, UserTags: tagMap, } - uploadID, err = l.Client.NewMultipartUpload(bucket, object, opts) + uploadID, err = l.Client.NewMultipartUpload(ctx, bucket, object, opts) if err != nil { return uploadID, minio.ErrorRespToObjectError(err, bucket, object) } @@ -581,7 +584,7 @@ func (l *s3Objects) NewMultipartUpload(ctx context.Context, bucket string, objec // PutObjectPart puts a part of object in bucket func (l *s3Objects) PutObjectPart(ctx context.Context, bucket string, object string, uploadID string, partID int, r *minio.PutObjReader, opts minio.ObjectOptions) (pi minio.PartInfo, e error) { data := r.Reader - info, err := l.Client.PutObjectPart(bucket, object, uploadID, partID, data, data.Size(), data.MD5Base64String(), data.SHA256HexString(), opts.ServerSideEncryption) + info, err := l.Client.PutObjectPart(ctx, bucket, object, uploadID, partID, data, data.Size(), data.MD5Base64String(), data.SHA256HexString(), opts.ServerSideEncryption) if err != nil { return pi, minio.ErrorRespToObjectError(err, bucket, object) } @@ -611,7 +614,7 @@ func (l *s3Objects) CopyObjectPart(ctx context.Context, srcBucket, srcObject, de srcInfo.UserDefined[k] = v[0] } - completePart, err := l.Client.CopyObjectPart(srcBucket, srcObject, destBucket, destObject, + completePart, err := l.Client.CopyObjectPart(ctx, srcBucket, srcObject, destBucket, destObject, uploadID, partID, startOffset, length, srcInfo.UserDefined) if err != nil { return p, minio.ErrorRespToObjectError(err, srcBucket, srcObject) @@ -659,13 +662,13 @@ func (l *s3Objects) ListObjectParts(ctx context.Context, bucket string, object s // AbortMultipartUpload aborts a ongoing multipart upload func (l *s3Objects) AbortMultipartUpload(ctx context.Context, bucket string, object string, uploadID string) error { - err := l.Client.AbortMultipartUpload(bucket, object, uploadID) + err := l.Client.AbortMultipartUpload(ctx, bucket, object, uploadID) return minio.ErrorRespToObjectError(err, bucket, object) } // CompleteMultipartUpload completes ongoing multipart upload and finalizes object func (l *s3Objects) CompleteMultipartUpload(ctx context.Context, bucket string, object string, uploadID string, uploadedParts []minio.CompletePart, opts minio.ObjectOptions) (oi minio.ObjectInfo, e error) { - etag, err := l.Client.CompleteMultipartUpload(bucket, object, uploadID, minio.ToMinioClientCompleteParts(uploadedParts)) + etag, err := l.Client.CompleteMultipartUpload(ctx, bucket, object, uploadID, minio.ToMinioClientCompleteParts(uploadedParts)) if err != nil { return oi, minio.ErrorRespToObjectError(err, bucket, object) } @@ -682,7 +685,7 @@ func (l *s3Objects) SetBucketPolicy(ctx context.Context, bucket string, bucketPo return minio.ErrorRespToObjectError(err, bucket) } - if err := l.Client.SetBucketPolicy(bucket, string(data)); err != nil { + if err := l.Client.SetBucketPolicy(ctx, bucket, string(data)); err != nil { return minio.ErrorRespToObjectError(err, bucket) } @@ -691,7 +694,7 @@ func (l *s3Objects) SetBucketPolicy(ctx context.Context, bucket string, bucketPo // GetBucketPolicy will get policy on bucket func (l *s3Objects) GetBucketPolicy(ctx context.Context, bucket string) (*policy.Policy, error) { - data, err := l.Client.GetBucketPolicy(bucket) + data, err := l.Client.GetBucketPolicy(ctx, bucket) if err != nil { return nil, minio.ErrorRespToObjectError(err, bucket) } @@ -702,7 +705,7 @@ func (l *s3Objects) GetBucketPolicy(ctx context.Context, bucket string) (*policy // DeleteBucketPolicy deletes all policies on bucket func (l *s3Objects) DeleteBucketPolicy(ctx context.Context, bucket string) error { - if err := l.Client.SetBucketPolicy(bucket, ""); err != nil { + if err := l.Client.SetBucketPolicy(ctx, bucket, ""); err != nil { return minio.ErrorRespToObjectError(err, bucket, "") } return nil @@ -711,21 +714,22 @@ func (l *s3Objects) DeleteBucketPolicy(ctx context.Context, bucket string) error // GetObjectTags gets the tags set on the object func (l *s3Objects) GetObjectTags(ctx context.Context, bucket string, object string, opts minio.ObjectOptions) (*tags.Tags, error) { var err error - var tagObj *tags.Tags - var tagStr string if _, err = l.GetObjectInfo(ctx, bucket, object, opts); err != nil { return nil, minio.ErrorRespToObjectError(err, bucket, object) } - if tagStr, err = l.Client.GetObjectTagging(bucket, object); err != nil { + tagsMap, err := l.Client.GetObjectTagging(ctx, bucket, object, miniogo.GetObjectTaggingOptions{}) + if err != nil { return nil, minio.ErrorRespToObjectError(err, bucket, object) } - if tagObj, err = tags.ParseObjectXML(strings.NewReader(tagStr)); err != nil { - return nil, minio.ErrorRespToObjectError(err, bucket, object) + tagObj := tags.Tags{} + for k, v := range tagsMap { + tagObj.Set(k, v) } - return tagObj, err + + return &tagObj, err } // PutObjectTags attaches the tags to the object @@ -734,7 +738,7 @@ func (l *s3Objects) PutObjectTags(ctx context.Context, bucket, object string, ta if err != nil { return minio.ErrorRespToObjectError(err, bucket, object) } - if err = l.Client.PutObjectTagging(bucket, object, tagObj.ToMap()); err != nil { + if err = l.Client.PutObjectTagging(ctx, bucket, object, tagObj.ToMap(), miniogo.PutObjectTaggingOptions{}); err != nil { return minio.ErrorRespToObjectError(err, bucket, object) } return nil @@ -742,7 +746,7 @@ func (l *s3Objects) PutObjectTags(ctx context.Context, bucket, object string, ta // DeleteObjectTags removes the tags attached to the object func (l *s3Objects) DeleteObjectTags(ctx context.Context, bucket, object string, opts minio.ObjectOptions) error { - if err := l.Client.RemoveObjectTagging(bucket, object); err != nil { + if err := l.Client.RemoveObjectTagging(ctx, bucket, object, miniogo.RemoveObjectTaggingOptions{}); err != nil { return minio.ErrorRespToObjectError(err, bucket, object) } return nil diff --git a/cmd/gateway/s3/gateway-s3_test.go b/cmd/gateway/s3/gateway-s3_test.go index c5972993d..3262db72c 100644 --- a/cmd/gateway/s3/gateway-s3_test.go +++ b/cmd/gateway/s3/gateway-s3_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - miniogo "github.com/minio/minio-go/v6" + miniogo "github.com/minio/minio-go/v7" "github.com/minio/minio/pkg/hash" minio "github.com/minio/minio/cmd" diff --git a/cmd/generic-handlers.go b/cmd/generic-handlers.go index 8977b160a..099617f97 100644 --- a/cmd/generic-handlers.go +++ b/cmd/generic-handlers.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" humanize "github.com/dustin/go-humanize" "github.com/minio/minio/cmd/config/etcd/dns" diff --git a/cmd/globals.go b/cmd/globals.go index 6ba8d6944..9f0f34ec1 100644 --- a/cmd/globals.go +++ b/cmd/globals.go @@ -21,7 +21,7 @@ import ( "os" "time" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" humanize "github.com/dustin/go-humanize" "github.com/minio/minio/cmd/config/cache" diff --git a/cmd/http/listener_test.go b/cmd/http/listener_test.go index 437699fdc..c8a559249 100644 --- a/cmd/http/listener_test.go +++ b/cmd/http/listener_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) var serverPort uint32 = 60000 diff --git a/cmd/http/server.go b/cmd/http/server.go index fd8da768b..0ad0d8cd3 100644 --- a/cmd/http/server.go +++ b/cmd/http/server.go @@ -28,7 +28,7 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/config" "github.com/minio/minio/pkg/certs" "github.com/minio/minio/pkg/env" diff --git a/cmd/iam-etcd-store.go b/cmd/iam-etcd-store.go index 3317ebe4b..54f332bff 100644 --- a/cmd/iam-etcd-store.go +++ b/cmd/iam-etcd-store.go @@ -27,7 +27,7 @@ import ( "time" jwtgo "github.com/dgrijalva/jwt-go" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" iampolicy "github.com/minio/minio/pkg/iam/policy" diff --git a/cmd/iam.go b/cmd/iam.go index dfbc0a01e..1bd46e84e 100644 --- a/cmd/iam.go +++ b/cmd/iam.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/config" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/auth" diff --git a/cmd/logger/logger.go b/cmd/logger/logger.go index 8ecbbb6ea..8a837587a 100644 --- a/cmd/logger/logger.go +++ b/cmd/logger/logger.go @@ -29,7 +29,7 @@ import ( "time" "github.com/minio/highwayhash" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/logger/message/log" ) diff --git a/cmd/net.go b/cmd/net.go index 5bbc53578..298d1e9d9 100644 --- a/cmd/net.go +++ b/cmd/net.go @@ -25,7 +25,7 @@ import ( "strings" "syscall" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/config" "github.com/minio/minio/cmd/logger" xnet "github.com/minio/minio/pkg/net" diff --git a/cmd/net_test.go b/cmd/net_test.go index 1b1903c8d..48482b216 100644 --- a/cmd/net_test.go +++ b/cmd/net_test.go @@ -24,7 +24,7 @@ import ( "runtime" "testing" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) func TestMustSplitHostPort(t *testing.T) { diff --git a/cmd/notification.go b/cmd/notification.go index c68eeabf3..320a34eb4 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -29,7 +29,7 @@ import ( "time" "github.com/klauspost/compress/zip" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/cmd/crypto" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/bucket/policy" diff --git a/cmd/object-api-input-checks.go b/cmd/object-api-input-checks.go index a66311834..29cce52ac 100644 --- a/cmd/object-api-input-checks.go +++ b/cmd/object-api-input-checks.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/google/uuid" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio/cmd/logger" ) diff --git a/cmd/object-api-interface.go b/cmd/object-api-interface.go index 426216ed6..067545f6e 100644 --- a/cmd/object-api-interface.go +++ b/cmd/object-api-interface.go @@ -22,8 +22,8 @@ import ( "net/http" "time" - "github.com/minio/minio-go/v6/pkg/encrypt" - "github.com/minio/minio-go/v6/pkg/tags" + "github.com/minio/minio-go/v7/pkg/encrypt" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/pkg/bucket/policy" "github.com/minio/minio/pkg/madmin" ) diff --git a/cmd/object-api-options.go b/cmd/object-api-options.go index a9ebab05d..a34633b4f 100644 --- a/cmd/object-api-options.go +++ b/cmd/object-api-options.go @@ -25,7 +25,7 @@ import ( "time" "github.com/google/uuid" - "github.com/minio/minio-go/v6/pkg/encrypt" + "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio/cmd/crypto" xhttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/cmd/logger" diff --git a/cmd/object-api-utils.go b/cmd/object-api-utils.go index 4bec241e4..e76958aa1 100644 --- a/cmd/object-api-utils.go +++ b/cmd/object-api-utils.go @@ -36,7 +36,7 @@ import ( "github.com/google/uuid" "github.com/klauspost/compress/s2" "github.com/klauspost/readahead" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio/cmd/config/compress" "github.com/minio/minio/cmd/config/etcd/dns" "github.com/minio/minio/cmd/config/storageclass" diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go index 4f3034764..e4adaa597 100644 --- a/cmd/object-handlers.go +++ b/cmd/object-handlers.go @@ -33,9 +33,9 @@ import ( "github.com/google/uuid" "github.com/gorilla/mux" - miniogo "github.com/minio/minio-go/v6" - "github.com/minio/minio-go/v6/pkg/encrypt" - "github.com/minio/minio-go/v6/pkg/tags" + miniogo "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/encrypt" + "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/cmd/config/etcd/dns" "github.com/minio/minio/cmd/config/storageclass" "github.com/minio/minio/cmd/crypto" @@ -1202,7 +1202,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re ServerSideEncryption: dstOpts.ServerSideEncryption, UserTags: tag.ToMap(), } - remoteObjInfo, rerr := core.PutObjectWithContext(ctx, dstBucket, dstObject, srcInfo.Reader, + remoteObjInfo, rerr := core.PutObject(ctx, dstBucket, dstObject, srcInfo.Reader, srcInfo.Size, "", "", opts) if rerr != nil { writeErrorResponse(ctx, w, toAPIError(ctx, rerr), r.URL, guessIsBrowserReq(r)) @@ -1865,7 +1865,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt return } - partInfo, err := core.PutObjectPartWithContext(ctx, dstBucket, dstObject, uploadID, partID, + partInfo, err := core.PutObjectPart(ctx, dstBucket, dstObject, uploadID, partID, srcInfo.Reader, srcInfo.Size, "", "", dstOpts.ServerSideEncryption) if err != nil { writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r)) diff --git a/cmd/policy_test.go b/cmd/policy_test.go index 785a61662..e51c469ba 100644 --- a/cmd/policy_test.go +++ b/cmd/policy_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - miniogopolicy "github.com/minio/minio-go/v6/pkg/policy" - "github.com/minio/minio-go/v6/pkg/set" + miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/bucket/policy" "github.com/minio/minio/pkg/bucket/policy/condition" ) diff --git a/cmd/postpolicyform_test.go b/cmd/postpolicyform_test.go index be39b6397..5ac451140 100644 --- a/cmd/postpolicyform_test.go +++ b/cmd/postpolicyform_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - minio "github.com/minio/minio-go/v6" + minio "github.com/minio/minio-go/v7" ) // Test Post Policy parsing and checking conditions diff --git a/cmd/signature-v4.go b/cmd/signature-v4.go index 9f1352861..ffb01c9d6 100644 --- a/cmd/signature-v4.go +++ b/cmd/signature-v4.go @@ -35,7 +35,7 @@ import ( "strings" "time" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" xhttp "github.com/minio/minio/cmd/http" sha256 "github.com/minio/sha256-simd" ) diff --git a/cmd/test-utils_test.go b/cmd/test-utils_test.go index 61e51804b..55e95a38c 100644 --- a/cmd/test-utils_test.go +++ b/cmd/test-utils_test.go @@ -54,8 +54,8 @@ import ( "github.com/fatih/color" "github.com/gorilla/mux" - "github.com/minio/minio-go/v6/pkg/s3utils" - "github.com/minio/minio-go/v6/pkg/signer" + "github.com/minio/minio-go/v7/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/signer" "github.com/minio/minio/cmd/config" "github.com/minio/minio/cmd/crypto" "github.com/minio/minio/cmd/logger" diff --git a/cmd/web-handlers.go b/cmd/web-handlers.go index 0fb5d61f2..a323fc84e 100644 --- a/cmd/web-handlers.go +++ b/cmd/web-handlers.go @@ -35,8 +35,9 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/rpc/v2/json2" "github.com/klauspost/compress/zip" - miniogopolicy "github.com/minio/minio-go/v6/pkg/policy" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7" + miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" + "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio/browser" "github.com/minio/minio/cmd/config/etcd/dns" "github.com/minio/minio/cmd/config/identity/openid" @@ -252,7 +253,7 @@ func (web *webAPIHandlers) DeleteBucket(r *http.Request, args *RemoveBucketArgs, if err != nil { return toJSONError(ctx, err, args.BucketName) } - if err = core.RemoveBucket(args.BucketName); err != nil { + if err = core.RemoveBucket(ctx, args.BucketName); err != nil { return toJSONError(ctx, err, args.BucketName) } return nil @@ -647,7 +648,7 @@ func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs, } }() - for resp := range core.RemoveObjects(args.BucketName, objectsCh) { + for resp := range core.RemoveObjects(ctx, args.BucketName, objectsCh, minio.RemoveObjectsOptions{}) { if resp.Err != nil { return toJSONError(ctx, resp.Err, args.BucketName, resp.ObjectName) } @@ -1618,7 +1619,7 @@ func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolic if rerr != nil { return toJSONError(ctx, rerr, args.BucketName) } - policyStr, err := client.GetBucketPolicy(args.BucketName) + policyStr, err := client.GetBucketPolicy(ctx, args.BucketName) if err != nil { return toJSONError(ctx, rerr, args.BucketName) } @@ -1716,7 +1717,7 @@ func (web *webAPIHandlers) ListAllBucketPolicies(r *http.Request, args *ListAllB return toJSONError(ctx, rerr, args.BucketName) } var policyStr string - policyStr, err = core.Client.GetBucketPolicy(args.BucketName) + policyStr, err = core.Client.GetBucketPolicy(ctx, args.BucketName) if err != nil { return toJSONError(ctx, err, args.BucketName) } @@ -1815,7 +1816,7 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic var policyStr string // Use the abstracted API instead of core, such that // NoSuchBucketPolicy errors are automatically handled. - policyStr, err = core.Client.GetBucketPolicy(args.BucketName) + policyStr, err = core.Client.GetBucketPolicy(ctx, args.BucketName) if err != nil { return toJSONError(ctx, err, args.BucketName) } @@ -1828,7 +1829,7 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic policyInfo.Statements = miniogopolicy.SetPolicy(policyInfo.Statements, policyType, args.BucketName, args.Prefix) if len(policyInfo.Statements) == 0 { - if err = core.SetBucketPolicy(args.BucketName, ""); err != nil { + if err = core.SetBucketPolicy(ctx, args.BucketName, ""); err != nil { return toJSONError(ctx, err, args.BucketName) } return nil @@ -1845,7 +1846,7 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic return toJSONError(ctx, err, args.BucketName) } - if err = core.SetBucketPolicy(args.BucketName, string(policyData)); err != nil { + if err = core.SetBucketPolicy(ctx, args.BucketName, string(policyData)); err != nil { return toJSONError(ctx, err, args.BucketName) } diff --git a/docs/sts/client-grants.go b/docs/sts/client-grants.go index e5dfdde19..605fac8b3 100644 --- a/docs/sts/client-grants.go +++ b/docs/sts/client-grants.go @@ -29,8 +29,8 @@ import ( "net/url" "strings" - minio "github.com/minio/minio-go/v6" - "github.com/minio/minio-go/v6/pkg/credentials" + minio "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" ) // JWTToken - parses the output from IDP access token. diff --git a/docs/sts/ldap.go b/docs/sts/ldap.go index 42b4a5fc3..6fb593863 100644 --- a/docs/sts/ldap.go +++ b/docs/sts/ldap.go @@ -23,8 +23,8 @@ import ( "log" "net/url" - miniogo "github.com/minio/minio-go/v6" - cr "github.com/minio/minio-go/v6/pkg/credentials" + miniogo "github.com/minio/minio-go/v7" + cr "github.com/minio/minio-go/v7/pkg/credentials" ) var ( diff --git a/docs/sts/web-identity.go b/docs/sts/web-identity.go index 621e30b7f..4214515fb 100644 --- a/docs/sts/web-identity.go +++ b/docs/sts/web-identity.go @@ -35,8 +35,8 @@ import ( "golang.org/x/oauth2" - "github.com/minio/minio-go/v6" - "github.com/minio/minio-go/v6/pkg/credentials" + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio/pkg/auth" ) diff --git a/go.mod b/go.mod index 15e410dd9..eeb0b81ca 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf github.com/json-iterator/go v1.1.10 github.com/klauspost/compress v1.10.3 - github.com/klauspost/cpuid v1.3.0 + github.com/klauspost/cpuid v1.3.1 github.com/klauspost/pgzip v1.2.1 github.com/klauspost/readahead v1.3.1 github.com/klauspost/reedsolomon v1.9.9 @@ -48,7 +48,7 @@ require ( github.com/miekg/dns v1.1.8 github.com/minio/cli v1.22.0 github.com/minio/highwayhash v1.0.0 - github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec + github.com/minio/minio-go/v7 v7.0.0-20200714085548-47e386e2cde8 github.com/minio/sha256-simd v0.1.1 github.com/minio/simdjson-go v0.1.5-0.20200303142138-b17fe061ea37 github.com/minio/sio v0.2.0 @@ -69,7 +69,7 @@ require ( github.com/rs/cors v1.7.0 github.com/secure-io/sio-go v0.3.0 github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible - github.com/sirupsen/logrus v1.5.0 + github.com/sirupsen/logrus v1.6.0 github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 github.com/tidwall/gjson v1.3.5 @@ -80,9 +80,10 @@ require ( github.com/willf/bloom v2.0.3+incompatible github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200707003333-58bb8ae09f8e - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 - golang.org/x/net v0.0.0-20200602114024-627f9648deb9 - golang.org/x/sys v0.0.0-20200610111108-226ff32320da + golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 + golang.org/x/net v0.0.0-20200707034311-ab3426394381 + golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae + golang.org/x/text v0.3.3 // indirect google.golang.org/api v0.5.0 gopkg.in/jcmturner/gokrb5.v7 v7.3.0 gopkg.in/ldap.v3 v3.0.3 diff --git a/go.sum b/go.sum index c9d45c6d5..cf4726bc6 100644 --- a/go.sum +++ b/go.sum @@ -248,8 +248,8 @@ github.com/klauspost/cpuid v1.2.2/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.4 h1:EBfaK0SWSwk+fgk6efYFWdzl8MwRWoOO1gkmiaTXPW4= github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.3.0 h1:2JqaNE1hGdABW2YbA3TenkO7RiPFRvSWnEnGqWh9sHE= -github.com/klauspost/cpuid v1.3.0/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= +github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= +github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= github.com/klauspost/pgzip v1.2.1 h1:oIPZROsWuPHpOdMVWLuJZXwgjhrW8r1yEX8UqMyeNHM= github.com/klauspost/pgzip v1.2.1/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/readahead v1.3.1 h1:QqXNYvm+VvqYcbrRT4LojUciM0XrznFRIDrbHiJtu/0= @@ -258,6 +258,8 @@ github.com/klauspost/reedsolomon v1.9.9 h1:qCL7LZlv17xMixl55nq2/Oa1Y86nfO8EqDfv2 github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -291,8 +293,8 @@ github.com/minio/highwayhash v1.0.0 h1:iMSDhgUILCr0TNm8LWlSjF8N0ZIj2qbO8WHp6Q/J2 github.com/minio/highwayhash v1.0.0/go.mod h1:xQboMTeM9nY9v/LlAOxFctujiv5+Aq2hR5dxBpaMbdc= github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= -github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec h1:my1ShPzUyV5BSteRVdm/YoEhd4ycLImlN4xDX17pd8A= -github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec/go.mod h1:5+R/nM9Pwrh0vqF+HbYYDQ84wdUFPyXHkrdT4AIkifM= +github.com/minio/minio-go/v7 v7.0.0-20200714085548-47e386e2cde8 h1:Xh5yHlXj/367YMabi7tWHol1AslXcuAFWaedBtGgbU0= +github.com/minio/minio-go/v7 v7.0.0-20200714085548-47e386e2cde8/go.mod h1:QTstSRgetEDVpqiEpFniLoCslH4d9cNAa4BtjuRQrwE= github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/minio/simdjson-go v0.1.5-0.20200303142138-b17fe061ea37 h1:pDeao6M5AEd8hwTtGmE0pVKomlL56JFRa5SiXDZAuJE= @@ -394,8 +396,8 @@ github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible h1 github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q= -github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= +github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= @@ -471,6 +473,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -495,8 +499,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -524,16 +528,19 @@ golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200610111108-226ff32320da h1:bGb80FudwxpeucJUjPYJXuJ8Hk91vNtfvrymzwiei38= -golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= @@ -593,8 +600,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/cheggaaa/pb.v1 v1.0.25 h1:Ev7yu1/f6+d+b3pi5vPdRPc6nNtP1umSfcWiEfRqv6I= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= +gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw= gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= gopkg.in/jcmturner/dnsutils.v1 v1.0.1 h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM= diff --git a/pkg/bucket/policy/actionset.go b/pkg/bucket/policy/actionset.go index 1f4dd820b..7abefc42e 100644 --- a/pkg/bucket/policy/actionset.go +++ b/pkg/bucket/policy/actionset.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) // ActionSet - set of actions. diff --git a/pkg/bucket/policy/condition/binaryequalsfunc.go b/pkg/bucket/policy/condition/binaryequalsfunc.go index 25799ee9f..c6bb0ce1b 100644 --- a/pkg/bucket/policy/condition/binaryequalsfunc.go +++ b/pkg/bucket/policy/condition/binaryequalsfunc.go @@ -22,8 +22,8 @@ import ( "net/http" "sort" - "github.com/minio/minio-go/v6/pkg/s3utils" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/set" ) func toBinaryEqualsFuncString(n name, key Key, values set.StringSet) string { diff --git a/pkg/bucket/policy/condition/stringequalsfunc.go b/pkg/bucket/policy/condition/stringequalsfunc.go index 66bfd0280..8949ab85a 100644 --- a/pkg/bucket/policy/condition/stringequalsfunc.go +++ b/pkg/bucket/policy/condition/stringequalsfunc.go @@ -21,8 +21,8 @@ import ( "net/http" "sort" - "github.com/minio/minio-go/v6/pkg/s3utils" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/set" ) func toStringEqualsFuncString(n name, key Key, values set.StringSet) string { diff --git a/pkg/bucket/policy/condition/stringequalsignorecasefunc.go b/pkg/bucket/policy/condition/stringequalsignorecasefunc.go index d7eadfa53..df4722972 100644 --- a/pkg/bucket/policy/condition/stringequalsignorecasefunc.go +++ b/pkg/bucket/policy/condition/stringequalsignorecasefunc.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) func toStringEqualsIgnoreCaseFuncString(n name, key Key, values set.StringSet) string { diff --git a/pkg/bucket/policy/condition/stringlikefunc.go b/pkg/bucket/policy/condition/stringlikefunc.go index 7506f9f28..165f824d5 100644 --- a/pkg/bucket/policy/condition/stringlikefunc.go +++ b/pkg/bucket/policy/condition/stringlikefunc.go @@ -21,8 +21,8 @@ import ( "net/http" "sort" - "github.com/minio/minio-go/v6/pkg/s3utils" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/wildcard" ) diff --git a/pkg/bucket/policy/principal.go b/pkg/bucket/policy/principal.go index 47d17e037..9fc62e653 100644 --- a/pkg/bucket/policy/principal.go +++ b/pkg/bucket/policy/principal.go @@ -19,7 +19,7 @@ package policy import ( "encoding/json" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/wildcard" ) diff --git a/pkg/bucket/policy/principal_test.go b/pkg/bucket/policy/principal_test.go index 791445c82..95442321e 100644 --- a/pkg/bucket/policy/principal_test.go +++ b/pkg/bucket/policy/principal_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) func TestPrincipalIsValid(t *testing.T) { diff --git a/pkg/bucket/policy/resourceset.go b/pkg/bucket/policy/resourceset.go index cab7dbbb8..d23d2aa68 100644 --- a/pkg/bucket/policy/resourceset.go +++ b/pkg/bucket/policy/resourceset.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) // ResourceSet - set of resources in policy statement. diff --git a/pkg/event/config.go b/pkg/event/config.go index bd9a1cb64..ac129dd9c 100644 --- a/pkg/event/config.go +++ b/pkg/event/config.go @@ -24,7 +24,7 @@ import ( "strings" "unicode/utf8" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) // ValidateFilterRuleValue - checks if given value is filter rule value or not. diff --git a/pkg/iam/policy/actionset.go b/pkg/iam/policy/actionset.go index ef6ad588a..d780b28af 100644 --- a/pkg/iam/policy/actionset.go +++ b/pkg/iam/policy/actionset.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) // ActionSet - set of actions. diff --git a/pkg/iam/policy/policy.go b/pkg/iam/policy/policy.go index 0133c5769..fb0d7bcb1 100644 --- a/pkg/iam/policy/policy.go +++ b/pkg/iam/policy/policy.go @@ -21,7 +21,7 @@ import ( "io" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/bucket/policy" ) diff --git a/pkg/iam/policy/resourceset.go b/pkg/iam/policy/resourceset.go index b7eca66f9..2e357dc8e 100644 --- a/pkg/iam/policy/resourceset.go +++ b/pkg/iam/policy/resourceset.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) // ResourceSet - set of resources in policy statement. diff --git a/pkg/madmin/api.go b/pkg/madmin/api.go index c2fd5f423..1c674909b 100644 --- a/pkg/madmin/api.go +++ b/pkg/madmin/api.go @@ -1,5 +1,5 @@ /* - * MinIO Cloud Storage, (C) 2016, 2017 MinIO, Inc. + * MinIO Cloud Storage, (C) 2016-2020 MinIO, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ import ( "strings" "time" - "github.com/minio/minio-go/v6/pkg/credentials" - "github.com/minio/minio-go/v6/pkg/s3utils" - "github.com/minio/minio-go/v6/pkg/signer" + "github.com/minio/minio-go/v7/pkg/credentials" + "github.com/minio/minio-go/v7/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/signer" "golang.org/x/net/publicsuffix" ) diff --git a/pkg/madmin/utils.go b/pkg/madmin/utils.go index 035bb636f..3dc4fa983 100644 --- a/pkg/madmin/utils.go +++ b/pkg/madmin/utils.go @@ -27,7 +27,7 @@ import ( sha256 "github.com/minio/sha256-simd" - "github.com/minio/minio-go/v6/pkg/s3utils" + "github.com/minio/minio-go/v7/pkg/s3utils" ) // AdminAPIVersion - admin api version used in the request. diff --git a/pkg/s3select/internal/parquet-go/column.go b/pkg/s3select/internal/parquet-go/column.go index c05c975b7..cb2f0b7fc 100644 --- a/pkg/s3select/internal/parquet-go/column.go +++ b/pkg/s3select/internal/parquet-go/column.go @@ -22,7 +22,7 @@ import ( "strings" "git.apache.org/thrift.git/lib/go/thrift" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/s3select/internal/parquet-go/gen-go/parquet" ) diff --git a/pkg/s3select/internal/parquet-go/reader.go b/pkg/s3select/internal/parquet-go/reader.go index 74ff5e202..ad38f8036 100644 --- a/pkg/s3select/internal/parquet-go/reader.go +++ b/pkg/s3select/internal/parquet-go/reader.go @@ -22,7 +22,7 @@ import ( "io" "git.apache.org/thrift.git/lib/go/thrift" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/pkg/s3select/internal/parquet-go/gen-go/parquet" ) diff --git a/pkg/s3select/internal/parquet-go/reader_test.go b/pkg/s3select/internal/parquet-go/reader_test.go index 15d02c1e5..0409bf2d2 100644 --- a/pkg/s3select/internal/parquet-go/reader_test.go +++ b/pkg/s3select/internal/parquet-go/reader_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" ) func getReader(name string, offset int64, length int64) (io.ReadCloser, error) { diff --git a/pkg/s3select/internal/parquet-go/tools/parquet2csv/parquet2csv.go b/pkg/s3select/internal/parquet-go/tools/parquet2csv/parquet2csv.go index b112d9310..dca67b425 100644 --- a/pkg/s3select/internal/parquet-go/tools/parquet2csv/parquet2csv.go +++ b/pkg/s3select/internal/parquet-go/tools/parquet2csv/parquet2csv.go @@ -24,7 +24,7 @@ import ( "path" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" parquet "github.com/minio/minio/pkg/s3select/internal/parquet-go" ) diff --git a/pkg/s3select/internal/parquet-go/tools/parquet2json/parquet2json.go b/pkg/s3select/internal/parquet-go/tools/parquet2json/parquet2json.go index bdd0fb941..c495d8987 100644 --- a/pkg/s3select/internal/parquet-go/tools/parquet2json/parquet2json.go +++ b/pkg/s3select/internal/parquet-go/tools/parquet2json/parquet2json.go @@ -24,7 +24,7 @@ import ( "path" "strings" - "github.com/minio/minio-go/v6/pkg/set" + "github.com/minio/minio-go/v7/pkg/set" parquet "github.com/minio/minio/pkg/s3select/internal/parquet-go" ) diff --git a/pkg/s3select/select_test.go b/pkg/s3select/select_test.go index 032d17aba..dea51e05b 100644 --- a/pkg/s3select/select_test.go +++ b/pkg/s3select/select_test.go @@ -29,7 +29,7 @@ import ( "testing" "github.com/klauspost/cpuid" - "github.com/minio/minio-go/v6" + "github.com/minio/minio-go/v7" "github.com/minio/simdjson-go" )