From 8f8c4e55ce4140c95768c1902771ea39c69b933f Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Thu, 3 Jun 2021 21:47:37 -0700 Subject: [PATCH] update uint64 to int64_t (#2398) --- .../keyvault/common/internal/unix_time_helper.hpp | 4 ++-- .../azure-security-keyvault-keys/CHANGELOG.md | 5 +++++ .../keyvault/keys/details/key_request_parameters.hpp | 4 ++-- .../inc/azure/keyvault/keys/key_create_options.hpp | 6 +++--- .../azure-security-keyvault-keys/src/deleted_key.cpp | 4 ++-- .../src/import_key_options.cpp | 8 ++++---- .../src/key_request_parameters.cpp | 4 ++-- .../src/key_vault_key.cpp | 8 ++++---- .../src/list_keys_single_page_result.cpp | 12 ++++++------ 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp index ea98c3399..a7288eb75 100644 --- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp +++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp @@ -26,7 +26,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace _internal * @param unixTime The number of seconds since 1970. * @return Calculated #Azure::Core::DateTime. */ - static inline Azure::DateTime UnixTimeToDatetime(uint64_t unixTime) + static inline Azure::DateTime UnixTimeToDatetime(int64_t unixTime) { return Azure::DateTime(1970) + std::chrono::seconds(unixTime); } @@ -36,7 +36,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace _internal * * @param dateTime The date time to convert. */ - static inline uint64_t DatetimeToUnixTime(Azure::DateTime dateTime) + static inline int64_t DatetimeToUnixTime(Azure::DateTime dateTime) { // This count starts at the Unix epoch which is January 1st, 1970 UTC. auto secondsSince1970 diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md index 392ec7b64..4ce6528be 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md @@ -2,6 +2,11 @@ ## 4.0.0-beta.3 (Unreleased) +### Breaking Changes + +- Updated `CreateRsaKeyOptions::KeySize` type from `uint64_t` to `int64_t`. +- Updated `CreateRsaKeyOptions::PublicExponent` type from `uint64_t` to `int64_t`. +- Updated `CreateOctKeyOptions::KeySize` type from `uint64_t` to `int64_t`. ## 4.0.0-beta.2 (2021-05-18) diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp index 10096fed2..e031bde48 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp @@ -32,8 +32,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam public: Azure::Nullable Curve; - Azure::Nullable KeySize; - Azure::Nullable PublicExponent; + Azure::Nullable KeySize; + Azure::Nullable PublicExponent; explicit KeyRequestParameters( KeyProperties const& key, 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 1f2af0ae6..be8f51736 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 @@ -149,7 +149,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { * @remark If null, the service default is used. * */ - Azure::Nullable KeySize; + Azure::Nullable KeySize; /** * @brief Gets or sets the public exponent for a RSA key. @@ -157,7 +157,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { * @remark If null, the service default is used. * */ - Azure::Nullable PublicExponent; + Azure::Nullable PublicExponent; /** * @brief Create a RSA Key Options object. @@ -221,7 +221,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { * @remark If null, the service default is used. * */ - Azure::Nullable KeySize; + Azure::Nullable KeySize; /** * @brief Create a AES Key Options object. diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp index 32ec7927c..d6dbfe441 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp @@ -38,12 +38,12 @@ DeletedKey _detail::DeletedKeySerializer::DeletedKeyDeserialize( deletedKey.Properties.RecoveryLevel = jsonParser[_detail::RecoveryLevelPropertyName].get(); } - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( deletedKey.DeletedDate, jsonParser, _detail::DeletedOnPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( deletedKey.ScheduledPurgeDate, jsonParser, _detail::ScheduledPurgeDatePropertyName, diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp index d1ca14086..1ac2633b0 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp @@ -32,7 +32,7 @@ Azure::Security::KeyVault::Keys::_detail::ImportKeyOptionsSerializer::ImportKeyO importKeyOptions.HardwareProtected, payload, _detail::HsmPropertyName); // attributes - JsonOptional::SetFromNullable( + JsonOptional::SetFromNullable( importKeyOptions.Properties.CreatedOn, payload[_detail::AttributesPropertyName], _detail::CreatedPropertyName, @@ -41,12 +41,12 @@ Azure::Security::KeyVault::Keys::_detail::ImportKeyOptionsSerializer::ImportKeyO importKeyOptions.Properties.Enabled, payload[_detail::AttributesPropertyName], _detail::EnabledPropertyName); - JsonOptional::SetFromNullable( + JsonOptional::SetFromNullable( importKeyOptions.Properties.ExpiresOn, payload[_detail::AttributesPropertyName], _detail::ExpPropertyName, UnixTimeConverter::DatetimeToUnixTime); - JsonOptional::SetFromNullable( + JsonOptional::SetFromNullable( importKeyOptions.Properties.NotBefore, payload[_detail::AttributesPropertyName], _detail::NbfPropertyName, @@ -58,7 +58,7 @@ Azure::Security::KeyVault::Keys::_detail::ImportKeyOptionsSerializer::ImportKeyO payload[_detail::RecoveryLevelPropertyName] = importKeyOptions.Properties.RecoveryLevel; - JsonOptional::SetFromNullable( + JsonOptional::SetFromNullable( importKeyOptions.Properties.UpdatedOn, payload[_detail::AttributesPropertyName], _detail::UpdatedPropertyName, diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp index 306875df1..e0f881c4e 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp @@ -39,13 +39,13 @@ std::string KeyRequestParameters::Serialize() const } // attributes - JsonOptional::SetFromNullable( + JsonOptional::SetFromNullable( m_options.ExpiresOn, payload[_detail::AttributesPropertyName], _detail::ExpPropertyName, UnixTimeConverter::DatetimeToUnixTime); - JsonOptional::SetFromNullable( + JsonOptional::SetFromNullable( m_options.NotBefore, payload[_detail::AttributesPropertyName], _detail::NbfPropertyName, diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp index 76bbed219..ba07272fc 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp @@ -59,22 +59,22 @@ void _detail::KeyVaultKeySerializer::KeyVaultKeyDeserialize( JsonOptional::SetIfExists(key.Properties.Enabled, attributes, _detail::EnabledPropertyName); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( key.Properties.NotBefore, attributes, _detail::NbfPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( key.Properties.ExpiresOn, attributes, _detail::ExpPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( key.Properties.CreatedOn, attributes, _detail::CreatedPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( key.Properties.UpdatedOn, attributes, _detail::UpdatedPropertyName, diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp index 7cc36b710..b93f08a6f 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp @@ -40,22 +40,22 @@ _detail::KeyPropertiesPageResultSerializer::KeyPropertiesPageResultDeserialize( auto attributes = key[_detail::AttributesPropertyName]; JsonOptional::SetIfExists(keyProperties.Enabled, attributes, _detail::EnabledPropertyName); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( keyProperties.NotBefore, attributes, _detail::NbfPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( keyProperties.ExpiresOn, attributes, _detail::ExpPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( keyProperties.CreatedOn, attributes, _detail::CreatedPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( keyProperties.UpdatedOn, attributes, _detail::UpdatedPropertyName, @@ -111,12 +111,12 @@ DeletedKeyPageResult _detail::KeyPropertiesPageResultSerializer::DeletedKeyPageR = key[_detail::AttributesPropertyName][_detail::RecoveryLevelPropertyName] .get(); } - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( deletedKey.DeletedDate, key, _detail::DeletedOnPropertyName, UnixTimeConverter::UnixTimeToDatetime); - JsonOptional::SetIfExists( + JsonOptional::SetIfExists( deletedKey.ScheduledPurgeDate, key, _detail::ScheduledPurgeDatePropertyName,