Skip to content

fix LROs in keyvault #3952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gearama merged 7 commits into from
Oct 3, 2022
Merged

fix LROs in keyvault #3952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
397b8a9
fix LROs in keyvault
gearama Sep 20, 2022
5142270
qfe
gearama Sep 26, 2022
6b719d3
some cleanup
gearama Sep 26, 2022
473c143
fdd
gearama Sep 26, 2022
5e0ab38
clangs
gearama Sep 26, 2022
01271a6
correct fix
gearama Sep 26, 2022
6872260
oops
gearama Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ TEST_F(KeyVaultCertificateClientTest, CreateCertificate)

{
auto response = client.StartDeleteCertificate(certificateName);
// double polling should not have an impact on the result
auto result = response.PollUntilDone(m_defaultWait);
result = response.PollUntilDone(m_defaultWait);
EXPECT_EQ(result.Value.Name(), certificateName);
EXPECT_EQ(result.Value.Properties.Enabled.Value(), true);
EXPECT_NE(result.Value.RecoveryIdUrl.length(), size_t(0));
Expand Down Expand Up @@ -64,8 +66,9 @@ TEST_F(KeyVaultCertificateClientTest, CreateCertificateResumeToken)

auto fromToken
= CreateCertificateOperation::CreateFromResumeToken(response.GetResumeToken(), client);

// double polling should not have an impact on the result
auto result = fromToken.PollUntilDone(m_defaultWait);
result = fromToken.PollUntilDone(m_defaultWait);

auto cert = client.GetCertificate(certificateName);
EXPECT_EQ(cert.Value.Name(), options.Properties.Name);
Expand Down Expand Up @@ -192,7 +195,9 @@ TEST_F(KeyVaultCertificateClientTest, GetDeletedCertificate)
}
{
auto response = client.StartRecoverDeletedCertificate(certificateName);
// double polling should not have an impact on the result
auto result = response.PollUntilDone(m_defaultWait);
result = response.PollUntilDone(m_defaultWait);
EXPECT_EQ(result.Value.Name(), certificateName);
}
{
Expand Down
181 changes: 104 additions & 77 deletions ...ault-certificates/test/ut/recordings/KeyVaultCertificateClientTest.CreateCertificate.json
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions ...icates/test/ut/recordings/KeyVaultCertificateClientTest.CreateCertificateResumeToken.json
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 25 additions & 27 deletions sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,36 @@ Azure::Security::KeyVault::Keys::DeleteKeyOperation::PollInternal(
Azure::Core::Context const& context)
{
std::unique_ptr<Azure::Core::Http::RawResponse> rawResponse;
if (!IsDone())

try
{
try
{
rawResponse = m_keyClient->GetDeletedKey(m_value.Name(), context).RawResponse;
}
catch (Azure::Core::RequestFailedException& error)
{
rawResponse = std::move(error.RawResponse);
}
rawResponse = m_keyClient->GetDeletedKey(m_value.Name(), context).RawResponse;
}
catch (Azure::Core::RequestFailedException& error)
{
rawResponse = std::move(error.RawResponse);
}

switch (rawResponse->GetStatusCode())
switch (rawResponse->GetStatusCode())
{
case Azure::Core::Http::HttpStatusCode::Ok:
case Azure::Core::Http::HttpStatusCode::Forbidden: // Access denied but proof the key was
// deleted.
{
case Azure::Core::Http::HttpStatusCode::Ok:
case Azure::Core::Http::HttpStatusCode::Forbidden: // Access denied but proof the key was
// deleted.
{
m_status = Azure::Core::OperationStatus::Succeeded;
break;
}
case Azure::Core::Http::HttpStatusCode::NotFound: {
m_status = Azure::Core::OperationStatus::Running;
break;
}
default:
throw Azure::Core::RequestFailedException(rawResponse);
m_status = Azure::Core::OperationStatus::Succeeded;
break;
}

if (m_status == Azure::Core::OperationStatus::Succeeded)
{
m_value = _detail::DeletedKeySerializer::DeletedKeyDeserialize(m_value.Name(), *rawResponse);
case Azure::Core::Http::HttpStatusCode::NotFound: {
m_status = Azure::Core::OperationStatus::Running;
break;
}
default:
throw Azure::Core::RequestFailedException(rawResponse);
}

if (m_status == Azure::Core::OperationStatus::Succeeded)
{
m_value = _detail::DeletedKeySerializer::DeletedKeyDeserialize(m_value.Name(), *rawResponse);
}

// To ensure the success of calling Poll multiple times, even after operation is completed, a
Expand Down
51 changes: 24 additions & 27 deletions sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,34 @@ Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::PollInternal(
Azure::Core::Context const& context)
{
std::unique_ptr<Azure::Core::Http::RawResponse> rawResponse;
if (!IsDone())

try
{
try
{
rawResponse = m_keyClient->GetKey(m_value.Name(), {}, context).RawResponse;
}
catch (Azure::Core::RequestFailedException& error)
{
rawResponse = std::move(error.RawResponse);
}
rawResponse = m_keyClient->GetKey(m_value.Name(), {}, context).RawResponse;
}
catch (Azure::Core::RequestFailedException& error)
{
rawResponse = std::move(error.RawResponse);
}

switch (rawResponse->GetStatusCode())
{
case Azure::Core::Http::HttpStatusCode::Ok:
// Access denied but proof the key was deleted.
case Azure::Core::Http::HttpStatusCode::Forbidden: {
m_status = Azure::Core::OperationStatus::Succeeded;
break;
}
case Azure::Core::Http::HttpStatusCode::NotFound: {
m_status = Azure::Core::OperationStatus::Running;
break;
}
default:
throw Azure::Core::RequestFailedException(rawResponse);
switch (rawResponse->GetStatusCode())
{
case Azure::Core::Http::HttpStatusCode::Ok:
// Access denied but proof the key was deleted.
case Azure::Core::Http::HttpStatusCode::Forbidden: {
m_status = Azure::Core::OperationStatus::Succeeded;
break;
}
if (m_status == Azure::Core::OperationStatus::Succeeded)
{
m_value
= _detail::KeyVaultKeySerializer::KeyVaultKeyDeserialize(m_value.Name(), *rawResponse);
case Azure::Core::Http::HttpStatusCode::NotFound: {
m_status = Azure::Core::OperationStatus::Running;
break;
}
default:
throw Azure::Core::RequestFailedException(rawResponse);
}
if (m_status == Azure::Core::OperationStatus::Succeeded)
{
m_value = _detail::KeyVaultKeySerializer::KeyVaultKeyDeserialize(m_value.Name(), *rawResponse);
}

// To ensure the success of calling Poll multiple times, even after operation is completed, a
Expand Down
6 changes: 6 additions & 0 deletions sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ TEST_F(KeyVaultKeyClient, DeleteKey)
EXPECT_EQ(keyResponseLRO.GetResumeToken(), expectedStatusToken);
// poll each second until key is soft-deleted
// Will throw and fail test if test takes more than 3 minutes (token cancelled)
// double polling should not interfere with the outcome
auto keyResponse = keyResponseLRO.PollUntilDone(m_testPollingIntervalMs, cancelToken);
keyResponse = keyResponseLRO.PollUntilDone(m_testPollingIntervalMs, cancelToken);
}
}

Expand Down Expand Up @@ -353,6 +355,8 @@ TEST_F(KeyVaultKeyClient, RecoverOperationResumeToken)
auto resumeOperation
= Azure::Security::KeyVault::Keys::DeleteKeyOperation::CreateFromResumeToken(
resumeToken, client);
// double polling should have no impact on the result
resumeOperation.PollUntilDone(m_testPollingIntervalMs);
resumeOperation.PollUntilDone(m_testPollingIntervalMs);
}
{
Expand All @@ -365,7 +369,9 @@ TEST_F(KeyVaultKeyClient, RecoverOperationResumeToken)
auto resumeRecoveryOp
= Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::CreateFromResumeToken(
resumeToken, client);
// double polling should have no impact on the result
auto keyResponse = resumeRecoveryOp.PollUntilDone(m_testPollingIntervalMs);
keyResponse = resumeRecoveryOp.PollUntilDone(m_testPollingIntervalMs);
auto key = keyResponse.Value;
}
}
Loading