From a733518306863be071a311f1e5d41198a11e9c9e Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:00:41 -0700 Subject: [PATCH] Keyvault regen (#5445) * mroe quotes * dssf * update to api version 7.5 , added field to key properties , regen tests * update hsm location * fds --- sdk/keyvault/assets.json | 2 +- .../keyvault/certificates/certificate_client_options.hpp | 2 +- .../test/ut/certificate_client_test.cpp | 4 ++-- .../keys/cryptography/cryptography_client_options.hpp | 2 +- .../inc/azure/keyvault/keys/key_client_models.hpp | 6 ++++++ .../inc/azure/keyvault/keys/key_client_options.hpp | 2 +- .../azure-security-keyvault-keys/src/keyvault_key.cpp | 3 +++ .../src/private/key_constants.hpp | 1 + .../test/ut-hsm/key_client_test_hsm_live.cpp | 4 ++++ .../test/ut/key_client_test.cpp | 4 ++-- .../inc/azure/keyvault/secrets/keyvault_options.hpp | 2 +- .../test/ut/secret_client_test.cpp | 4 ++-- sdk/keyvault/ci.yml | 2 +- 13 files changed, 26 insertions(+), 12 deletions(-) diff --git a/sdk/keyvault/assets.json b/sdk/keyvault/assets.json index f49f57089..0485f1171 100644 --- a/sdk/keyvault/assets.json +++ b/sdk/keyvault/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "cpp", "TagPrefix": "cpp/keyvault", - "Tag": "cpp/keyvault_51f59d3347" + "Tag": "cpp/keyvault_c86efa6555" } diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp index b48ad5b0c..b1f773562 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp @@ -29,7 +29,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Certificat * @brief Service Version used. * */ - const std::string ApiVersion{"7.3"}; + const std::string ApiVersion{"7.5"}; }; }}}} // namespace Azure::Security::KeyVault::Certificates diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp index d4fa26384..d50a85f32 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp @@ -900,8 +900,8 @@ TEST_F(KeyVaultCertificateClientTest, ServiceVersion) { auto credential = std::make_shared("tenantID", "AppId", "SecretId"); - // 7.3 + // 7.5 EXPECT_NO_THROW(auto options = CertificateClientOptions(); CertificateClient certificateClient( "http://account.vault.azure.net", credential, options); - EXPECT_EQ(options.ApiVersion, "7.3");); + EXPECT_EQ(options.ApiVersion, "7.5");); } diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp index 0eb6697ab..ae85b6ad0 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp @@ -41,6 +41,6 @@ namespace Azure { * @brief Construct a new Key Client Options object. * */ - CryptographyClientOptions() : Azure::Core::_internal::ClientOptions() { Version = "7.3"; } + CryptographyClientOptions() : Azure::Core::_internal::ClientOptions() { Version = "7.5"; } }; }}}}} // namespace Azure::Security::KeyVault::Keys::Cryptography diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_models.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_models.hpp index 15c9be1cc..12ea22f6b 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_models.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_models.hpp @@ -559,6 +559,12 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { */ Azure::Nullable Exportable; + /** + * @brief Indicates if the private key can be exported. + * + */ + Azure::Nullable HsmPlatform; + /** * @brief Construct a new Key Properties object. * diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp index d13dcf503..37107c4cc 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp @@ -59,7 +59,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { * @brief Service Version used. * */ - const std::string ApiVersion{"7.3"}; + const std::string ApiVersion{"7.5"}; }; /** diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp index df82a557e..99d78f96a 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp @@ -80,6 +80,9 @@ void _detail::KeyVaultKeySerializer::KeyVaultKeyDeserialize( attributes, _detail::UpdatedPropertyName, PosixTimeConverter::PosixTimeToDateTime); + + JsonOptional::SetIfExists( + key.Properties.HsmPlatform, attributes, _detail::HsmPlatformPropertyName); } JsonOptional::SetIfExists( diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp index d9cc613f5..cbc0b98c3 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp @@ -32,6 +32,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam constexpr static const char UpdatedPropertyName[] = "updated"; constexpr static const char RecoverableDaysPropertyName[] = "recoverableDays"; constexpr static const char RecoveryLevelPropertyName[] = "recoveryLevel"; + constexpr static const char HsmPlatformPropertyName[] = "hsmPlatform"; /***************** Key Request Parameters *****************/ constexpr static const char KeyTypePropertyName[] = "kty"; diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp index 87d912947..5acfdf930 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp @@ -27,6 +27,7 @@ TEST_F(KeyVaultKeyHSMClient, CreateEcHsmKey) CheckValidResponse(keyResponse); auto keyVaultKey = keyResponse.Value; EXPECT_EQ(keyVaultKey.Name(), keyName); + EXPECT_TRUE(keyVaultKey.Properties.HsmPlatform.HasValue()); EXPECT_TRUE(keyVaultKey.Properties.Enabled.Value()); } { @@ -36,6 +37,7 @@ TEST_F(KeyVaultKeyHSMClient, CreateEcHsmKey) auto keyVaultKey = keyResponse.Value; EXPECT_EQ(keyVaultKey.Name(), keyName); EXPECT_FALSE(keyResponse.Value.Properties.ReleasePolicy.HasValue()); + EXPECT_TRUE(keyVaultKey.Properties.HsmPlatform.HasValue()); EXPECT_TRUE(keyVaultKey.Properties.Enabled.Value()); } } @@ -54,6 +56,7 @@ TEST_F(KeyVaultKeyHSMClient, CreateRsaHsmKey) CheckValidResponse(keyResponse); auto keyVaultKey = keyResponse.Value; EXPECT_EQ(keyVaultKey.Name(), keyName); + EXPECT_TRUE(keyVaultKey.Properties.HsmPlatform.HasValue()); } { // Now get the key @@ -63,6 +66,7 @@ TEST_F(KeyVaultKeyHSMClient, CreateRsaHsmKey) EXPECT_EQ(keyVaultKey.Name(), keyName); EXPECT_FALSE(keyResponse.Value.Properties.ReleasePolicy.HasValue()); EXPECT_TRUE(keyVaultKey.Properties.Enabled.Value()); + EXPECT_TRUE(keyVaultKey.Properties.HsmPlatform.HasValue()); } } diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp index 1aa3ea494..7a3a0ff9e 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp @@ -32,10 +32,10 @@ TEST(KeyVaultKeyClientUnitTest, ServiceVersion) { auto credential = std::make_shared("tenantID", "AppId", "SecretId"); - // 7.3 + // 7.5 EXPECT_NO_THROW(auto options = KeyClientOptions(); KeyClient keyClient("http://account.vault.azure.net", credential, options); - EXPECT_EQ(options.ApiVersion, "7.3");); + EXPECT_EQ(options.ApiVersion, "7.5");); } TEST(KeyVaultKeyClientUnitTest, GetUrl) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp index 0c378fae7..2f4a91dc3 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp @@ -22,7 +22,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Secrets { * @brief Service Version used. * */ - const std::string ApiVersion{"7.3"}; + const std::string ApiVersion{"7.5"}; }; /** diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp index d2e5c0396..18e0f6131 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp @@ -30,10 +30,10 @@ TEST(SecretClient, ServiceVersion) { auto credential = std::make_shared("tenantID", "AppId", "SecretId"); - // 7.3 + // 7.5 EXPECT_NO_THROW(auto options = SecretClientOptions(); SecretClient SecretClient("http://account.vault.azure.net", credential, options); - EXPECT_EQ(options.ApiVersion, "7.3");); + EXPECT_EQ(options.ApiVersion, "7.5");); } TEST(SecretClient, GetUrl) diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml index eb4040fab..7f0388918 100644 --- a/sdk/keyvault/ci.yml +++ b/sdk/keyvault/ci.yml @@ -62,7 +62,7 @@ extends: - Name: AZURE_KEYVAULT_URL Value: "https://non-real-account.vault.azure.net" - Name: AZURE_KEYVAULT_HSM_URL - Value: "https://non-real-account.managedhsm.azure.net/" + Value: "https://non-real-account.vault.azure.net" # Tenant ID should use the uniqueID format for playback recordings - Name: AZURE_TENANT_ID Value: "33333333-3333-3333-3333-333333333333"