Skip to content

azblob: fix ListBlob to preserve prefix while paging #16992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohsha-msft merged 1 commit into from
Feb 8, 2022
Merged

azblob: fix ListBlob to preserve prefix while paging #16992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions sdk/storage/azblob/zc_container_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azblob/zc_service_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}