Skip to content

Commit 0f47777

Browse files
Fix SetImmutabilityPolicyOptions.format() NPE (Azure#21593)
* Fix SetImmutabilityPolicyOptions.format() NPE * Fixed null pointer exception when SetImmutabilityPolicyOptions is nil --------- Co-authored-by: Tanya Sethi <tanyasethi@microsoft.com>
1 parent 0c853d2 commit 0f47777

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

sdk/storage/azblob/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
### Breaking Changes
88

99
### Bugs Fixed
10+
* Fixed null pointer exception when `SetImmutabilityPolicyOptions` is passed as `nil`.
1011

1112
### Other Changes
1213

sdk/storage/azblob/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "go",
44
"TagPrefix": "go/storage/azblob",
5-
"Tag": "go/storage/azblob_2d881a137f"
5+
"Tag": "go/storage/azblob_818d8addd0"
66
}

sdk/storage/azblob/blob/client_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3522,6 +3522,10 @@ func (s *BlobRecordedTestsSuite) TestSetImmutabilityPolicy() {
35223522
_, err = bbClient.SetImmutabilityPolicy(context.Background(), currentTime, setImmutabilityPolicyOptions)
35233523
_require.NoError(err)
35243524

3525+
resp, err := bbClient.SetImmutabilityPolicy(context.Background(), currentTime, nil)
3526+
_require.NoError(err)
3527+
_require.Equal((*resp.ImmutabilityPolicyExpiry).UTC(), currentTime.UTC())
3528+
35253529
_, err = bbClient.SetLegalHold(context.Background(), false, nil)
35263530
_require.NoError(err)
35273531

sdk/storage/azblob/blob/models.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ type SetImmutabilityPolicyOptions struct {
458458

459459
func (o *SetImmutabilityPolicyOptions) format() (*generated.BlobClientSetImmutabilityPolicyOptions, *ModifiedAccessConditions) {
460460
if o == nil {
461-
return nil, nil
461+
return &generated.BlobClientSetImmutabilityPolicyOptions{}, nil
462462
}
463463
ac := &exported.BlobAccessConditions{
464464
ModifiedAccessConditions: o.ModifiedAccessConditions,

sdk/storage/azblob/internal/testcommon/clients_auth.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ func CreateNewContainer(ctx context.Context, _require *require.Assertions, conta
218218

219219
_, err := containerClient.Create(ctx, nil)
220220
_require.NoError(err)
221-
// _require.Equal(cResp.RawResponse.StatusCode, 201)
222221
return containerClient
223222
}
224223

0 commit comments

Comments
 (0)