github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename Tier -> AccessTier (#1943)

Browse Source
This commit is contained in:
JinmingHu 2021-03-19 14:23:35 +08:00 committed by GitHub
parent a66592c99e
commit 37e5b2ad79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/storage/azure-storage-blobs/CHANGELOG.md
View File

@ -40,6 +40,7 @@
- Removed `Blob` prefix from the name of structs `BlobGeoReplication`, `BlobLeaseStatus`, `BlobLeaseState`, `BlobLeaseDurationType`, `BlobAnalyticsLogging`, `BlobMetrics`, `BlobCorsRule`, `BlobRetentionPolicy`, `BlobStaticWebsite`, `BlobArchiveStatus` and `BlobGeoReplictionStatus`.
- Removed `RequestId` from return types.
- Changed `BodyStream` parameter of `UploadBlob`, `Upload`, `UploadPages` and `AppendBlock`functions from pointer to reference.
- Renamed access tier members in return types and options from `Tier` to `AccessTier`.
## 12.0.0-beta.8 (2021-02-12)

4
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
View File

@ -185,13 +185,13 @@ namespace Azure { namespace Storage { namespace Blobs {
* @brief Sets the tier on a blob. The operation is allowed on a page blob in a premium
* storage account and on a block blob in a blob storage or general purpose v2 account.
*
* @param tier Indicates the tier to be set on the blob.
* @param accessTier Indicates the tier to be set on the blob.
* @param options Optional parameters to execute this function.
* @param context Context for cancelling long running operations.
* @return A SetBlobAccessTierResult on successfully setting the tier.
*/
Azure::Response<Models::SetBlobAccessTierResult> SetAccessTier(
Models::AccessTier tier,
Models::AccessTier accessTier,
const SetBlobAccessTierOptions& options = SetBlobAccessTierOptions(),
const Azure::Core::Context& context = Azure::Core::Context()) const;

10
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
View File

@ -463,7 +463,7 @@ namespace Azure { namespace Storage { namespace Blobs {
/**
* @brief Specifies the tier to be set on the target blob.
*/
Azure::Nullable<Models::AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
/**
* @brief Indicates the priority with which to rehydrate an archived blob. The priority
@ -697,7 +697,7 @@ namespace Azure { namespace Storage { namespace Blobs {
/**
* @brief Indicates the tier to be set on blob.
*/
Azure::Nullable<Models::AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
/**
* @brief Optional conditions that must be met to perform this operation.
@ -723,7 +723,7 @@ namespace Azure { namespace Storage { namespace Blobs {
/**
* @brief Indicates the tier to be set on blob.
*/
Azure::Nullable<Models::AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
struct
{
@ -812,7 +812,7 @@ namespace Azure { namespace Storage { namespace Blobs {
/**
* @brief Indicates the tier to be set on blob.
*/
Azure::Nullable<Models::AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
/**
* @brief Optional conditions that must be met to perform this operation.
@ -936,7 +936,7 @@ namespace Azure { namespace Storage { namespace Blobs {
/**
* @brief Indicates the tier to be set on blob.
*/
Azure::Nullable<Models::AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
/**
* @brief Optional conditions that must be met to perform this operation.

36
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
View File

@ -943,7 +943,7 @@ namespace Azure { namespace Storage { namespace Blobs {
Azure::Nullable<Azure::DateTime> LastAccessedOn;
Azure::DateTime LastModified;
Azure::ETag ETag;
Azure::Nullable<AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
Azure::Nullable<bool> IsAccessTierInferred;
Models::LeaseStatus LeaseStatus = Models::LeaseStatus::Unlocked;
Models::LeaseState LeaseState = Models::LeaseState::Available;
@ -977,7 +977,7 @@ namespace Azure { namespace Storage { namespace Blobs {
bool IsServerEncrypted = false;
Azure::Nullable<std::vector<uint8_t>> EncryptionKeySha256;
Azure::Nullable<std::string> EncryptionScope;
Azure::Nullable<AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
Azure::Nullable<bool> IsAccessTierInferred;
Azure::Nullable<Models::ArchiveStatus> ArchiveStatus;
Azure::Nullable<Models::RehydratePriority> RehydratePriority;
@ -4357,7 +4357,7 @@ namespace Azure { namespace Storage { namespace Blobs {
path.size() == 2 && path[0] == XmlTagName::k_Properties
&& path[1] == XmlTagName::k_AccessTier)
{
ret.Details.Tier = AccessTier(node.Value);
ret.Details.AccessTier = AccessTier(node.Value);
}
else if (
path.size() == 2 && path[0] == XmlTagName::k_Properties
@ -5364,7 +5364,7 @@ namespace Azure { namespace Storage { namespace Blobs {
auto x_ms_access_tier__iterator = httpResponse.GetHeaders().find("x-ms-access-tier");
if (x_ms_access_tier__iterator != httpResponse.GetHeaders().end())
{
response.Tier = AccessTier(x_ms_access_tier__iterator->second);
response.AccessTier = AccessTier(x_ms_access_tier__iterator->second);
}
auto x_ms_access_tier_inferred__iterator
= httpResponse.GetHeaders().find("x-ms-access-tier-inferred");
@ -5703,7 +5703,7 @@ namespace Azure { namespace Storage { namespace Blobs {
struct SetBlobAccessTierOptions
{
Azure::Nullable<int32_t> Timeout;
AccessTier Tier;
Models::AccessTier AccessTier;
Azure::Nullable<Models::RehydratePriority> RehydratePriority;
Azure::Nullable<std::string> IfTags;
}; // struct SetBlobAccessTierOptions
@ -5722,7 +5722,7 @@ namespace Azure { namespace Storage { namespace Blobs {
request.GetUrl().AppendQueryParameter(
"timeout", std::to_string(options.Timeout.GetValue()));
}
request.SetHeader("x-ms-access-tier", options.Tier.ToString());
request.SetHeader("x-ms-access-tier", options.AccessTier.ToString());
if (options.RehydratePriority.HasValue())
{
request.SetHeader(
@ -5771,7 +5771,7 @@ namespace Azure { namespace Storage { namespace Blobs {
std::string SourceUri;
Azure::Nullable<std::string> LeaseId;
Azure::Nullable<std::string> SourceLeaseId;
Azure::Nullable<AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
Azure::Nullable<Models::RehydratePriority> RehydratePriority;
Azure::Nullable<Azure::DateTime> IfModifiedSince;
Azure::Nullable<Azure::DateTime> IfUnmodifiedSince;
@ -5814,9 +5814,9 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.SetHeader("x-ms-source-lease-id", options.SourceLeaseId.GetValue());
}
if (options.Tier.HasValue())
if (options.AccessTier.HasValue())
{
request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString());
request.SetHeader("x-ms-access-tier", options.AccessTier.GetValue().ToString());
}
if (options.RehydratePriority.HasValue())
{
@ -6680,7 +6680,7 @@ namespace Azure { namespace Storage { namespace Blobs {
BlobHttpHeaders HttpHeaders;
Storage::Metadata Metadata;
Azure::Nullable<std::string> LeaseId;
Azure::Nullable<AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
Azure::Nullable<std::string> EncryptionKey;
Azure::Nullable<std::vector<uint8_t>> EncryptionKeySha256;
Azure::Nullable<EncryptionAlgorithmType> EncryptionAlgorithm;
@ -6781,9 +6781,9 @@ namespace Azure { namespace Storage { namespace Blobs {
request.SetHeader("x-ms-lease-id", options.LeaseId.GetValue());
}
request.SetHeader("x-ms-blob-type", "BlockBlob");
if (options.Tier.HasValue())
if (options.AccessTier.HasValue())
{
request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString());
request.SetHeader("x-ms-access-tier", options.AccessTier.GetValue().ToString());
}
if (options.IfModifiedSince.HasValue())
{
@ -7160,7 +7160,7 @@ namespace Azure { namespace Storage { namespace Blobs {
Azure::ETag IfMatch;
Azure::ETag IfNoneMatch;
Azure::Nullable<std::string> IfTags;
Azure::Nullable<AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
}; // struct CommitBlockListOptions
static Azure::Response<CommitBlockListResult> CommitBlockList(
@ -7243,9 +7243,9 @@ namespace Azure { namespace Storage { namespace Blobs {
{
request.SetHeader("x-ms-encryption-scope", options.EncryptionScope.GetValue());
}
if (options.Tier.HasValue())
if (options.AccessTier.HasValue())
{
request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString());
request.SetHeader("x-ms-access-tier", options.AccessTier.GetValue().ToString());
}
if (options.IfModifiedSince.HasValue())
{
@ -7523,7 +7523,7 @@ namespace Azure { namespace Storage { namespace Blobs {
BlobHttpHeaders HttpHeaders;
Storage::Metadata Metadata;
Azure::Nullable<std::string> LeaseId;
Azure::Nullable<AccessTier> Tier;
Azure::Nullable<Models::AccessTier> AccessTier;
Azure::Nullable<std::string> EncryptionKey;
Azure::Nullable<std::vector<uint8_t>> EncryptionKeySha256;
Azure::Nullable<EncryptionAlgorithmType> EncryptionAlgorithm;
@ -7592,9 +7592,9 @@ namespace Azure { namespace Storage { namespace Blobs {
request.SetHeader(
"x-ms-blob-sequence-number", std::to_string(options.SequenceNumber.GetValue()));
}
if (options.Tier.HasValue())
if (options.AccessTier.HasValue())
{
request.SetHeader("x-ms-access-tier", options.Tier.GetValue().ToString());
request.SetHeader("x-ms-access-tier", options.AccessTier.GetValue().ToString());
}
if (options.EncryptionKey.HasValue())
{

6
sdk/storage/azure-storage-blobs/src/blob_client.cpp
View File

@ -462,7 +462,7 @@ namespace Azure { namespace Storage { namespace Blobs {
}
auto response = _detail::BlobRestClient::Blob::GetProperties(
*m_pipeline, m_blobUrl, protocolLayerOptions, _internal::WithReplicaStatus(context));
if (response->Tier.HasValue() && !response->IsAccessTierInferred.HasValue())
if (response->AccessTier.HasValue() && !response->IsAccessTierInferred.HasValue())
{
response->IsAccessTierInferred = false;
}
@ -528,7 +528,7 @@ namespace Azure { namespace Storage { namespace Blobs {
const Azure::Core::Context& context) const
{
_detail::BlobRestClient::Blob::SetBlobAccessTierOptions protocolLayerOptions;
protocolLayerOptions.Tier = tier;
protocolLayerOptions.AccessTier = tier;
protocolLayerOptions.RehydratePriority = options.RehydratePriority;
return _detail::BlobRestClient::Blob::SetAccessTier(
*m_pipeline, m_blobUrl, protocolLayerOptions, context);
@ -542,7 +542,7 @@ namespace Azure { namespace Storage { namespace Blobs {
_detail::BlobRestClient::Blob::StartBlobCopyFromUriOptions protocolLayerOptions;
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.SourceUri = sourceUri;
protocolLayerOptions.Tier = options.Tier;
protocolLayerOptions.AccessTier = options.AccessTier;
protocolLayerOptions.RehydratePriority = options.RehydratePriority;
protocolLayerOptions.LeaseId = options.AccessConditions.LeaseId;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;

2
sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
View File

@ -245,7 +245,7 @@ namespace Azure { namespace Storage { namespace Blobs {
_internal::WithReplicaStatus(context));
for (auto& i : response->Items)
{
if (i.Details.Tier.HasValue() && !i.Details.IsAccessTierInferred.HasValue())
if (i.Details.AccessTier.HasValue() && !i.Details.IsAccessTierInferred.HasValue())
{
i.Details.IsAccessTierInferred = false;
}

12
sdk/storage/azure-storage-blobs/src/block_blob_client.cpp
View File

@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Blobs {
protocolLayerOptions.TransactionalContentHash = options.TransactionalContentHash;
protocolLayerOptions.HttpHeaders = options.HttpHeaders;
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.Tier = options.Tier;
protocolLayerOptions.AccessTier = options.AccessTier;
protocolLayerOptions.LeaseId = options.AccessConditions.LeaseId;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
@ -120,7 +120,7 @@ namespace Azure { namespace Storage { namespace Blobs {
UploadBlockBlobOptions uploadBlockBlobOptions;
uploadBlockBlobOptions.HttpHeaders = options.HttpHeaders;
uploadBlockBlobOptions.Metadata = options.Metadata;
uploadBlockBlobOptions.Tier = options.Tier;
uploadBlockBlobOptions.AccessTier = options.AccessTier;
return Upload(contentStream, uploadBlockBlobOptions, context);
}
@ -153,7 +153,7 @@ namespace Azure { namespace Storage { namespace Blobs {
CommitBlockListOptions commitBlockListOptions;
commitBlockListOptions.HttpHeaders = options.HttpHeaders;
commitBlockListOptions.Metadata = options.Metadata;
commitBlockListOptions.Tier = options.Tier;
commitBlockListOptions.AccessTier = options.AccessTier;
auto commitBlockListResponse = CommitBlockList(blockIds, commitBlockListOptions, context);
Models::UploadBlockBlobFromResult ret;
@ -182,7 +182,7 @@ namespace Azure { namespace Storage { namespace Blobs {
UploadBlockBlobOptions uploadBlockBlobOptions;
uploadBlockBlobOptions.HttpHeaders = options.HttpHeaders;
uploadBlockBlobOptions.Metadata = options.Metadata;
uploadBlockBlobOptions.Tier = options.Tier;
uploadBlockBlobOptions.AccessTier = options.AccessTier;
return Upload(contentStream, uploadBlockBlobOptions, context);
}
}
@ -225,7 +225,7 @@ namespace Azure { namespace Storage { namespace Blobs {
CommitBlockListOptions commitBlockListOptions;
commitBlockListOptions.HttpHeaders = options.HttpHeaders;
commitBlockListOptions.Metadata = options.Metadata;
commitBlockListOptions.Tier = options.Tier;
commitBlockListOptions.AccessTier = options.AccessTier;
auto commitBlockListResponse = CommitBlockList(blockIds, commitBlockListOptions, context);
Models::UploadBlockBlobFromResult result;
@ -300,7 +300,7 @@ namespace Azure { namespace Storage { namespace Blobs {
}
protocolLayerOptions.HttpHeaders = options.HttpHeaders;
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.Tier = options.Tier;
protocolLayerOptions.AccessTier = options.AccessTier;
protocolLayerOptions.LeaseId = options.AccessConditions.LeaseId;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;

2
sdk/storage/azure-storage-blobs/src/page_blob_client.cpp
View File

@ -85,7 +85,7 @@ namespace Azure { namespace Storage { namespace Blobs {
protocolLayerOptions.SequenceNumber = options.SequenceNumber;
protocolLayerOptions.HttpHeaders = options.HttpHeaders;
protocolLayerOptions.Metadata = options.Metadata;
protocolLayerOptions.Tier = options.Tier;
protocolLayerOptions.AccessTier = options.AccessTier;
protocolLayerOptions.LeaseId = options.AccessConditions.LeaseId;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;

6
sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
View File

@ -181,12 +181,12 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_FALSE(blob.BlobType.ToString().empty());
if (blob.BlobType == Blobs::Models::BlobType::BlockBlob)
{
EXPECT_TRUE(blob.Details.Tier.HasValue());
EXPECT_TRUE(blob.Details.AccessTier.HasValue());
EXPECT_TRUE(blob.Details.IsAccessTierInferred.HasValue());
}
if (blob.Details.Tier.HasValue())
if (blob.Details.AccessTier.HasValue())
{
EXPECT_FALSE(blob.Details.Tier.GetValue().ToString().empty());
EXPECT_FALSE(blob.Details.AccessTier.GetValue().ToString().empty());
}
if (blob.BlobType == Blobs::Models::BlobType::AppendBlob)
{

22
sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
View File

@ -49,7 +49,7 @@ namespace Azure { namespace Storage { namespace Test {
m_blobUploadOptions.HttpHeaders.CacheControl = "no-cache";
m_blobUploadOptions.HttpHeaders.ContentEncoding = "identity";
m_blobUploadOptions.HttpHeaders.ContentHash.Value.clear();
m_blobUploadOptions.Tier = Azure::Storage::Blobs::Models::AccessTier::Hot;
m_blobUploadOptions.AccessTier = Azure::Storage::Blobs::Models::AccessTier::Hot;
auto blobContent
= Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size());
m_blockBlobClient->Upload(blobContent, m_blobUploadOptions);
@ -368,7 +368,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_EQ(res->BlobSize, static_cast<int64_t>(m_blobContent.size()));
EXPECT_EQ(res->HttpHeaders, m_blobUploadOptions.HttpHeaders);
EXPECT_EQ(res->HttpHeaders.ContentHash.Algorithm, Storage::HashAlgorithm::Md5);
EXPECT_EQ(res->Tier.GetValue(), Azure::Storage::Blobs::Models::AccessTier::Cool);
EXPECT_EQ(res->AccessTier.GetValue(), Azure::Storage::Blobs::Models::AccessTier::Cool);
EXPECT_TRUE(IsValidTime(res->AccessTierChangedOn.GetValue()));
}
@ -816,7 +816,7 @@ namespace Azure { namespace Storage { namespace Test {
options.HttpHeaders = m_blobUploadOptions.HttpHeaders;
options.HttpHeaders.ContentHash.Value.clear();
options.Metadata = m_blobUploadOptions.Metadata;
options.Tier = m_blobUploadOptions.Tier;
options.AccessTier = m_blobUploadOptions.AccessTier;
auto res = blockBlobClient.UploadFrom(
blobContent.data(), static_cast<std::size_t>(blobSize), options);
EXPECT_TRUE(res->ETag.HasValue());
@ -826,7 +826,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_EQ(properties.BlobSize, blobSize);
EXPECT_EQ(properties.HttpHeaders, options.HttpHeaders);
EXPECT_EQ(properties.Metadata, options.Metadata);
EXPECT_EQ(properties.Tier.GetValue(), options.Tier.GetValue());
EXPECT_EQ(properties.AccessTier.GetValue(), options.AccessTier.GetValue());
EXPECT_EQ(properties.ETag, res->ETag);
EXPECT_EQ(properties.LastModified, res->LastModified);
std::vector<uint8_t> downloadContent(static_cast<std::size_t>(blobSize), '\x00');
@ -846,7 +846,7 @@ namespace Azure { namespace Storage { namespace Test {
options.HttpHeaders = m_blobUploadOptions.HttpHeaders;
options.HttpHeaders.ContentHash.Value.clear();
options.Metadata = m_blobUploadOptions.Metadata;
options.Tier = m_blobUploadOptions.Tier;
options.AccessTier = m_blobUploadOptions.AccessTier;
std::string tempFilename = RandomString();
{
@ -861,7 +861,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_EQ(properties.BlobSize, blobSize);
EXPECT_EQ(properties.HttpHeaders, options.HttpHeaders);
EXPECT_EQ(properties.Metadata, options.Metadata);
EXPECT_EQ(properties.Tier.GetValue(), options.Tier.GetValue());
EXPECT_EQ(properties.AccessTier.GetValue(), options.AccessTier.GetValue());
EXPECT_EQ(properties.ETag, res->ETag);
EXPECT_EQ(properties.LastModified, res->LastModified);
std::vector<uint8_t> downloadContent(static_cast<std::size_t>(blobSize), '\x00');
@ -970,7 +970,7 @@ namespace Azure { namespace Storage { namespace Test {
blobClient.UploadFrom(emptyContent.data(), emptyContent.size());
auto properties = *blobClient.GetProperties();
ASSERT_TRUE(properties.Tier.HasValue());
ASSERT_TRUE(properties.AccessTier.HasValue());
ASSERT_TRUE(properties.IsAccessTierInferred.HasValue());
EXPECT_TRUE(properties.IsAccessTierInferred.GetValue());
EXPECT_FALSE(properties.AccessTierChangedOn.HasValue());
@ -985,7 +985,7 @@ namespace Azure { namespace Storage { namespace Test {
{
if (blob.Name == blobName)
{
ASSERT_TRUE(blob.Details.Tier.HasValue());
ASSERT_TRUE(blob.Details.AccessTier.HasValue());
ASSERT_TRUE(blob.Details.IsAccessTierInferred.HasValue());
EXPECT_TRUE(blob.Details.IsAccessTierInferred.GetValue());
}
@ -993,13 +993,13 @@ namespace Azure { namespace Storage { namespace Test {
} while (options.ContinuationToken.HasValue());
// choose a different tier
auto targetTier = properties.Tier.GetValue() == Blobs::Models::AccessTier::Hot
auto targetTier = properties.AccessTier.GetValue() == Blobs::Models::AccessTier::Hot
? Blobs::Models::AccessTier::Cool
: Blobs::Models::AccessTier::Hot;
blobClient.SetAccessTier(targetTier);
properties = *blobClient.GetProperties();
ASSERT_TRUE(properties.Tier.HasValue());
ASSERT_TRUE(properties.AccessTier.HasValue());
ASSERT_TRUE(properties.IsAccessTierInferred.HasValue());
EXPECT_FALSE(properties.IsAccessTierInferred.GetValue());
EXPECT_TRUE(properties.AccessTierChangedOn.HasValue());
@ -1012,7 +1012,7 @@ namespace Azure { namespace Storage { namespace Test {
{
if (blob.Name == blobName)
{
ASSERT_TRUE(blob.Details.Tier.HasValue());
ASSERT_TRUE(blob.Details.AccessTier.HasValue());
ASSERT_TRUE(blob.Details.IsAccessTierInferred.HasValue());
EXPECT_FALSE(blob.Details.IsAccessTierInferred.GetValue());
}