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

remove the common namespace from keyvault (#2029)

Browse Source
This commit is contained in:
Victor Vazquez 2021-04-01 23:02:23 -07:00 committed by GitHub
parent 2348ad9d5a
commit 308e5363ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/client_options.hpp
View File

@ -14,7 +14,7 @@
#include <stdexcept>
#include <string>
namespace Azure { namespace Security { namespace KeyVault { namespace Common {
namespace Azure { namespace Security { namespace KeyVault {
/**
* @brief Available and supported service versions.
@ -72,4 +72,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
}
};
}}}} // namespace Azure::Security::KeyVault::Common
}}} // namespace Azure::Security::KeyVault

4
sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/base64url.hpp
View File

@ -13,7 +13,7 @@
#include <stdexcept>
#include <string>
namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _internal {
namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
/**
* @brief Provides conversion methods for base64url.
@ -56,4 +56,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
return Azure::Core::Convert::Base64Decode(base64url);
}
};
}}}}} // namespace Azure::Security::KeyVault::Common::_internal
}}}} // namespace Azure::Security::KeyVault::_internal

6
sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_pipeline.hpp
View File

@ -21,7 +21,7 @@
#include <string>
#include <vector>
namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _internal {
namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
/**
* @brief The HTTP pipeline used by KeyVault clients.
@ -188,10 +188,10 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
/**
* @brief Get the Vault Url which was used to create the
* #Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline.
* #Azure::Security::KeyVault::_internal::KeyVaultPipeline.
*
* @return The vault Url as string.
*/
std::string GetVaultUrl() const { return m_vaultUrl.GetAbsoluteUrl(); }
};
}}}}} // namespace Azure::Security::KeyVault::Common::_internal
}}}} // namespace Azure::Security::KeyVault::_internal

4
sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp
View File

@ -12,7 +12,7 @@
#include <chrono>
namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _internal {
namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
/**
* @brief Provides convertion methods for unix time to Azure Core Datetime.
@ -43,4 +43,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
return secondsSince1970.count();
}
};
}}}}} // namespace Azure::Security::KeyVault::Common::_internal
}}}} // namespace Azure::Security::KeyVault::_internal

4
sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp
View File

@ -8,7 +8,7 @@
#pragma once
namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _detail {
namespace Azure { namespace Security { namespace KeyVault { namespace _detail {
/***************** KeyVault headers *****************/
static constexpr char const ContentType[] = "content-type";
static constexpr char const ApplicationJson[] = "application/json";
@ -18,4 +18,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
/**************** KeyVault QueryParameters *********/
static constexpr char const ApiVersion[] = "api-version";
}}}}} // namespace Azure::Security::KeyVault::Common::_detail
}}}} // namespace Azure::Security::KeyVault::_detail

8
sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp
View File

@ -15,7 +15,7 @@
#include <stdexcept>
#include <string>
namespace Azure { namespace Security { namespace KeyVault { namespace Common {
namespace Azure { namespace Security { namespace KeyVault {
/**
* @brief The general exception thrown by the Key Vault SDK clients.
@ -73,7 +73,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
std::unique_ptr<Azure::Core::Http::RawResponse> RawResponse;
/**
* @brief Create a #Azure::Security::KeyVault::Common::KeyVaultException by parsing the \p
* @brief Create a #Azure::Security::KeyVault::KeyVaultException by parsing the \p
* response.
*
* @param response The Http raw response from the network.
@ -83,7 +83,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
std::unique_ptr<Azure::Core::Http::RawResponse> response);
/**
* @brief Create #Azure::Security::KeyVault::Common::KeyVaultException by parsing the \p
* @brief Create #Azure::Security::KeyVault::KeyVaultException by parsing the \p
* response reference.
*
* @param response The Http raw response from the network.
@ -91,4 +91,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
*/
static KeyVaultException CreateFromResponse(Azure::Core::Http::RawResponse const& response);
};
}}}} // namespace Azure::Security::KeyVault::Common
}}} // namespace Azure::Security::KeyVault

