From 80e61d89297163fa818373f20027ef2f9c0f57eb Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Thu, 1 Apr 2021 01:21:50 -0700 Subject: [PATCH] Add a forward slash at the end of the key vault URL to match what the portal returns. (#2017) * Add a forward slash at the end of the key vault URL to match what the portal returns. * Don't add the extra `/` in the expected token within tests. * Fix another instance of extra `/`. Co-authored-by: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> --- .../test/ut/key_client_delete_test_live.cpp | 4 ++-- sdk/keyvault/test-resources.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp index de5070848..1470a3dfa 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp @@ -62,7 +62,7 @@ TEST_F(KeyVaultClientTest, DeleteKey) auto cancelToken = Azure::Core::Context::GetApplicationContext().WithDeadline(duration); auto keyResponseLRO = keyClient.StartDeleteKey(keyName); - auto expectedStatusToken = m_keyVaultUrl + "/" + auto expectedStatusToken = m_keyVaultUrl + std::string(Azure::Security::KeyVault::Keys::_detail::DeletedKeysPath) + "/" + keyName; EXPECT_EQ(keyResponseLRO.GetResumeToken(), expectedStatusToken); // poll each second until key is soft-deleted @@ -305,7 +305,7 @@ TEST_F(KeyVaultClientTest, GetDeletedKey) auto cancelToken = Azure::Core::Context::GetApplicationContext().WithDeadline(duration); auto keyResponseLRO = keyClient.StartDeleteKey(keyName); - auto expectedStatusToken = m_keyVaultUrl + "/" + auto expectedStatusToken = m_keyVaultUrl + std::string(Azure::Security::KeyVault::Keys::_detail::DeletedKeysPath) + "/" + keyName; auto keyResponse = keyResponseLRO.PollUntilDone(std::chrono::milliseconds(1000), cancelToken); } diff --git a/sdk/keyvault/test-resources.json b/sdk/keyvault/test-resources.json index e973ec8fd..4d98cd08e 100644 --- a/sdk/keyvault/test-resources.json +++ b/sdk/keyvault/test-resources.json @@ -100,7 +100,7 @@ } }, "variables": { - "azureKeyVaultUrl": "[format('https://{0}{1}', parameters('baseName'), parameters('keyVaultDomainSuffix'))]" + "azureKeyVaultUrl": "[format('https://{0}{1}/', parameters('baseName'), parameters('keyVaultDomainSuffix'))]" }, "resources": [ { @@ -220,4 +220,4 @@ "value": "[parameters('testApplicationOid')]" } } -} \ No newline at end of file +}