From cb4310183c35304d0cd5d59f854de26c34204627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Mon, 7 Feb 2022 21:39:30 +0000 Subject: [PATCH] azblob: fix ListBlob to preserve prefix while paging --- sdk/storage/azblob/zc_container_client.go | 10 ++++------ sdk/storage/azblob/zc_service_client.go | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sdk/storage/azblob/zc_container_client.go b/sdk/storage/azblob/zc_container_client.go index 2861cbd889d3..301156bdec2c 100644 --- a/sdk/storage/azblob/zc_container_client.go +++ b/sdk/storage/azblob/zc_container_client.go @@ -187,9 +187,8 @@ func (c ContainerClient) ListBlobsFlat(listOptions *ContainerListBlobFlatSegment // override the advancer pager.advancer = func(ctx context.Context, response ContainerListBlobFlatSegmentResponse) (*policy.Request, error) { - return c.client.listBlobFlatSegmentCreateRequest(ctx, &ContainerListBlobFlatSegmentOptions{ - Marker: response.NextMarker, - }) + listOptions.Marker = response.NextMarker + return c.client.listBlobFlatSegmentCreateRequest(ctx, listOptions) } // TODO: Come Here @@ -217,9 +216,8 @@ func (c ContainerClient) ListBlobsHierarchy(delimiter string, listOptions *Conta // override the advancer pager.advancer = func(ctx context.Context, response ContainerListBlobHierarchySegmentResponse) (*policy.Request, error) { - return c.client.listBlobHierarchySegmentCreateRequest(ctx, delimiter, &ContainerListBlobHierarchySegmentOptions{ - Marker: response.NextMarker, - }) + listOptions.Marker = response.NextMarker + return c.client.listBlobHierarchySegmentCreateRequest(ctx, delimiter, listOptions) } // todo: come here diff --git a/sdk/storage/azblob/zc_service_client.go b/sdk/storage/azblob/zc_service_client.go index c26d003aaf87..a0ff60a6706c 100644 --- a/sdk/storage/azblob/zc_service_client.go +++ b/sdk/storage/azblob/zc_service_client.go @@ -252,7 +252,7 @@ func (s ServiceClient) GetSASToken(resources AccountSASResourceTypes, permission // eg. "dog='germanshepherd' and penguin='emperorpenguin'" // To specify a container, eg. "@container=’containerName’ and Name = ‘C’" func (s ServiceClient) FindBlobsByTags(ctx context.Context, options ServiceFilterBlobsByTagsOptions) (ServiceFilterBlobsResponse, error) { - // TODO: Use pager here? Missing support from zz_generated_pagera.go + // TODO: Use pager here? Missing support from zz_generated_pagers.go serviceFilterBlobsOptions := options.pointer() return s.client.FilterBlobs(ctx, serviceFilterBlobsOptions) }