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

- BlobServiceClient::UndeleteBlobContainer doesn't support restoring a deleted container under a different name anymore. (#2263)

Browse Source
This commit is contained in:
JinmingHu 2021-05-14 09:31:49 +08:00 committed by GitHub
parent f4febae12c
commit 8cc98320d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 16 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

@ -10,6 +10,7 @@
- `BlobLeaseClient::Change()` updates internal lease id.
- Removed `ContentType` from `GetBlockListResult`.
- Moved `GetPageRangesResult` to detail namespace.
- `BlobServiceClient::UndeleteBlobContainer` doesn't support restoring a deleted container under a different name anymore.
## 12.0.0-beta.10 (2021-04-16)

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

@ -293,11 +293,6 @@ namespace Azure { namespace Storage { namespace Blobs {
*/
struct UndeleteBlobContainerOptions final
{
/**
* @brief Use this parameter if you would like to restore the container under a
* different name.
*/
Azure::Nullable<std::string> DestinationBlobContainerName;
};
/**

7
sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
View File

@ -252,10 +252,9 @@ namespace Azure { namespace Storage { namespace Blobs {
const UndeleteBlobContainerOptions& options,
const Azure::Core::Context& context) const
{
std::string destinationBlobContainerName = options.DestinationBlobContainerName.HasValue()
? options.DestinationBlobContainerName.Value()
: deletedBlobContainerName;
auto blobContainerClient = GetBlobContainerClient(destinationBlobContainerName);
(void)options;
auto blobContainerClient = GetBlobContainerClient(deletedBlobContainerName);
_detail::BlobRestClient::BlobContainer::UndeleteBlobContainerOptions protocolLayerOptions;
protocolLayerOptions.DeletedBlobContainerName = deletedBlobContainerName;

10
sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
View File

@ -353,7 +353,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_THROW(containerClient.Value.GetProperties(), StorageException);
}
TEST_F(BlobServiceClientTest, DISABLED_UndeleteBlobContainer)
TEST_F(BlobServiceClientTest, UndeleteBlobContainer)
{
std::string containerName = LowercaseRandomString();
auto containerClient = m_blobServiceClient.GetBlobContainerClient(containerName);
@ -387,15 +387,12 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_TRUE(deletedContainerItem.Details.RemainingRetentionDays.HasValue());
EXPECT_GE(deletedContainerItem.Details.RemainingRetentionDays.Value(), 0);
std::string containerName2 = LowercaseRandomString();
for (int i = 0; i < 60; ++i)
{
try
{
Azure::Storage::Blobs::UndeleteBlobContainerOptions options;
options.DestinationBlobContainerName = containerName2;
m_blobServiceClient.UndeleteBlobContainer(
deletedContainerItem.Name, deletedContainerItem.VersionId.Value(), options);
deletedContainerItem.Name, deletedContainerItem.VersionId.Value());
break;
}
catch (StorageException& e)
@ -411,8 +408,7 @@ namespace Azure { namespace Storage { namespace Test {
}
}
}
auto containerClient2 = m_blobServiceClient.GetBlobContainerClient(containerName2);
EXPECT_NO_THROW(containerClient2.GetProperties());
EXPECT_NO_THROW(containerClient.GetProperties());
}
TEST_F(BlobServiceClientTest, UserDelegationKey)