From 6503c6ac21ce73ee3e52ce4816e349a00f60ca35 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 5 Jul 2021 18:44:00 -0700 Subject: [PATCH] fix: support startAfter with S3 gateway fixes #12604 --- cmd/gateway/s3/gateway-s3.go | 2 +- cmd/warm-backend-s3.go | 7 ++----- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cmd/gateway/s3/gateway-s3.go b/cmd/gateway/s3/gateway-s3.go index bbce5e971..c9fa96389 100644 --- a/cmd/gateway/s3/gateway-s3.go +++ b/cmd/gateway/s3/gateway-s3.go @@ -374,7 +374,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) + result, err := l.Client.ListObjectsV2(bucket, prefix, continuationToken, startAfter, delimiter, maxKeys) if err != nil { return loi, minio.ErrorRespToObjectError(err, bucket) } diff --git a/cmd/warm-backend-s3.go b/cmd/warm-backend-s3.go index dae1e03cd..37d06c2ee 100644 --- a/cmd/warm-backend-s3.go +++ b/cmd/warm-backend-s3.go @@ -91,14 +91,11 @@ func (s3 *warmBackendS3) Remove(ctx context.Context, object string, rv remoteVer } func (s3 *warmBackendS3) InUse(ctx context.Context) (bool, error) { - result, err := s3.core.ListObjectsV2(s3.Bucket, s3.Prefix, "", false, "/", 1) + result, err := s3.core.ListObjectsV2(s3.Bucket, s3.Prefix, "", "", slashSeparator, 1) if err != nil { return false, s3.ToObjectError(err) } - if len(result.CommonPrefixes) > 0 || len(result.Contents) > 0 { - return true, nil - } - return false, nil + return len(result.CommonPrefixes) > 0 || len(result.Contents) > 0, nil } func newWarmBackendS3(conf madmin.TierS3) (*warmBackendS3, error) { diff --git a/go.mod b/go.mod index 0330e1fd6..e56a6dc65 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.14.0 github.com/minio/madmin-go v1.0.13 - github.com/minio/minio-go/v7 v7.0.12-0.20210622001910-0823af6c707c + github.com/minio/minio-go/v7 v7.0.13-0.20210706013812-337aa536abe2 github.com/minio/parquet-go v1.0.0 github.com/minio/pkg v1.0.8 github.com/minio/rpc v1.0.0 diff --git a/go.sum b/go.sum index 4b550031f..0a81ddb3f 100644 --- a/go.sum +++ b/go.sum @@ -1024,8 +1024,8 @@ github.com/minio/minio-go/v7 v7.0.10/go.mod h1:td4gW1ldOsj1PbSNS+WYK43j+P1XVhX/8 github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78/go.mod h1:mTh2uJuAbEqdhMVl6CMIIZLUeiMiWtJR4JB8/5g2skw= github.com/minio/minio-go/v7 v7.0.11-0.20210607181445-e162fdb8e584/go.mod h1:WoyW+ySKAKjY98B9+7ZbI8z8S3jaxaisdcvj9TGlazA= github.com/minio/minio-go/v7 v7.0.12-0.20210617160455-b7103728fb87/go.mod h1:S23iSP5/gbMwtxeY5FM71R+TkAYyzEdoNEDDwpt8yWs= -github.com/minio/minio-go/v7 v7.0.12-0.20210622001910-0823af6c707c h1:wg0ywTE1zsFtf3CP9UDOw/SYv6BCN3SrkH41gbk3rgc= -github.com/minio/minio-go/v7 v7.0.12-0.20210622001910-0823af6c707c/go.mod h1:S23iSP5/gbMwtxeY5FM71R+TkAYyzEdoNEDDwpt8yWs= +github.com/minio/minio-go/v7 v7.0.13-0.20210706013812-337aa536abe2 h1:Mleb9L1AnLrlHzrvb2eKjRflzLb5P3q+nS3wS4tci/Q= +github.com/minio/minio-go/v7 v7.0.13-0.20210706013812-337aa536abe2/go.mod h1:S23iSP5/gbMwtxeY5FM71R+TkAYyzEdoNEDDwpt8yWs= github.com/minio/operator v0.0.0-20210616045941-65f31f5f78ae h1:GONmqbjCi/KTEc1CGujnS/m1qeJeghcQ8dUBLh19qQo= github.com/minio/operator v0.0.0-20210616045941-65f31f5f78ae/go.mod h1:8/mIXK+CFdL6VqyxRn1SwD+PEX0jsN8uqjoadaw/Np0= github.com/minio/operator/logsearchapi v0.0.0-20210604224119-7e256f98cf90 h1:Qu6j6oE7+QNuq7Kr2DLyVYq3fqMdqFd/T8NAeNp47og=