From fdc06b978d968aae3903c5a55ec0b788f4dfe9a3 Mon Sep 17 00:00:00 2001 From: Kan Tang Date: Mon, 23 Nov 2020 21:39:02 -0800 Subject: [PATCH] Removed Share Lease due to it not supported until STG 76 (#1016) * Removed Share Lease due to it not supported until STG 76 * Update breaking change. * Added removed APIs list in change log. --- .../azure-storage-files-shares/CHANGELOG.md | 8 +++ .../storage/files/shares/share_client.hpp | 60 ------------------- .../src/share_client.cpp | 53 ---------------- 3 files changed, 8 insertions(+), 113 deletions(-) diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md index 1d0658ffc..ee7816492 100644 --- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md @@ -2,6 +2,14 @@ ## 12.0.0-beta.6 (Unreleased) +### Breaking Changes + +* Removed Share Lease related API due to it not supported in recent service versions. + - ShareClient::AcquireLease + - ShareClient::ReleaseLease + - ShareClient::ChangeLease + - ShareClient::BreakLease + - ShareClient::RenewLease ## 12.0.0-beta.5 (2020-11-13) diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp index e1d76c421..3cf061f05 100644 --- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp +++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp @@ -219,66 +219,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { const ListFilesAndDirectoriesSegmentOptions& options = ListFilesAndDirectoriesSegmentOptions()) const; - /** - * @brief Acquires a lease on the share. - * - * @param proposedLeaseId Proposed lease ID, in a GUID string format. - * @param duration Specifies the duration of the lease, in seconds, or - * Azure::Storage::InfiniteLeaseDuration for a lease that never expires. A non-infinite lease - * can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. - * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the lease. - */ - Azure::Core::Response AcquireLease( - const std::string& proposedLeaseId, - int32_t duration, - const AcquireShareLeaseOptions& options = AcquireShareLeaseOptions()) const; - - /** - * @brief Releases the share's previously-acquired lease. - * - * @param leaseId ID of the previously-acquired lease. - * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the updated lease - * status. - */ - Azure::Core::Response ReleaseLease( - const std::string& leaseId, - const ReleaseShareLeaseOptions& options = ReleaseShareLeaseOptions()) const; - - /** - * @brief Changes the lease of an active lease. - * - * @param leaseId ID of the previously-acquired lease. - * @param proposedLeaseId Proposed lease ID, in a GUID string format. - * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the changed lease. - */ - Azure::Core::Response ChangeLease( - const std::string& leaseId, - const std::string& proposedLeaseId, - const ChangeShareLeaseOptions& options = ChangeShareLeaseOptions()) const; - - /** - * @brief Breaks the previously-acquired lease. - * - * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the broken lease. - */ - Azure::Core::Response BreakLease( - const BreakShareLeaseOptions& options = BreakShareLeaseOptions()) const; - - /** - * @brief Renew the previously-acquired lease. - * - * @param leaseId ID of the previously-acquired lease. - * @param options Optional parameters to execute this function. - * @return Azure::Core::Response describing the renewed lease. - */ - Azure::Core::Response RenewLease( - const std::string& leaseId, - const RenewShareLeaseOptions& options = RenewShareLeaseOptions()) const; - private: Azure::Core::Http::Url m_shareUri; std::shared_ptr m_pipeline; diff --git a/sdk/storage/azure-storage-files-shares/src/share_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_client.cpp index 12a4fc19b..4b737f0e4 100644 --- a/sdk/storage/azure-storage-files-shares/src/share_client.cpp +++ b/sdk/storage/azure-storage-files-shares/src/share_client.cpp @@ -274,57 +274,4 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response ShareClient::AcquireLease( - const std::string& proposedLeaseId, - int32_t duration, - const AcquireShareLeaseOptions& options) const - { - Details::ShareRestClient::Share::AcquireLeaseOptions protocolLayerOptions; - protocolLayerOptions.ProposedLeaseIdOptional = proposedLeaseId; - protocolLayerOptions.LeaseDuration = duration; - return Details::ShareRestClient::Share::AcquireLease( - m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); - } - - Azure::Core::Response ShareClient::ChangeLease( - const std::string& leaseId, - const std::string& proposedLeaseId, - const ChangeShareLeaseOptions& options) const - { - Details::ShareRestClient::Share::ChangeLeaseOptions protocolLayerOptions; - protocolLayerOptions.LeaseIdRequired = leaseId; - protocolLayerOptions.ProposedLeaseIdOptional = proposedLeaseId; - return Details::ShareRestClient::Share::ChangeLease( - m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); - } - - Azure::Core::Response ShareClient::ReleaseLease( - const std::string& leaseId, - const ReleaseShareLeaseOptions& options) const - { - Details::ShareRestClient::Share::ReleaseLeaseOptions protocolLayerOptions; - protocolLayerOptions.LeaseIdRequired = leaseId; - return Details::ShareRestClient::Share::ReleaseLease( - m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); - } - - Azure::Core::Response ShareClient::BreakLease( - const BreakShareLeaseOptions& options) const - { - Details::ShareRestClient::Share::BreakLeaseOptions protocolLayerOptions; - protocolLayerOptions.LeaseBreakPeriod = options.BreakPeriod; - return Details::ShareRestClient::Share::BreakLease( - m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); - } - - Azure::Core::Response ShareClient::RenewLease( - const std::string& leaseId, - const RenewShareLeaseOptions& options) const - { - Details::ShareRestClient::Share::RenewLeaseOptions protocolLayerOptions; - protocolLayerOptions.LeaseIdRequired = leaseId; - return Details::ShareRestClient::Share::RenewLease( - m_shareUri, *m_pipeline, options.Context, protocolLayerOptions); - } - }}}} // namespace Azure::Storage::Files::Shares