Skip to content

Commit

Permalink
Rehydrate Priority In SetTier (#320)
Browse files Browse the repository at this point in the history
Co-authored-by: t-iverma <t-iverma@microsoft.com>
  • Loading branch information
mohsha-msft and tiverma-msft committed Apr 21, 2022
1 parent afc471d commit 7e62913
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions azblob/url_blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ func (b BlobURL) Undelete(ctx context.Context) (*BlobUndeleteResponse, error) {
// Note: VersionId is an optional parameter which is part of request URL query params.
// It can be explicitly set by calling WithVersionID(versionID string) function and hence it not required to pass it here.
// For detailed information about block blob level tiering see https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers.
func (b BlobURL) SetTier(ctx context.Context, tier AccessTierType, lac LeaseAccessConditions) (*BlobSetTierResponse, error) {
func (b BlobURL) SetTier(ctx context.Context, tier AccessTierType, lac LeaseAccessConditions, rehydratePriority RehydratePriorityType) (*BlobSetTierResponse, error) {
return b.blobClient.SetTier(ctx, tier, nil,
nil, // Blob versioning
nil, RehydratePriorityNone, nil, lac.pointers(),
nil, rehydratePriority, nil, lac.pointers(),
nil) // Blob ifTags
}

Expand Down
14 changes: 7 additions & 7 deletions azblob/zt_url_blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,7 @@ func (s *aztestsSuite) TestBlobsUndelete(c *chk.C) {
}

func setAndCheckBlobTier(c *chk.C, containerURL ContainerURL, blobURL BlobURL, tier AccessTierType) {
_, err := blobURL.SetTier(ctx, tier, LeaseAccessConditions{})
_, err := blobURL.SetTier(ctx, tier, LeaseAccessConditions{}, RehydratePriorityNone)
c.Assert(err, chk.IsNil)

resp, err := blobURL.GetProperties(ctx, BlobAccessConditions{}, ClientProvidedKeyOptions{})
Expand Down Expand Up @@ -1762,7 +1762,7 @@ func (s *aztestsSuite) TestBlobTierInferred(c *chk.C) {
c.Assert(resp2.Segment.BlobItems[0].Properties.AccessTierInferred, chk.NotNil)
c.Assert(resp2.Segment.BlobItems[0].Properties.AccessTier, chk.Not(chk.Equals), "")

_, err = blobURL.SetTier(ctx, AccessTierP4, LeaseAccessConditions{})
_, err = blobURL.SetTier(ctx, AccessTierP4, LeaseAccessConditions{}, RehydratePriorityNone)
c.Assert(err, chk.IsNil)

resp, err = blobURL.GetProperties(ctx, BlobAccessConditions{}, ClientProvidedKeyOptions{})
Expand All @@ -1784,9 +1784,9 @@ func (s *aztestsSuite) TestBlobArchiveStatus(c *chk.C) {
defer deleteContainer(c, containerURL, false)
blobURL, _ := createNewBlockBlob(c, containerURL)

_, err = blobURL.SetTier(ctx, AccessTierArchive, LeaseAccessConditions{})
_, err = blobURL.SetTier(ctx, AccessTierArchive, LeaseAccessConditions{}, RehydratePriorityNone)
c.Assert(err, chk.IsNil)
_, err = blobURL.SetTier(ctx, AccessTierCool, LeaseAccessConditions{})
_, err = blobURL.SetTier(ctx, AccessTierCool, LeaseAccessConditions{}, RehydratePriorityNone)
c.Assert(err, chk.IsNil)

resp, err := blobURL.GetProperties(ctx, BlobAccessConditions{}, ClientProvidedKeyOptions{})
Expand All @@ -1803,9 +1803,9 @@ func (s *aztestsSuite) TestBlobArchiveStatus(c *chk.C) {

blobURL, _ = createNewBlockBlob(c, containerURL)

_, err = blobURL.SetTier(ctx, AccessTierArchive, LeaseAccessConditions{})
_, err = blobURL.SetTier(ctx, AccessTierArchive, LeaseAccessConditions{}, RehydratePriorityNone)
c.Assert(err, chk.IsNil)
_, err = blobURL.SetTier(ctx, AccessTierHot, LeaseAccessConditions{})
_, err = blobURL.SetTier(ctx, AccessTierHot, LeaseAccessConditions{}, RehydratePriorityNone)
c.Assert(err, chk.IsNil)

resp, err = blobURL.GetProperties(ctx, BlobAccessConditions{}, ClientProvidedKeyOptions{})
Expand All @@ -1827,7 +1827,7 @@ func (s *aztestsSuite) TestBlobTierInvalidValue(c *chk.C) {
defer deleteContainer(c, containerURL, false)
blobURL, _ := createNewBlockBlob(c, containerURL)

_, err = blobURL.SetTier(ctx, AccessTierType("garbage"), LeaseAccessConditions{})
_, err = blobURL.SetTier(ctx, AccessTierType("garbage"), LeaseAccessConditions{}, RehydratePriorityNone)
validateStorageError(c, err, ServiceCodeInvalidHeaderValue)
}

Expand Down

0 comments on commit 7e62913

Please sign in to comment.