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

HttpHeaders.ContentMd5 is changed to Contenthash (#1241)

Browse Source 
* HttpHeaders.ContentMd5 is changed to Contenthash

* changelog
This commit is contained in:
JinmingHu 2020-12-22 15:13:20 +08:00 committed by GitHub
parent d9c65ac445
commit 37b55c1e11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 380 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,8 @@
- `PageBlobClient::GetPageRanges` doesn't support getting difference between current blob and a snapshot anymore. Use `PageBlobClient::GetPageRangesDiff` instead.
- Move Blob SAS into `Azure::Storage::Sas` namespace.
- Replace all transactional content MD5/CRC64 with `ContentHash` struct.
- `ContentMd5` HTTP header and `EncrytionKeySha256` are changed to binary(`std::vector<uint8_t>`).
- `EncrytionKeySha256` is changed to binary(`std::vector<uint8_t>`).
- `ContentMd5` HTTP header is renamed to `ContentHash`, the type is also changed to `ContentHash`.
- `ServerEncrypted` fields are renamed to `IsServerEncrypted`, and changed to non-nullable type.
- Add `Is` prefix to bool variable names. Like `IsAccessTierInferred`, `IsDeleted`.
- `IsServerEncrypted`, `EncryptionKeySha256` and `EncryptionScope` are removed from `ClearPageBlobPagesResult`, since they are never returned from storage server.

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

File diff suppressed because it is too large Load Diff

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

@ -27,13 +27,13 @@ namespace Azure { namespace Storage { namespace Test {
m_blobUploadOptions.HttpHeaders.ContentDisposition = "attachment";
m_blobUploadOptions.HttpHeaders.CacheControl = "no-cache";
m_blobUploadOptions.HttpHeaders.ContentEncoding = "identify";
m_blobUploadOptions.HttpHeaders.ContentMd5.clear();
m_blobUploadOptions.HttpHeaders.ContentHash.Value.clear();
m_appendBlobClient->Create(m_blobUploadOptions);
auto blockContent
= Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size());
m_appendBlobClient->AppendBlock(&blockContent);
m_blobUploadOptions.HttpHeaders.ContentMd5
= m_appendBlobClient->GetProperties()->HttpHeaders.ContentMd5;
m_blobUploadOptions.HttpHeaders.ContentHash
= m_appendBlobClient->GetProperties()->HttpHeaders.ContentHash;
}
void AppendBlobClientTest::TearDownTestSuite() { BlobContainerClientTest::TearDownTestSuite(); }

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

@ -15,7 +15,9 @@ namespace Azure { namespace Storage { namespace Blobs { namespace Models {
bool operator==(const BlobHttpHeaders& lhs, const BlobHttpHeaders& rhs)
{
return lhs.ContentType == rhs.ContentType && lhs.ContentEncoding == rhs.ContentEncoding
&& lhs.ContentLanguage == rhs.ContentLanguage && lhs.ContentMd5 == rhs.ContentMd5
&& lhs.ContentLanguage == rhs.ContentLanguage
&& lhs.ContentHash.Value == rhs.ContentHash.Value
&& lhs.ContentHash.Algorithm == rhs.ContentHash.Algorithm
&& lhs.CacheControl == rhs.CacheControl && lhs.ContentDisposition == rhs.ContentDisposition;
}
@ -45,13 +47,13 @@ namespace Azure { namespace Storage { namespace Test {
m_blobUploadOptions.HttpHeaders.ContentDisposition = "attachment";
m_blobUploadOptions.HttpHeaders.CacheControl = "no-cache";
m_blobUploadOptions.HttpHeaders.ContentEncoding = "identity";
m_blobUploadOptions.HttpHeaders.ContentMd5.clear();
m_blobUploadOptions.HttpHeaders.ContentHash.Value.clear();
m_blobUploadOptions.Tier = Azure::Storage::Blobs::Models::AccessTier::Hot;
auto blobContent
= Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size());
m_blockBlobClient->Upload(&blobContent, m_blobUploadOptions);
m_blobUploadOptions.HttpHeaders.ContentMd5
= m_blockBlobClient->GetProperties()->HttpHeaders.ContentMd5;
m_blobUploadOptions.HttpHeaders.ContentHash
= m_blockBlobClient->GetProperties()->HttpHeaders.ContentHash;
}
void BlockBlobClientTest::TearDownTestSuite() { BlobContainerClientTest::TearDownTestSuite(); }
@ -259,6 +261,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_EQ(res->Metadata, m_blobUploadOptions.Metadata);
EXPECT_EQ(res->ContentLength, 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_FALSE(res->AccessTierChangeTime.GetValue().empty());
}
@ -661,7 +664,7 @@ namespace Azure { namespace Storage { namespace Test {
options.ChunkSize = 1_MB;
options.Concurrency = concurrency;
options.HttpHeaders = m_blobUploadOptions.HttpHeaders;
options.HttpHeaders.ContentMd5.clear();
options.HttpHeaders.ContentHash.Value.clear();
options.Metadata = m_blobUploadOptions.Metadata;
options.Tier = m_blobUploadOptions.Tier;
auto res = blockBlobClient.UploadFrom(
@ -669,7 +672,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_FALSE(res->ETag.empty());
EXPECT_FALSE(res->LastModified.empty());
auto properties = *blockBlobClient.GetProperties();
properties.HttpHeaders.ContentMd5.clear();
properties.HttpHeaders.ContentHash.Value.clear();
EXPECT_EQ(properties.ContentLength, blobSize);
EXPECT_EQ(properties.HttpHeaders, options.HttpHeaders);
EXPECT_EQ(properties.Metadata, options.Metadata);
@ -691,7 +694,7 @@ namespace Azure { namespace Storage { namespace Test {
options.ChunkSize = 1_MB;
options.Concurrency = concurrency;
options.HttpHeaders = m_blobUploadOptions.HttpHeaders;
options.HttpHeaders.ContentMd5.clear();
options.HttpHeaders.ContentHash.Value.clear();
options.Metadata = m_blobUploadOptions.Metadata;
options.Tier = m_blobUploadOptions.Tier;
@ -704,7 +707,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_FALSE(res->ETag.empty());
EXPECT_FALSE(res->LastModified.empty());
auto properties = *blockBlobClient.GetProperties();
properties.HttpHeaders.ContentMd5.clear();
properties.HttpHeaders.ContentHash.Value.clear();
EXPECT_EQ(properties.ContentLength, blobSize);
EXPECT_EQ(properties.HttpHeaders, options.HttpHeaders);
EXPECT_EQ(properties.Metadata, options.Metadata);

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

@ -33,13 +33,13 @@ namespace Azure { namespace Storage { namespace Test {
m_blobUploadOptions.HttpHeaders.ContentDisposition = "attachment";
m_blobUploadOptions.HttpHeaders.CacheControl = "no-cache";
m_blobUploadOptions.HttpHeaders.ContentEncoding = "identity";
m_blobUploadOptions.HttpHeaders.ContentMd5.clear();
m_blobUploadOptions.HttpHeaders.ContentHash.Value.clear();
m_pageBlobClient->Create(m_blobContent.size(), m_blobUploadOptions);
auto pageContent
= Azure::Core::Http::MemoryBodyStream(m_blobContent.data(), m_blobContent.size());
m_pageBlobClient->UploadPages(0, &pageContent);
m_blobUploadOptions.HttpHeaders.ContentMd5
= m_pageBlobClient->GetProperties()->HttpHeaders.ContentMd5;
m_blobUploadOptions.HttpHeaders.ContentHash
= m_pageBlobClient->GetProperties()->HttpHeaders.ContentHash;
}
void PageBlobClientTest::TearDownTestSuite() { BlobContainerClientTest::TearDownTestSuite(); }