Merge pull request #87 from justenwalker/fix-ListBlobs

fix: missing results in ListObjects/CommonPrefixes

Author: Carlisia Thompson

velero-plugin-for-microsoft-azure/object_store.go

@@ -390,14 +390,24 @@ func (o *ObjectStore) ListCommonPrefixes(bucket, prefix, delimiter string) ([]st
 		Delimiter: delimiter,
 	}
 
-	res, err := container.ListBlobs(params)
-	if err != nil {
-		return nil, errors.WithStack(err)
+	var prefixes []string
+	for {
+		res, err := container.ListBlobs(params)
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+		prefixes = append(prefixes, res.BlobPrefixes...)
+		if res.NextMarker == "" {
+			break
+		}
+		params.Marker = res.NextMarker
 	}
 
-	return res.BlobPrefixes, nil
+	return prefixes, nil
 }
 
+
+
 func (o *ObjectStore) ListObjects(bucket, prefix string) ([]string, error) {
 	container, err := o.containerGetter.getContainer(bucket)
 	if err != nil {
@@ -408,17 +418,22 @@ func (o *ObjectStore) ListObjects(bucket, prefix string) ([]string, error) {
 		Prefix: prefix,
 	}
 
-	res, err := container.ListBlobs(params)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	ret := make([]string, 0, len(res.Blobs))
-	for _, blob := range res.Blobs {
-		ret = append(ret, blob.Name)
+	var objects []string
+	for {
+		res, err := container.ListBlobs(params)
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+		for _, blob := range res.Blobs {
+			objects = append(objects, blob.Name)
+		}
+		if res.NextMarker == "" {
+			break
+		}
+		params.Marker = res.NextMarker
 	}
 
-	return ret, nil
+	return objects, nil
 }
 
 func (o *ObjectStore) DeleteObject(bucket string, key string) error {