Add ListV2 method (#365)

pkg/miniogw/gateway-storj.go

@@ -196,8 +196,7 @@ func (s *storjObjects) ListBuckets(ctx context.Context) (
 	return bucketItems, err
 }
 
-func (s *storjObjects) ListObjects(ctx context.Context, bucket, prefix, marker,
-	delimiter string, maxKeys int) (result minio.ListObjectsInfo, err error) {
+func (s *storjObjects) ListObjects(ctx context.Context, bucket, prefix, marker, delimiter string, maxKeys int) (result minio.ListObjectsInfo, err error) {
 	defer mon.Task()(&ctx)(&err)
 
 	if delimiter != "" && delimiter != "/" {
@@ -253,6 +252,74 @@ func (s *storjObjects) ListObjects(ctx context.Context, bucket, prefix, marker,
 	return result, err
 }
 
+// ListObjectsV2 - Not implemented stub
+func (s *storjObjects) ListObjectsV2(ctx context.Context, bucket, prefix, continuationToken, delimiter string, maxKeys int, fetchOwner bool, startAfter string) (result minio.ListObjectsV2Info, err error) {
+	defer mon.Task()(&ctx)(&err)
+
+	if delimiter != "" && delimiter != "/" {
+		return minio.ListObjectsV2Info{ContinuationToken: continuationToken}, Error.New("delimiter %s not supported", delimiter)
+	}
+
+	recursive := delimiter == ""
+	var nextContinuationToken string
+
+	var startAfterPath paths.Path
+	if continuationToken != "" {
+		startAfterPath = paths.New(continuationToken)
+	}
+	if startAfterPath == nil && startAfter != "" {
+		startAfterPath = paths.New(startAfter)
+	}
+
+	var objects []minio.ObjectInfo
+	var prefixes []string
+	o, err := s.storj.bs.GetObjectStore(ctx, bucket)
+	if err != nil {
+		return minio.ListObjectsV2Info{ContinuationToken: continuationToken}, err
+	}
+	items, more, err := o.List(ctx, paths.New(prefix), startAfterPath, nil, recursive, maxKeys, meta.All)
+	if err != nil {
+		return result, err
+	}
+
+	if len(items) > 0 {
+		for _, item := range items {
+			path := item.Path
+			if recursive {
+				path = path.Prepend(prefix)
+			}
+			if item.IsPrefix {
+				prefixes = append(prefixes, path.String()+"/")
+				continue
+			}
+			objects = append(objects, minio.ObjectInfo{
+				Bucket:      bucket,
+				IsDir:       false,
+				Name:        path.String(),
+				ModTime:     item.Meta.Modified,
+				Size:        item.Meta.Size,
+				ContentType: item.Meta.ContentType,
+				UserDefined: item.Meta.UserDefined,
+				ETag:        item.Meta.Checksum,
+			})
+		}
+
+		nextContinuationToken = items[len(items)-1].Path.String() + "\x00"
+	}
+
+	result = minio.ListObjectsV2Info{
+		IsTruncated:       more,
+		ContinuationToken: continuationToken,
+		Objects:           objects,
+		Prefixes:          prefixes,
+	}
+	if more {
+		result.NextContinuationToken = nextContinuationToken
+	}
+
+	return result, err
+}
+
 func (s *storjObjects) MakeBucketWithLocation(ctx context.Context,
 	bucket string, location string) (err error) {
 	defer mon.Task()(&ctx)(&err)

scripts/travis-deps.sh

@@ -14,7 +14,7 @@ cd $TRAVIS_BUILD_DIR
 mkdir -p $HOME/awscli
 pushd $HOME/awscli
 
-curl "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.16.14.zip" -o "awscli-bundle.zip"
+curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
 unzip awscli-bundle.zip
 ./awscli-bundle/install -b ~/bin/aws
 export PATH=~/bin:$PATH