Remove deprecated (Azure#5873)

microzchang · Aug 7, 2024 · 186bbd8 · 186bbd8
1 parent 4e8f425
commit 186bbd8
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 145 deletions.
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp
@@ -334,11 +334,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * The storage account's shared key credential.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     * @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
-        const StorageSharedKeyCredential& credential);
+    std::string GenerateSasStringToSign(const StorageSharedKeyCredential& credential);
 
     /**
      * @brief For debugging purposes only.
@@ -348,10 +345,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * @param accountName The name of the storage account.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     * @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
+    std::string GenerateSasStringToSign(
         const Blobs::Models::UserDelegationKey& userDelegationKey,
         const std::string& accountName);
 

diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_sas_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_sas_test.cpp
@@ -793,24 +793,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = accountSasBuilder.GenerateSasToken(*keyCredential);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(blobUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign = accountSasBuilder.GenerateSasStringToSign(*keyCredential);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));
@@ -830,24 +813,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = blobSasBuilder.GenerateSasToken(*keyCredential);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(blobUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign = blobSasBuilder.GenerateSasStringToSign(*keyCredential);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));
@@ -876,24 +842,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = blobSasBuilder.GenerateSasToken(userDelegationKey, accountName);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(blobUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign = blobSasBuilder.GenerateSasStringToSign(userDelegationKey, accountName);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));

diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp
@@ -293,11 +293,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * The storage account's shared key credential.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     *  @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
-        const StorageSharedKeyCredential& credential);
+    std::string GenerateSasStringToSign(const StorageSharedKeyCredential& credential);
 
   private:
     std::string Permissions;

diff --git a/...ge/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp b/...ge/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp
@@ -348,11 +348,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * The storage account's shared key credential.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     * @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
-        const StorageSharedKeyCredential& credential);
+    std::string GenerateSasStringToSign(const StorageSharedKeyCredential& credential);
 
     /**
      * @brief For debugging purposes only.
@@ -362,10 +359,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * @param accountName The name of the storage account.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     * @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
+    std::string GenerateSasStringToSign(
         const Blobs::Models::UserDelegationKey& userDelegationKey,
         const std::string& accountName);
 

diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_sas_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_sas_test.cpp
@@ -818,24 +818,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = datalakeSasBuilder.GenerateSasToken(*keyCredential);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(blobUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign = datalakeSasBuilder.GenerateSasStringToSign(*keyCredential);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));
@@ -864,25 +847,8 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = datalakeSasBuilder.GenerateSasToken(userDelegationKey, accountName);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(blobUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign
           = datalakeSasBuilder.GenerateSasStringToSign(userDelegationKey, accountName);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));

diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_sas_builder.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_sas_builder.hpp
@@ -237,11 +237,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * The storage account's shared key credential.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     * @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
-        const StorageSharedKeyCredential& credential);
+    std::string GenerateSasStringToSign(const StorageSharedKeyCredential& credential);
 
   private:
     std::string Permissions;

diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_sas_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_sas_test.cpp
@@ -551,24 +551,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = shareSasBuilder.GenerateSasToken(*keyCredential);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(shareUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign = shareSasBuilder.GenerateSasStringToSign(*keyCredential);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));

diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_sas_builder.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_sas_builder.hpp
@@ -136,11 +136,8 @@ namespace Azure { namespace Storage { namespace Sas {
      * The storage account's shared key credential.
      * @return Returns the string to sign that will be used to generate the signature for the SAS
      * URL.
-     *
-     * @deprecated For debugging purposes only.
      */
-    [[deprecated]] std::string GenerateSasStringToSign(
-        const StorageSharedKeyCredential& credential);
+    std::string GenerateSasStringToSign(const StorageSharedKeyCredential& credential);
 
   private:
     std::string Permissions;

diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_sas_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_sas_test.cpp
@@ -369,24 +369,7 @@ namespace Azure { namespace Storage { namespace Test {
       auto sasToken = queueSasBuilder.GenerateSasToken(*keyCredential);
       auto signature = Azure::Core::Url::Decode(
           Azure::Core::Url(queueUrl + sasToken).GetQueryParameters().find("sig")->second);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
       auto stringToSign = queueSasBuilder.GenerateSasStringToSign(*keyCredential);
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif // _MSC_VER
       auto signatureFromStringToSign = Azure::Core::Convert::Base64Encode(_internal::HmacSha256(
           std::vector<uint8_t>(stringToSign.begin(), stringToSign.end()),
           Azure::Core::Convert::Base64Decode(accountKey)));