From 7d7d0361367911700ec184db496544596ebc0e63 Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Thu, 15 Jul 2021 15:41:10 -0700 Subject: [PATCH] Use std::vector instead of std::list for KeyOperation arrays. (#2636) * Use std::vector instead of std::list for KeyOperation arrays. * Add change log entry. --- sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md | 1 + .../inc/azure/keyvault/keys/key_client.hpp | 5 ++--- .../inc/azure/keyvault/keys/key_create_options.hpp | 3 +-- sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp | 2 +- .../src/private/key_request_parameters.hpp | 5 ++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md index 8f559bdcf..789408c0c 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md @@ -22,6 +22,7 @@ - Updated `BackupKey()` API return type to `BackupKeyResult` model type. - Renamed `KeyPropertiesPageResult` to `KeyPropertiesPagedResponse`. - Renamed `DeletedKeyPageResult` to `DeletedKeyPagedResponse`. +- Changed the container for `KeyOperations` from `std::list` to `std::vector` within `CreateKeyOptions` and `UpdateKeyProperties()`. - Renamed high-level header from `key_vault_keys.hpp` to `keyvault_keys.hpp`. ## 4.0.0-beta.3 (2021-06-08) diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp index 48328fd51..ebc06992c 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp @@ -20,7 +20,6 @@ #include "azure/keyvault/keys/recover_deleted_key_operation.hpp" #include -#include #include namespace Azure { namespace Security { namespace KeyVault { namespace _detail { @@ -325,8 +324,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { */ Azure::Response UpdateKeyProperties( KeyProperties const& properties, - Azure::Nullable> const& keyOperations - = Azure::Nullable>(), + Azure::Nullable> const& keyOperations + = Azure::Nullable>(), Azure::Core::Context const& context = Azure::Core::Context()) const; /** diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp index 469e77ee4..4e22f3919 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp @@ -17,7 +17,6 @@ #include "azure/keyvault/keys/key_operation.hpp" #include "azure/keyvault/keys/keyvault_key.hpp" -#include #include #include @@ -39,7 +38,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { * @brief Define the supported operations for the key. * */ - std::list KeyOperations; + std::vector KeyOperations; /** * @brief Indicates when the key will be valid and can be used for cryptographic operations. diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp index c5f83f711..bc82afd72 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp @@ -309,7 +309,7 @@ Azure::Response KeyClient::PurgeDeletedKey( Azure::Response KeyClient::UpdateKeyProperties( KeyProperties const& properties, - Azure::Nullable> const& keyOperations, + Azure::Nullable> const& keyOperations, Azure::Core::Context const& context) const { return m_pipeline->SendRequest( diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp index e031bde48..b64d51a7f 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp @@ -17,7 +17,6 @@ #include "azure/keyvault/keys/key_type.hpp" #include -#include #include #include #include @@ -37,7 +36,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam explicit KeyRequestParameters( KeyProperties const& key, - Azure::Nullable> const& operations) + Azure::Nullable> const& operations) : m_options(CreateKeyOptions()) { if (key.Enabled) @@ -58,7 +57,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam } if (operations) { - m_options.KeyOperations = std::list(operations.Value()); + m_options.KeyOperations = std::vector(operations.Value()); } }