Added AnonListObjectsV2 support to GCS (#4584)

cmd/gateway-gcs-anonymous.go

@@ -111,9 +111,15 @@ func (l *gcsGateway) AnonListObjects(bucket string, prefix string, marker string
 	return fromMinioClientListBucketResult(bucket, result), nil
 }
 
-// AnonListObjectsV2 - List objects anonymously v2
-func (l *gcsGateway) AnonListObjectsV2(bucket, prefix, continuationToken string, fetchOwner bool, delimiter string, maxKeys int) (loi ListObjectsV2Info, e error) {
-	return loi, NotImplemented{}
+// AnonListObjectsV2 - List objects in V2 mode, anonymously
+func (l *gcsGateway) AnonListObjectsV2(bucket, prefix, continuationToken string, fetchOwner bool, delimiter string, maxKeys int) (ListObjectsV2Info, error) {
+	// Request V1 List Object to the backend
+	result, err := l.anonClient.ListObjects(bucket, prefix, continuationToken, delimiter, maxKeys)
+	if err != nil {
+		return ListObjectsV2Info{}, s3ToObjectError(traceError(err), bucket)
+	}
+	// translate V1 Result to V2Info
+	return fromMinioClientListBucketResultToV2Info(bucket, result), nil
 }
 
 // AnonGetBucketInfo - Get bucket metadata anonymously.

cmd/gateway-gcs.go

@@ -483,6 +483,29 @@ func (l *gcsGateway) GetObject(bucket string, key string, startOffset int64, len
 	return nil
 }
 
+// fromMinioClientListBucketResultToV2Info converts minio ListBucketResult to ListObjectsV2Info
+func fromMinioClientListBucketResultToV2Info(bucket string, result minio.ListBucketResult) ListObjectsV2Info {
+	objects := make([]ObjectInfo, len(result.Contents))
+
+	for i, oi := range result.Contents {
+		objects[i] = fromMinioClientObjectInfo(bucket, oi)
+	}
+
+	prefixes := make([]string, len(result.CommonPrefixes))
+	for i, p := range result.CommonPrefixes {
+		prefixes[i] = p.Prefix
+	}
+
+	return ListObjectsV2Info{
+		IsTruncated: result.IsTruncated,
+		Prefixes:    prefixes,
+		Objects:     objects,
+
+		ContinuationToken:     result.Marker,
+		NextContinuationToken: result.NextMarker,
+	}
+}
+
 // fromGCSAttrsToObjectInfo converts GCS BucketAttrs to gateway ObjectInfo
 func fromGCSAttrsToObjectInfo(attrs *storage.ObjectAttrs) ObjectInfo {
 	// All google cloud storage objects have a CRC32c hash, whereas composite objects may not have a MD5 hash

cmd/gateway-gcs_test.go

@@ -16,7 +16,12 @@
 
 package cmd
 
-import "testing"
+import (
+	"reflect"
+	"testing"
+
+	minio "github.com/minio/minio-go"
+)
 
 func TestToGCSPageToken(t *testing.T) {
 	testCases := []struct {
@@ -181,3 +186,26 @@ func TestGCSMultipartDataName(t *testing.T) {
 		t.Errorf("expected: %s, got: %s", expected, got)
 	}
 }
+
+func TestFromMinioClientListBucketResultToV2Info(t *testing.T) {
+
+	listBucketResult := minio.ListBucketResult{
+		IsTruncated:    false,
+		Marker:         "testMarker",
+		NextMarker:     "testMarker2",
+		CommonPrefixes: []minio.CommonPrefix{{Prefix: "one"}, {Prefix: "two"}},
+		Contents:       []minio.ObjectInfo{{Key: "testobj", ContentType: ""}},
+	}
+
+	listBucketV2Info := ListObjectsV2Info{
+		Prefixes:              []string{"one", "two"},
+		Objects:               []ObjectInfo{{Name: "testobj", Bucket: "testbucket", UserDefined: map[string]string{"Content-Type": ""}}},
+		IsTruncated:           false,
+		ContinuationToken:     "testMarker",
+		NextContinuationToken: "testMarker2",
+	}
+
+	if got := fromMinioClientListBucketResultToV2Info("testbucket", listBucketResult); !reflect.DeepEqual(got, listBucketV2Info) {
+		t.Errorf("fromMinioClientListBucketResultToV2Info() = %v, want %v", got, listBucketV2Info)
+	}
+}