2
sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
View File

@ -9,7 +9,7 @@
#include <azure/core/internal/json/json.hpp>
#include <type_traits>
using namespace Azure::Security::KeyVault::Common;
using namespace Azure::Security::KeyVault;
namespace {

2
sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
View File

@ -5,7 +5,7 @@
#include "azure/keyvault/common/keyvault_constants.hpp"
#include "azure/keyvault/common/keyvault_exception.hpp"
using namespace Azure::Security::KeyVault::Common;
using namespace Azure::Security::KeyVault;
namespace {
inline Azure::Core::Http::Request InitRequest(

2
sdk/keyvault/azure-security-keyvault-common/test/ut/pipeline_test.cpp
View File

@ -10,7 +10,7 @@
#include <memory>
using namespace Azure::Security::KeyVault::Common::_internal;
using namespace Azure::Security::KeyVault::_internal;
TEST(KeyVaultPipeline, initPipeline)
{

5
sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/delete_key_operation.hpp
View File

@ -36,7 +36,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
* constructor is private and requires internal components.*/
friend class KeyClient;
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline> m_pipeline;
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
Azure::Security::KeyVault::Keys::DeletedKey m_value;
std::string m_continuationToken;
@ -72,8 +72,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
* Since C++ doesn't offer `internal` access, we use friends-only instead.
*/
DeleteKeyOperation(
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
keyvaultPipeline,
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
Azure::Response<Azure::Security::KeyVault::Keys::DeletedKey> response);
/**

2
sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
View File

@ -58,7 +58,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
class KeyClient {
protected:
// Using a shared pipeline for a client to share it with LRO (like delete key)
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline> m_pipeline;
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
public:
/**

6
sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
View File

@ -19,7 +19,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
* @brief Define the options to create an SDK Keys client.
*
*/
struct KeyClientOptions : public Azure::Security::KeyVault::Common::ClientOptions
struct KeyClientOptions : public Azure::Security::KeyVault::ClientOptions
{
/**
* @brief Construct a new Key Client Options object.
@ -27,8 +27,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
* @param version Optional version for the client.
*/
KeyClientOptions(
Azure::Security::KeyVault::Common::ServiceVersion version
= Azure::Security::KeyVault::Common::ServiceVersion::V7_2)
Azure::Security::KeyVault::ServiceVersion version
= Azure::Security::KeyVault::ServiceVersion::V7_2)
: ClientOptions(version)
{
}

5
sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/recover_deleted_key_operation.hpp
View File

@ -35,7 +35,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
* The constructor is private and requires internal components.*/
friend class KeyClient;
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline> m_pipeline;
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
Azure::Security::KeyVault::Keys::KeyVaultKey m_value;
std::string m_continuationToken;
@ -68,8 +68,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
* Since C++ doesn't offer `internal` access, we use friends-only instead.
*/
RecoverDeletedKeyOperation(
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
keyvaultPipeline,
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
Azure::Response<Azure::Security::KeyVault::Keys::KeyVaultKey> response);
/**

5
sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
View File

@ -23,7 +23,7 @@ inline Azure::Core::OperationStatus CheckCompleted(Azure::Core::Http::RawRespons
case Azure::Core::Http::HttpStatusCode::NotFound:
return Azure::Core::OperationStatus::Running;
default:
throw Azure::Security::KeyVault::Common::KeyVaultException::CreateFromResponse(response);
throw Azure::Security::KeyVault::KeyVaultException::CreateFromResponse(response);
}
}
} // namespace
@ -50,8 +50,7 @@ Azure::Security::KeyVault::Keys::DeleteKeyOperation::PollInternal(Azure::Core::C
}
Azure::Security::KeyVault::Keys::DeleteKeyOperation::DeleteKeyOperation(
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
keyvaultPipeline,
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
Azure::Response<Azure::Security::KeyVault::Keys::DeletedKey> response)
: m_pipeline(keyvaultPipeline)
{

2
sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
View File

@ -13,7 +13,7 @@
using namespace Azure::Security::KeyVault::Keys;
using namespace Azure::Core::Json::_internal;
using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;
using Azure::Security::KeyVault::_internal::UnixTimeConverter;
DeletedKey _detail::DeletedKeySerializer::DeletedKeyDeserialize(
std::string const& name,

2
sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
View File

@ -15,7 +15,7 @@
using namespace Azure::Security::KeyVault::Keys;
using namespace Azure::Security::KeyVault::Keys::_detail;
using namespace Azure::Core::Json::_internal;
using namespace Azure::Security::KeyVault::Common::_internal;
using namespace Azure::Security::KeyVault::_internal;
std::string
Azure::Security::KeyVault::Keys::_detail::ImportKeyOptionsSerializer::ImportKeyOptionsSerialize(

2
sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
View File

@ -10,7 +10,7 @@
using namespace Azure::Security::KeyVault::Keys;
using namespace Azure::Core::Json::_internal;
using namespace Azure::Security::KeyVault::Common::_internal;
using namespace Azure::Security::KeyVault::_internal;
void Azure::Security::KeyVault::Keys::to_json(
Azure::Core::Json::_internal::json& j,

2
sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
View File

@ -13,7 +13,7 @@
using namespace Azure::Security::KeyVault::Keys::_detail;
using namespace Azure::Core::Json::_internal;
using namespace Azure::Security::KeyVault::Common::_internal;
using namespace Azure::Security::KeyVault::_internal;
std::string KeyBackup::Serialize() const
{

2
sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
View File

@ -71,7 +71,7 @@ KeyClient::KeyClient(
std::make_unique<BearerTokenAuthenticationPolicy>(credential, tokenContext));
}
m_pipeline = std::make_shared<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>(
m_pipeline = std::make_shared<Azure::Security::KeyVault::_internal::KeyVaultPipeline>(
Azure::Core::Url(vaultUrl),
apiVersion,
Azure::Core::Http::_internal::HttpPipeline(

2
sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
View File

@ -13,7 +13,7 @@
using namespace Azure::Security::KeyVault::Keys::_detail;
using namespace Azure::Core::Json::_internal;
using namespace Azure::Security::KeyVault::Common::_internal;
using namespace Azure::Security::KeyVault::_internal;
std::string KeyRequestParameters::Serialize() const
{

2
sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
View File

@ -15,7 +15,7 @@
using namespace Azure::Security::KeyVault::Keys;
using namespace Azure::Core::Json::_internal;
using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;
using Azure::Security::KeyVault::_internal::UnixTimeConverter;
namespace {
void ParseStringOperationsToKeyOperations(

2
sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp
View File

@ -14,7 +14,7 @@
using namespace Azure::Security::KeyVault::Keys;
using namespace Azure::Core::Json::_internal;
using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;
using Azure::Security::KeyVault::_internal::UnixTimeConverter;
KeyPropertiesSinglePage
_detail::KeyPropertiesSinglePageSerializer::KeyPropertiesSinglePageDeserialize(

5
sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
View File

@ -23,7 +23,7 @@ inline Azure::Core::OperationStatus CheckCompleted(Azure::Core::Http::RawRespons
case Azure::Core::Http::HttpStatusCode::NotFound:
return Azure::Core::OperationStatus::Running;
default:
throw Azure::Security::KeyVault::Common::KeyVaultException::CreateFromResponse(response);
throw Azure::Security::KeyVault::KeyVaultException::CreateFromResponse(response);
}
}
} // namespace
@ -54,8 +54,7 @@ Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::PollInternal(
}
Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::RecoverDeletedKeyOperation(
std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
keyvaultPipeline,
std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
Azure::Response<Azure::Security::KeyVault::Keys::KeyVaultKey> response)
: m_pipeline(keyvaultPipeline)
{

2
sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp
View File

@ -75,7 +75,7 @@ int main()
std::cout << "Authentication Exception happened:" << std::endl << e.what() << std::endl;
return 1;
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& e)
catch (Azure::Security::KeyVault::KeyVaultException const& e)
{
std::cout << "KeyVault Client Exception happened:" << std::endl << e.Message << std::endl;
return 1;

2
sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp
View File

@ -100,7 +100,7 @@ int main()
std::cout << "Authentication Exception happened:" << std::endl << e.what() << std::endl;
return 1;
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& e)
catch (Azure::Security::KeyVault::KeyVaultException const& e)
{
std::cout << "KeyVault Client Exception happened:" << std::endl << e.Message << std::endl;
return 1;

2
sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp
View File

@ -155,7 +155,7 @@ int main()
std::cout << "Authentication Exception happened:" << std::endl << e.what() << std::endl;
return 1;
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& e)
catch (Azure::Security::KeyVault::KeyVaultException const& e)
{
std::cout << "KeyVault Client Exception happened:" << std::endl << e.Message << std::endl;
return 1;

2
sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
View File

@ -56,7 +56,7 @@ TEST_F(KeyVaultClientTest, BackupKey)
std::this_thread::sleep_for(std::chrono::minutes(2));
}
{ // Check key is gone
EXPECT_THROW(keyClient.GetKey(keyName), Azure::Security::KeyVault::Common::KeyVaultException);
EXPECT_THROW(keyClient.GetKey(keyName), Azure::Security::KeyVault::KeyVaultException);
}
{
// Restore

10
sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
View File

@ -119,7 +119,7 @@ TEST_F(KeyVaultClientTest, DeleteInvalidKey)
{
auto keyResponseLRO = keyClient.StartDeleteKey(keyName);
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
catch (Azure::Security::KeyVault::KeyVaultException const& error)
{
EXPECT_EQ(
static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@ -157,7 +157,7 @@ TEST_F(KeyVaultClientTest, DoubleDelete)
{
auto keyResponseLRO = keyClient.StartDeleteKey(keyName);
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
catch (Azure::Security::KeyVault::KeyVaultException const& error)
{
EXPECT_EQ(
static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@ -192,7 +192,7 @@ TEST_F(KeyVaultClientTest, DoubleDeleteBeforePollComplete)
{
auto keyResponseLRO = keyClient.StartDeleteKey(keyName);
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
catch (Azure::Security::KeyVault::KeyVaultException const& error)
{
EXPECT_EQ(
static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@ -232,7 +232,7 @@ TEST_F(KeyVaultClientTest, CreateDeletedKey)
auto keyResponse
= keyClient.CreateKey(keyName, Azure::Security::KeyVault::Keys::JsonWebKeyType::Ec);
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
catch (Azure::Security::KeyVault::KeyVaultException const& error)
{
EXPECT_EQ(
static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@ -269,7 +269,7 @@ TEST_F(KeyVaultClientTest, CreateDeletedKeyBeforePollComplete)
auto keyResponse
= keyClient.CreateKey(keyName, Azure::Security::KeyVault::Keys::JsonWebKeyType::Ec);
}
catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
catch (Azure::Security::KeyVault::KeyVaultException const& error)
{
EXPECT_EQ(
static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(

2
sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
View File

@ -17,7 +17,7 @@
using namespace Azure::Security::KeyVault::Keys::Test;
using namespace Azure::Security::KeyVault::Keys;
using namespace Azure::Security::KeyVault::Common::_internal;
using namespace Azure::Security::KeyVault::_internal;
TEST_F(KeyVaultClientTest, ImportKey)
{

2
sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
View File

@ -63,7 +63,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam
{
auto apiVersion = options.GetVersionString();
m_pipeline = std::make_unique<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>(
m_pipeline = std::make_unique<Azure::Security::KeyVault::_internal::KeyVaultPipeline>(
Azure::Core::Url(vaultUrl),
apiVersion,
Azure::Core::Http::_internal::HttpPipeline(options, "test", "version", {}, {}));