Skip to content

[azblob] Fix panic when nil options bag is passed #22358

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
tanyasethi-msft merged 3 commits into from
Feb 8, 2024
Merged

[azblob] Fix panic when nil options bag is passed #22358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb0eabf
Fix panic when nil options bag is passed
tanyasethi-msft Feb 8, 2024
786a821
revert variable name change
tanyasethi-msft Feb 8, 2024
dc862d0
Merge branch 'main' into fix/azblob/GetPageRangesPagerOptions
tanyasethi-msft Feb 8, 2024
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
Next Next commit
Fix panic when nil options bag is passed
  • Loading branch information
@tanyasethi-msft
tanyasethi-msft committed Feb 8, 2024
commit cb0eabf89f476151851bd7e5cf8e805b1fc51ddc
1 change: 1 addition & 0 deletions sdk/storage/azblob/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### Bugs Fixed
* Fix concurrency issue while Downloading File. Fixes [#22156](https://github.com/Azure/azure-sdk-for-go/issues/22156).
* Fix panic when nil options bag is passed to NewGetPageRangesPager. Fixes [22356](https://github.com/Azure/azure-sdk-for-go/issues/22356).

### Other Changes

Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azblob/pageblob/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ func (pb *Client) UploadPagesFromURL(ctx context.Context, source string, sourceO

// ClearPages frees the specified pages from the page blob.
// For more information, see https://docs.microsoft.com/rest/api/storageservices/put-page.
func (pb *Client) ClearPages(ctx context.Context, rnge blob.HTTPRange, options *ClearPagesOptions) (ClearPagesResponse, error) {
func (pb *Client) ClearPages(ctx context.Context, httpRange blob.HTTPRange, options *ClearPagesOptions) (ClearPagesResponse, error) {
clearOptions := &generated.PageBlobClientClearPagesOptions{
Range: exported.FormatHTTPRange(rnge),
Range: exported.FormatHTTPRange(httpRange),
}

leaseAccessConditions, cpkInfo, cpkScopeInfo, sequenceNumberAccessConditions, modifiedAccessConditions := options.format()
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azblob/pageblob/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ type GetPageRangesOptions struct {

func (o *GetPageRangesOptions) format() (*generated.PageBlobClientGetPageRangesOptions, *generated.LeaseAccessConditions, *generated.ModifiedAccessConditions) {
if o == nil {
return nil, nil, nil
return &generated.PageBlobClientGetPageRangesOptions{}, nil, nil
}

leaseAccessConditions, modifiedAccessConditions := exported.FormatBlobAccessConditions(o.AccessConditions)
Expand Down