diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index f8c42237d..108c128bf 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -27,6 +27,7 @@ - Removed `PreviousShareSnapshot` from `GetShareFileRangeListOptions`, use `ShareFileClient::GetRangeListDiff` instead. - Removed `Blob` from the name of lease options and return types, like `AcquireBlobLeaseOptions` was renamed to `AcquireLeaseOptions`. - Removed `Blob` prefix from the name of structs `BlobGeoReplication`, `BlobLeaseStatus`, `BlobLeaseState`, `BlobLeaseDurationType`, `BlobAnalyticsLogging`, `BlobMetrics`, `BlobCorsRule`, `BlobRetentionPolicy`, `BlobStaticWebsite`, `BlobArchiveStatus` and `BlobGeoReplictionStatus`. +- Removed `RequestId` from return types. ## 12.0.0-beta.8 (2021-02-12) diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp index 9430aa317..dd90ab768 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp @@ -32,7 +32,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct AcquireLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -40,14 +39,12 @@ namespace Azure { namespace Storage { namespace Blobs { struct BreakLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; }; struct ChangeLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -55,14 +52,12 @@ namespace Azure { namespace Storage { namespace Blobs { struct ReleaseLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; }; struct RenewLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -72,7 +67,6 @@ namespace Azure { namespace Storage { namespace Blobs { class StartCopyBlobOperation : public Azure::Core::Operation { public: - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string CopyId; diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp index 38594e4a2..f48f0c399 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp @@ -37,7 +37,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct AbortCopyBlobFromUriResult { - std::string RequestId; }; // struct AbortCopyBlobFromUriResult class AccessTier { @@ -89,7 +88,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct AcquireBlobContainerLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -99,7 +97,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct AcquireBlobLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -174,7 +171,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct BreakBlobContainerLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; int32_t LeaseTime = 0; @@ -184,7 +180,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct BreakBlobLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; int32_t LeaseTime = 0; @@ -194,7 +189,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct ChangeBlobContainerLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -204,7 +198,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct ChangeBlobLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -213,7 +206,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct ClearPageBlobPagesResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; int64_t SequenceNumber = 0; @@ -244,7 +236,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct CreateAppendBlobResult { - std::string RequestId; bool Created = true; Azure::ETag ETag; Azure::DateTime LastModified; @@ -256,7 +247,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct CreateBlobContainerResult { - std::string RequestId; bool Created = true; Azure::ETag ETag; Azure::DateTime LastModified; @@ -264,7 +254,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct CreateBlobSnapshotResult { - std::string RequestId; std::string Snapshot; Azure::ETag ETag; Azure::DateTime LastModified; @@ -276,7 +265,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct CreatePageBlobResult { - std::string RequestId; bool Created = true; Azure::ETag ETag; Azure::DateTime LastModified; @@ -289,13 +277,11 @@ namespace Azure { namespace Storage { namespace Blobs { struct DeleteBlobContainerResult { - std::string RequestId; bool Deleted = true; }; // struct DeleteBlobContainerResult struct DeleteBlobResult { - std::string RequestId; bool Deleted = true; }; // struct DeleteBlobResult @@ -352,13 +338,11 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetBlobTagsResult { - std::string RequestId; std::map Tags; }; // struct GetBlobTagsResult struct GetPageBlobPageRangesResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; int64_t BlobSize = 0; @@ -536,7 +520,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct ReleaseBlobContainerLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; }; // struct ReleaseBlobContainerLeaseResult @@ -545,7 +528,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct ReleaseBlobLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable SequenceNumber; @@ -555,7 +537,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct RenewBlobContainerLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -565,7 +546,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct RenewBlobLeaseResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string LeaseId; @@ -574,7 +554,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct ResizePageBlobResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; int64_t SequenceNumber = 0; @@ -607,7 +586,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct SealAppendBlobResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; bool IsSealed = true; @@ -615,31 +593,26 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobAccessTierResult { - std::string RequestId; }; // struct SetBlobAccessTierResult struct SetBlobContainerAccessPolicyResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; }; // struct SetBlobContainerAccessPolicyResult struct SetBlobContainerMetadataResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; }; // struct SetBlobContainerMetadataResult struct SetBlobExpiryResult { - std::string RequestId; }; // struct SetBlobExpiryResult struct SetBlobHttpHeadersResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable SequenceNumber; @@ -647,7 +620,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobMetadataResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable SequenceNumber; @@ -655,12 +627,10 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobTagsResult { - std::string RequestId; }; // struct SetBlobTagsResult struct SetServicePropertiesResult { - std::string RequestId; }; // struct SetServicePropertiesResult struct SignedIdentifier @@ -702,19 +672,16 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct SubmitBlobBatchResult { - std::string RequestId; std::string ContentType; }; // struct SubmitBlobBatchResult } // namespace _detail struct UndeleteBlobContainerResult { - std::string RequestId; }; // struct UndeleteBlobContainerResult struct UndeleteBlobResult { - std::string RequestId; }; // struct UndeleteBlobResult struct UserDelegationKey @@ -784,7 +751,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct FindBlobsByTagsSinglePageResult { - std::string RequestId; std::string ServiceEndpoint; Azure::Nullable ContinuationToken; std::vector Items; @@ -798,7 +764,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetBlockListResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string ContentType; @@ -824,7 +789,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct StartCopyBlobFromUriResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string CopyId; @@ -836,7 +800,6 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail { struct StartCopyPageBlobIncrementalResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; std::string CopyId; @@ -847,7 +810,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct AppendBlockFromUriResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable TransactionalContentHash; @@ -860,7 +822,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct AppendBlockResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable TransactionalContentHash; @@ -902,7 +863,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct CommitBlockListResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable VersionId; @@ -925,7 +885,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct StageBlockFromUriResult { - std::string RequestId; Azure::Nullable TransactionalContentHash; bool IsServerEncrypted = false; Azure::Nullable> EncryptionKeySha256; @@ -934,7 +893,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct StageBlockResult { - std::string RequestId; Azure::Nullable TransactionalContentHash; bool IsServerEncrypted = false; Azure::Nullable> EncryptionKeySha256; @@ -943,7 +901,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct UploadBlockBlobResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable VersionId; @@ -955,7 +912,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct UploadPageBlobPagesFromUriResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable TransactionalContentHash; @@ -967,7 +923,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct UploadPageBlobPagesResult { - std::string RequestId; Azure::ETag ETag; Azure::DateTime LastModified; Azure::Nullable TransactionalContentHash; @@ -1077,7 +1032,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct ListBlobContainersSinglePageResult { - std::string RequestId; std::string ServiceEndpoint; std::string Prefix; Azure::Nullable ContinuationToken; @@ -1098,7 +1052,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct DownloadBlobResult { - std::string RequestId; std::unique_ptr BodyStream; Azure::Core::Http::HttpRange ContentRange; int64_t BlobSize = 0; @@ -1109,7 +1062,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct ListBlobsByHierarchySinglePageResult { - std::string RequestId; std::string ServiceEndpoint; std::string BlobContainerName; std::string Prefix; @@ -1121,7 +1073,6 @@ namespace Azure { namespace Storage { namespace Blobs { struct ListBlobsSinglePageResult { - std::string RequestId; std::string ServiceEndpoint; std::string BlobContainerName; std::string Prefix; @@ -1260,7 +1211,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = ListBlobContainersSinglePageResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -1402,7 +1352,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -1536,7 +1485,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = FindBlobsByTagsSinglePageResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -3037,7 +2985,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3095,7 +3042,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -3136,7 +3082,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -3259,7 +3204,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3329,7 +3273,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = ListBlobsSinglePageResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -3402,7 +3345,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = ListBlobsByHierarchySinglePageResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -3523,7 +3465,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3586,7 +3527,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3645,7 +3585,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3706,7 +3645,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3765,7 +3703,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -3827,7 +3764,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -4810,7 +4746,6 @@ namespace Azure { namespace Storage { namespace Blobs { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } response.BodyStream = httpResponse.GetBodyStream(); - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); { const auto& headers = httpResponse.GetHeaders(); auto content_md5_iterator = headers.find("content-md5"); @@ -5137,7 +5072,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response(std::move(response), std::move(pHttpResponse)); } @@ -5190,7 +5124,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -5226,7 +5159,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response(std::move(response), std::move(pHttpResponse)); } @@ -5652,7 +5584,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -5760,7 +5691,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -5817,7 +5747,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -5958,7 +5887,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6013,7 +5941,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response( std::move(response), std::move(pHttpResponse)); } @@ -6112,7 +6039,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6182,7 +6108,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetBlobTagsResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response(std::move(response), std::move(pHttpResponse)); } @@ -6234,7 +6159,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); return Azure::Response(std::move(response), std::move(pHttpResponse)); } @@ -6307,7 +6231,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6380,7 +6303,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6455,7 +6377,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6528,7 +6449,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6610,7 +6530,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -6899,7 +6818,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -7028,7 +6946,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); { const auto& headers = httpResponse.GetHeaders(); auto content_md5_iterator = headers.find("content-md5"); @@ -7187,7 +7104,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); { const auto& headers = httpResponse.GetHeaders(); auto content_md5_iterator = headers.find("content-md5"); @@ -7364,7 +7280,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -7441,7 +7356,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetBlockListResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -7734,7 +7648,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -7903,7 +7816,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -8098,7 +8010,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -8263,7 +8174,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -8385,7 +8295,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -8490,7 +8399,6 @@ namespace Azure { namespace Storage { namespace Blobs { reinterpret_cast(httpResponseBody.data()), httpResponseBody.size()); response = GetPageBlobPageRangesResultFromXml(reader); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -8563,7 +8471,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -8878,7 +8785,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -9027,7 +8933,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -9206,7 +9111,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -9324,7 +9228,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag")); response.LastModified = Azure::DateTime::Parse( httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123); @@ -9372,7 +9275,6 @@ namespace Azure { namespace Storage { namespace Blobs { { throw StorageException::CreateFromResponse(std::move(pHttpResponse)); } - response.RequestId = httpResponse.GetHeaders().at("x-ms-request-id"); response.ContentType = httpResponse.GetHeaders().at("content-type"); return Azure::Response( std::move(response), std::move(pHttpResponse)); diff --git a/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp index 0ef294370..451f02d9b 100644 --- a/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/append_blob_client.cpp @@ -112,7 +112,6 @@ namespace Azure { namespace Storage { namespace Blobs { && e.ErrorCode == "BlobAlreadyExists") { Models::CreateAppendBlobResult ret; - ret.RequestId = e.RequestId; ret.Created = false; return Azure::Response( std::move(ret), std::move(e.RawResponse)); diff --git a/sdk/storage/azure-storage-blobs/src/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp index 13da8f93d..653e24e1d 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp @@ -562,7 +562,6 @@ namespace Azure { namespace Storage { namespace Blobs { *m_pipeline, m_blobUrl, protocolLayerOptions, context); StartCopyBlobOperation res; res.m_rawResponse = response.ExtractRawResponse(); - res.RequestId = std::move(response->RequestId); res.ETag = std::move(response->ETag); res.LastModified = std::move(response->LastModified); res.CopyId = std::move(response->CopyId); @@ -637,7 +636,6 @@ namespace Azure { namespace Storage { namespace Blobs { && (e.ErrorCode == "BlobNotFound" || e.ErrorCode == "ContainerNotFound")) { Models::DeleteBlobResult ret; - ret.RequestId = e.RequestId; ret.Deleted = false; return Azure::Response(std::move(ret), std::move(e.RawResponse)); } diff --git a/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp index cfd292b3b..54f450b5f 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp @@ -161,7 +161,6 @@ namespace Azure { namespace Storage { namespace Blobs { && e.ErrorCode == "ContainerAlreadyExists") { Models::CreateBlobContainerResult ret; - ret.RequestId = e.RequestId; ret.Created = false; return Azure::Response( std::move(ret), std::move(e.RawResponse)); @@ -196,7 +195,6 @@ namespace Azure { namespace Storage { namespace Blobs { && e.ErrorCode == "ContainerNotFound") { Models::DeleteBlobContainerResult ret; - ret.RequestId = e.RequestId; ret.Deleted = false; return Azure::Response( std::move(ret), std::move(e.RawResponse)); diff --git a/sdk/storage/azure-storage-blobs/src/blob_lease_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_lease_client.cpp index 9ee3d152e..6c73e0842 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_lease_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_lease_client.cpp @@ -37,7 +37,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::AcquireLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.LeaseId = std::move(response->LeaseId); @@ -66,7 +65,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::AcquireLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.LeaseId = std::move(response->LeaseId); @@ -101,7 +99,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::RenewLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.LeaseId = std::move(response->LeaseId); @@ -130,7 +127,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::RenewLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.LeaseId = std::move(response->LeaseId); @@ -165,7 +161,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::ReleaseLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); @@ -193,7 +188,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::ReleaseLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); @@ -229,7 +223,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::ChangeLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.LeaseId = std::move(response->LeaseId); @@ -259,7 +252,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::ChangeLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); ret.LeaseId = std::move(response->LeaseId); @@ -294,7 +286,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::BreakLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); @@ -322,7 +313,6 @@ namespace Azure { namespace Storage { namespace Blobs { context); Models::BreakLeaseResult ret; - ret.RequestId = std::move(response->RequestId); ret.ETag = std::move(response->ETag); ret.LastModified = std::move(response->LastModified); diff --git a/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp index 9e5c13e9a..5fbbd7f64 100644 --- a/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/page_blob_client.cpp @@ -120,7 +120,6 @@ namespace Azure { namespace Storage { namespace Blobs { && e.ErrorCode == "BlobAlreadyExists") { Models::CreatePageBlobResult ret; - ret.RequestId = e.RequestId; ret.Created = false; return Azure::Response( std::move(ret), std::move(e.RawResponse)); @@ -303,7 +302,6 @@ namespace Azure { namespace Storage { namespace Blobs { *m_pipeline, m_blobUrl, protocolLayerOptions, context); StartCopyBlobOperation res; res.m_rawResponse = response.ExtractRawResponse(); - res.RequestId = std::move(response->RequestId); res.ETag = std::move(response->ETag); res.LastModified = std::move(response->LastModified); res.CopyId = std::move(response->CopyId); diff --git a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp index c70b92041..9758c48fb 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp @@ -45,7 +45,6 @@ namespace Azure { namespace Storage { namespace Test { auto appendBlobClient = Azure::Storage::Blobs::AppendBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, RandomString()); auto blobContentInfo = appendBlobClient.Create(m_blobUploadOptions); - EXPECT_FALSE(blobContentInfo->RequestId.empty()); EXPECT_TRUE(blobContentInfo->ETag.HasValue()); EXPECT_TRUE(IsValidTime(blobContentInfo->LastModified)); EXPECT_TRUE(blobContentInfo->VersionId.HasValue()); @@ -61,7 +60,6 @@ namespace Azure { namespace Storage { namespace Test { auto blockContent = Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); auto appendResponse = appendBlobClient.AppendBlock(&blockContent); - EXPECT_FALSE(appendResponse->RequestId.empty()); properties = *appendBlobClient.GetProperties(); EXPECT_EQ(properties.CommittedBlockCount.GetValue(), 1); EXPECT_EQ(properties.BlobSize, static_cast(m_blobContent.size())); @@ -92,7 +90,6 @@ namespace Azure { namespace Storage { namespace Test { auto deleteResponse = appendBlobClient.Delete(); EXPECT_TRUE(deleteResponse->Deleted); - EXPECT_FALSE(deleteResponse->RequestId.empty()); EXPECT_THROW(appendBlobClient.Delete(), StorageException); } @@ -302,7 +299,6 @@ namespace Azure { namespace Storage { namespace Test { sealOptions.AccessConditions.IfAppendPositionEqual = m_blobContent.size(); auto sealResult = blobClient.Seal(sealOptions); - EXPECT_FALSE(sealResult->RequestId.empty()); EXPECT_TRUE(sealResult->ETag.HasValue()); EXPECT_TRUE(IsValidTime(sealResult->LastModified)); EXPECT_TRUE(sealResult->IsSealed); @@ -356,7 +352,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_THROW(blobClientWithoutAuth.CreateIfNotExists(), StorageException); { auto response = blobClient.CreateIfNotExists(); - EXPECT_FALSE(response->RequestId.empty()); EXPECT_TRUE(response->Created); } auto blobContent @@ -364,7 +359,6 @@ namespace Azure { namespace Storage { namespace Test { blobClient.AppendBlock(&blobContent); { auto response = blobClient.CreateIfNotExists(); - EXPECT_FALSE(response->RequestId.empty()); EXPECT_FALSE(response->Created); } auto downloadStream = std::move(blobClient.Download()->BodyStream); diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp index 4c7365954..9bcf4c5b3 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp @@ -61,9 +61,7 @@ namespace Azure { namespace Storage { namespace Test { metadata["key2"] = "TWO"; options.Metadata = metadata; auto res = container_client.Create(options); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); - EXPECT_EQ(res->RequestId, res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId)); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); EXPECT_TRUE(res->ETag.HasValue()); @@ -71,10 +69,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_THROW(container_client.Create(), StorageException); auto res2 = container_client.Delete(); - EXPECT_FALSE(res2->RequestId.empty()); EXPECT_FALSE(res2.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); - EXPECT_EQ( - res2->RequestId, res2.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId)); EXPECT_FALSE(res2.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res2.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); @@ -86,12 +81,10 @@ namespace Azure { namespace Storage { namespace Test { { auto response = container_client.DeleteIfExists(); EXPECT_FALSE(response->Deleted); - EXPECT_FALSE(response->RequestId.empty()); } { auto response = container_client.CreateIfNotExists(); EXPECT_TRUE(response->Created); - EXPECT_FALSE(response->RequestId.empty()); } { auto response = container_client.CreateIfNotExists(); @@ -109,7 +102,6 @@ namespace Azure { namespace Storage { namespace Test { metadata["key1"] = "one"; metadata["key2"] = "TWO"; auto res = m_blobContainerClient->SetMetadata(metadata); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); @@ -173,7 +165,6 @@ namespace Azure { namespace Storage { namespace Test { do { auto res = m_blobContainerClient->ListBlobsSinglePage(options); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); @@ -261,7 +252,6 @@ namespace Azure { namespace Storage { namespace Test { while (true) { auto res = m_blobContainerClient->ListBlobsByHierarchySinglePage(delimiter, options); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_EQ(res->Delimiter, delimiter); EXPECT_EQ(res->Prefix, options.Prefix.GetValue()); EXPECT_TRUE(res->Items.empty()); @@ -335,7 +325,6 @@ namespace Azure { namespace Storage { namespace Test { do { auto res = m_blobContainerClient->ListBlobsSinglePage(options); - EXPECT_FALSE(res->RequestId.empty()); options.ContinuationToken = res->ContinuationToken; for (const auto& blob : res->Items) { @@ -399,7 +388,6 @@ namespace Azure { namespace Storage { namespace Test { options.SignedIdentifiers.emplace_back(identifier); auto ret = container_client.SetAccessPolicy(options); - EXPECT_FALSE(ret->RequestId.empty()); EXPECT_TRUE(ret->ETag.HasValue()); EXPECT_TRUE(IsValidTime(ret->LastModified)); @@ -420,13 +408,11 @@ namespace Azure { namespace Storage { namespace Test { auto leaseDuration = std::chrono::seconds(20); Blobs::BlobLeaseClient leaseClient(containerClient, leaseId1); auto aLease = *leaseClient.Acquire(leaseDuration); - EXPECT_FALSE(aLease.RequestId.empty()); EXPECT_TRUE(aLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(aLease.LastModified)); EXPECT_EQ(aLease.LeaseId, leaseId1); EXPECT_EQ(leaseClient.GetLeaseId(), leaseId1); aLease = *leaseClient.Acquire(leaseDuration); - EXPECT_FALSE(aLease.RequestId.empty()); EXPECT_TRUE(aLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(aLease.LastModified)); EXPECT_EQ(aLease.LeaseId, leaseId1); @@ -437,7 +423,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(properties.LeaseDuration.GetValue(), Blobs::Models::LeaseDurationType::Fixed); auto rLease = *leaseClient.Renew(); - EXPECT_FALSE(rLease.RequestId.empty()); EXPECT_TRUE(rLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(rLease.LastModified)); EXPECT_EQ(rLease.LeaseId, leaseId1); @@ -445,7 +430,6 @@ namespace Azure { namespace Storage { namespace Test { std::string leaseId2 = Blobs::BlobLeaseClient::CreateUniqueLeaseId(); EXPECT_NE(leaseId1, leaseId2); auto cLease = *leaseClient.Change(leaseId2); - EXPECT_FALSE(cLease.RequestId.empty()); EXPECT_TRUE(cLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(cLease.LastModified)); EXPECT_EQ(cLease.LeaseId, leaseId2); @@ -453,7 +437,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(leaseClient.GetLeaseId(), leaseId2); auto containerInfo = *leaseClient.Release(); - EXPECT_FALSE(containerInfo.RequestId.empty()); EXPECT_TRUE(containerInfo.ETag.HasValue()); EXPECT_TRUE(IsValidTime(containerInfo.LastModified)); diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp index 40a94ee7f..aa72689c6 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp @@ -113,7 +113,6 @@ namespace Azure { namespace Storage { namespace Test { do { auto res = m_blobServiceClient.ListBlobContainersSinglePage(options); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); @@ -315,7 +314,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(downloadedProperties.DeleteRetentionPolicy, properties.DeleteRetentionPolicy); auto res = m_blobServiceClient.SetProperties(originalProperties); - EXPECT_FALSE(res->RequestId.empty()); } TEST_F(BlobServiceClientTest, AccountInfo) diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp index 29e312394..666a8694d 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp @@ -66,7 +66,6 @@ namespace Azure { namespace Storage { namespace Test { auto blobContent = Azure::Core::IO::MemoryBodyStream(m_blobContent.data(), m_blobContent.size()); auto blobContentInfo = blockBlobClient.Upload(&blobContent, m_blobUploadOptions); - EXPECT_FALSE(blobContentInfo->RequestId.empty()); EXPECT_TRUE(blobContentInfo->ETag.HasValue()); EXPECT_TRUE(IsValidTime(blobContentInfo->LastModified)); EXPECT_TRUE(blobContentInfo->VersionId.HasValue()); @@ -81,7 +80,6 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(BlockBlobClientTest, UploadDownload) { auto res = m_blockBlobClient->Download(); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_EQ(res->BlobSize, static_cast(m_blobContent.size())); EXPECT_EQ(res->ContentRange.Offset, 0); EXPECT_EQ(res->ContentRange.Length.GetValue(), static_cast(m_blobContent.size())); @@ -208,7 +206,6 @@ namespace Azure { namespace Storage { namespace Test { auto blobClient = m_blobContainerClient->GetBlobClient(RandomString()); auto res = blobClient.StartCopyFromUri(m_blockBlobClient->GetUrl()); EXPECT_EQ(res.GetRawResponse().GetStatusCode(), Azure::Core::Http::HttpStatusCode::Accepted); - EXPECT_FALSE(res.RequestId.empty()); EXPECT_TRUE(res.ETag.HasValue()); EXPECT_TRUE(IsValidTime(res.LastModified)); EXPECT_FALSE(res.CopyId.empty()); @@ -251,7 +248,6 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(BlockBlobClientTest, SnapShotVersions) { auto res = m_blockBlobClient->CreateSnapshot(); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); @@ -407,7 +403,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_TRUE(blobContentInfo->VersionId.HasValue()); EXPECT_FALSE(blobContentInfo->VersionId.GetValue().empty()); auto res = blockBlobClient.GetBlockList(); - EXPECT_FALSE(res->RequestId.empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderRequestId).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderDate).empty()); EXPECT_FALSE(res.GetRawResponse().GetHeaders().at(_internal::HttpHeaderXMsVersion).empty()); diff --git a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp index c2066b23a..94fbb550d 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp @@ -51,7 +51,6 @@ namespace Azure { namespace Storage { namespace Test { auto pageBlobClient = Azure::Storage::Blobs::PageBlobClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName, RandomString()); auto blobContentInfo = pageBlobClient.Create(0, m_blobUploadOptions); - EXPECT_FALSE(blobContentInfo->RequestId.empty()); EXPECT_TRUE(blobContentInfo->ETag.HasValue()); EXPECT_TRUE(IsValidTime(blobContentInfo->LastModified)); EXPECT_TRUE(blobContentInfo->VersionId.HasValue()); @@ -101,7 +100,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(ReadBodyStream(downloadContent->BodyStream), blobContent); auto pageRanges = *pageBlobClient.GetPageRanges(); - EXPECT_FALSE(pageRanges.RequestId.empty()); EXPECT_TRUE(pageRanges.ClearRanges.empty()); ASSERT_FALSE(pageRanges.PageRanges.empty()); EXPECT_EQ(static_cast(pageRanges.PageRanges[0].Offset), 3_KB); @@ -153,7 +151,6 @@ namespace Azure { namespace Storage { namespace Test { auto copyInfo = pageBlobClient.StartCopyIncremental(sourceUri.GetAbsoluteUrl()); EXPECT_EQ( copyInfo.GetRawResponse().GetStatusCode(), Azure::Core::Http::HttpStatusCode::Accepted); - EXPECT_FALSE(copyInfo.RequestId.empty()); EXPECT_TRUE(copyInfo.ETag.HasValue()); EXPECT_TRUE(IsValidTime(copyInfo.LastModified)); EXPECT_FALSE(copyInfo.CopyId.empty()); @@ -183,7 +180,6 @@ namespace Azure { namespace Storage { namespace Test { auto leaseDuration = std::chrono::seconds(20); auto leaseClient = Blobs::BlobLeaseClient(*m_pageBlobClient, leaseId1); auto aLease = *leaseClient.Acquire(leaseDuration); - EXPECT_FALSE(aLease.RequestId.empty()); EXPECT_TRUE(aLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(aLease.LastModified)); EXPECT_EQ(aLease.LeaseId, leaseId1); @@ -199,7 +195,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(properties.LeaseDuration.GetValue(), Blobs::Models::LeaseDurationType::Fixed); auto rLease = *leaseClient.Renew(); - EXPECT_FALSE(rLease.RequestId.empty()); EXPECT_TRUE(rLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(rLease.LastModified)); EXPECT_EQ(rLease.LeaseId, leaseId1); @@ -207,7 +202,6 @@ namespace Azure { namespace Storage { namespace Test { std::string leaseId2 = Blobs::BlobLeaseClient::CreateUniqueLeaseId(); EXPECT_NE(leaseId1, leaseId2); auto cLease = *leaseClient.Change(leaseId2); - EXPECT_FALSE(cLease.RequestId.empty()); EXPECT_TRUE(cLease.ETag.HasValue()); EXPECT_TRUE(IsValidTime(cLease.LastModified)); EXPECT_EQ(cLease.LeaseId, leaseId2); @@ -215,7 +209,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(leaseClient.GetLeaseId(), leaseId2); auto blobInfo = *leaseClient.Release(); - EXPECT_FALSE(blobInfo.RequestId.empty()); EXPECT_TRUE(blobInfo.ETag.HasValue()); EXPECT_TRUE(IsValidTime(blobInfo.LastModified)); @@ -304,7 +297,6 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_THROW(blobClientWithoutAuth.CreateIfNotExists(m_blobContent.size()), StorageException); { auto response = blobClient.CreateIfNotExists(m_blobContent.size()); - EXPECT_FALSE(response->RequestId.empty()); EXPECT_TRUE(response->Created); } diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp index 592fbe0f9..103c8f2ec 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp @@ -252,7 +252,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.Details.EncryptionKeySha256 = std::move(result->Details.EncryptionKeySha256); ret.Details.EncryptionScope = std::move(result->Details.EncryptionScope); ret.Details.IsServerEncrypted = result->Details.IsServerEncrypted; - ret.RequestId = std::move(result->RequestId); return Azure::Response(std::move(ret), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp index f609c8345..5571ca162 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp @@ -168,7 +168,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); ret.Created = true; - ret.RequestId = std::move(result->RequestId); return Azure::Response( std::move(ret), result.ExtractRawResponse()); } @@ -205,7 +204,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = m_blobContainerClient.Delete(blobOptions, context); Models::DeleteFileSystemResult ret; ret.Deleted = true; - ret.RequestId = std::move(result->RequestId); return Azure::Response( std::move(ret), result.ExtractRawResponse()); } @@ -260,7 +258,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Models::SetFileSystemMetadataResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - ret.RequestId = std::move(result->RequestId); return Azure::Response( std::move(ret), result.ExtractRawResponse()); } @@ -340,7 +337,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - ret.RequestId = std::move(result->RequestId); return Azure::Response( std::move(ret), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp index 56241296f..b6a43045d 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp @@ -217,7 +217,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Models::SetPathHttpHeadersResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - ret.RequestId = std::move(result->RequestId); return Azure::Response( std::move(ret), result.ExtractRawResponse()); } @@ -428,7 +427,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { Models::SetPathMetadataResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); - ret.RequestId = std::move(result->RequestId); return Azure::Response( std::move(ret), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp index 1f53f2d99..43214fad2 100644 --- a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp +++ b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp @@ -186,7 +186,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { auto result = m_blobServiceClient.ListBlobContainersSinglePage(blobOptions, context); auto response = Models::ListFileSystemsSinglePageResult(); response.ContinuationToken = std::move(result->ContinuationToken); - response.RequestId = std::move(result->RequestId); response.ServiceEndpoint = std::move(result->ServiceEndpoint); response.Prefix = std::move(result->Prefix); response.Items = FileSystemsFromContainerItems(std::move(result->Items));