From 9a594458887c947635b2da89195d5d600a8acd92 Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Tue, 22 Dec 2020 10:02:29 +0800 Subject: [PATCH] rename some bool variables, make IsServerEncrypted non-nullable (#1238) * rename some bool variables, make IsServerEncrypted non-nullable * remove encryption stuff from ClearPages response, since this API never returns these stuff --- sdk/storage/azure-storage-blobs/CHANGELOG.md | 3 + .../azure/storage/blobs/blob_responses.hpp | 2 +- .../blobs/protocol/blob_rest_client.hpp | 282 +++++++----------- .../azure-storage-blobs/src/blob_client.cpp | 4 +- .../src/block_blob_client.cpp | 4 +- .../test/blob_container_client_test.cpp | 10 +- .../test/blob_service_client_test.cpp | 12 +- .../test/block_blob_client_test.cpp | 2 + .../src/datalake_file_client.cpp | 4 +- .../src/datalake_path_client.cpp | 4 +- 10 files changed, 131 insertions(+), 196 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index 5996ae5dc..964f70d9b 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -49,6 +49,9 @@ - Move Blob SAS into `Azure::Storage::Sas` namespace. - Replace all transactional content MD5/CRC64 with `ContentHash` struct. - `ContentMd5` HTTP header and `EncrytionKeySha256` are changed to binary(`std::vector`). +- `ServerEncrypted` fields are renamed to `IsServerEncrypted`, and changed to non-nullable type. +- Add `Is` prefix to bool variable names. Like `IsAccessTierInferred`, `IsDeleted`. +- `IsServerEncrypted`, `EncryptionKeySha256` and `EncryptionScope` are removed from `ClearPageBlobPagesResult`, since they are never returned from storage server. ## 12.0.0-beta.5 (2020-11-13) 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 3a6014a7c..6bbd2e3d2 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 @@ -22,7 +22,7 @@ namespace Azure { namespace Storage { namespace Blobs { namespace Models { BlobHttpHeaders HttpHeaders; Storage::Metadata Metadata; Models::BlobType BlobType = Models::BlobType::Unknown; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; }; 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 34112db7d..3826a32c7 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 @@ -88,7 +88,7 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable TransactionalContentHash; int64_t AppendOffset = 0; int64_t CommittedBlockCount = 0; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct AppendBlockFromUriResult @@ -100,7 +100,7 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable TransactionalContentHash; int64_t AppendOffset = 0; int64_t CommittedBlockCount = 0; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct AppendBlockResult @@ -242,9 +242,6 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; std::string LastModified; int64_t SequenceNumber = 0; - Azure::Core::Nullable ServerEncrypted; - Azure::Core::Nullable> EncryptionKeySha256; - Azure::Core::Nullable EncryptionScope; }; // struct ClearPageBlobPagesResult struct CommitBlockListResult @@ -252,7 +249,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; std::string LastModified; Azure::Core::Nullable VersionId; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable TransactionalContentHash; @@ -270,7 +267,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; std::string LastModified; Azure::Core::Nullable VersionId; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct CreateAppendBlobResult @@ -287,7 +284,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; std::string LastModified; Azure::Core::Nullable VersionId; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct CreateBlobSnapshotResult @@ -297,7 +294,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; std::string LastModified; Azure::Core::Nullable VersionId; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable SequenceNumber; @@ -561,7 +558,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct StageBlockFromUriResult { Azure::Core::Nullable TransactionalContentHash; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct StageBlockFromUriResult @@ -569,7 +566,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct StageBlockResult { Azure::Core::Nullable TransactionalContentHash; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct StageBlockResult @@ -592,7 +589,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; std::string LastModified; Azure::Core::Nullable VersionId; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable TransactionalContentHash; @@ -604,7 +601,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string LastModified; Azure::Core::Nullable TransactionalContentHash; int64_t SequenceNumber = 0; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct UploadPageBlobPagesFromUriResult @@ -615,7 +612,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string LastModified; Azure::Core::Nullable TransactionalContentHash; int64_t SequenceNumber = 0; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; }; // struct UploadPageBlobPagesResult @@ -658,7 +655,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct BlobMetrics { std::string Version; - bool Enabled = false; + bool IsEnabled = false; BlobRetentionPolicy RetentionPolicy; Azure::Core::Nullable IncludeApis; }; // struct BlobMetrics @@ -780,7 +777,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct BlobItem { std::string Name; - bool Deleted = false; + bool IsDeleted = false; std::string Snapshot; Azure::Core::Nullable VersionId; Azure::Core::Nullable IsCurrentVersion; @@ -794,11 +791,11 @@ namespace Azure { namespace Storage { namespace Blobs { int64_t ContentLength = 0; Blobs::Models::BlobType BlobType = Blobs::Models::BlobType::Unknown; Azure::Core::Nullable Tier; - Azure::Core::Nullable AccessTierInferred; + Azure::Core::Nullable IsAccessTierInferred; BlobLeaseStatus LeaseStatus = BlobLeaseStatus::Unlocked; BlobLeaseState LeaseState = BlobLeaseState::Available; Azure::Core::Nullable LeaseDuration; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable SequenceNumber; // only for page blobd @@ -826,7 +823,7 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable LeaseDuration; Azure::Core::Nullable LeaseState; Azure::Core::Nullable LeaseStatus; - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable @@ -853,11 +850,11 @@ namespace Azure { namespace Storage { namespace Blobs { Azure::Core::Nullable SequenceNumber; // only for page blob Azure::Core::Nullable CommittedBlockCount; // only for append blob Azure::Core::Nullable IsSealed; // only for append blob - Azure::Core::Nullable ServerEncrypted; + bool IsServerEncrypted = false; Azure::Core::Nullable> EncryptionKeySha256; Azure::Core::Nullable EncryptionScope; Azure::Core::Nullable Tier; - Azure::Core::Nullable AccessTierInferred; + Azure::Core::Nullable IsAccessTierInferred; Azure::Core::Nullable ArchiveStatus; Azure::Core::Nullable AccessTierChangeTime; Azure::Core::Nullable CopyId; @@ -3055,7 +3052,7 @@ namespace Azure { namespace Storage { namespace Blobs { } else if (path.size() == 1 && path[0] == XmlTagName::k_Enabled) { - ret.Enabled = std::strcmp(node.Value, "true") == 0; + ret.IsEnabled = std::strcmp(node.Value, "true") == 0; } else if (path.size() == 1 && path[0] == XmlTagName::k_IncludeAPIs) { @@ -3323,8 +3320,8 @@ namespace Azure { namespace Storage { namespace Blobs { Storage::Details::XmlWriter& writer, const SetServicePropertiesOptions& options) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "StorageServiceProperties"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "StorageServiceProperties"}); BlobServicePropertiesToXml(writer, options.Properties); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } @@ -3353,16 +3350,16 @@ namespace Azure { namespace Storage { namespace Blobs { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (options.DefaultServiceVersion.HasValue()) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "DefaultServiceVersion"}); - writer.Write( - Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - options.DefaultServiceVersion.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "DefaultServiceVersion"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.DefaultServiceVersion.GetValue().data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "DeleteRetentionPolicy"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "DeleteRetentionPolicy"}); BlobRetentionPolicyToXml(writer, options.DeleteRetentionPolicy); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); writer.Write( @@ -3393,8 +3390,8 @@ namespace Azure { namespace Storage { namespace Blobs { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::Text, nullptr, options.Write ? "true" : "false"}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "RetentionPolicy"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "RetentionPolicy"}); BlobRetentionPolicyToXml(writer, options.RetentionPolicy); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } @@ -3425,11 +3422,12 @@ namespace Azure { namespace Storage { namespace Blobs { writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::Text, nullptr, options.ExposedHeaders.data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "MaxAgeInSeconds"}); - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - std::to_string(options.MaxAgeInSeconds).data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "MaxAgeInSeconds"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + std::to_string(options.MaxAgeInSeconds).data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } @@ -3446,20 +3444,20 @@ namespace Azure { namespace Storage { namespace Blobs { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Enabled"}); writer.Write(Storage::Details::XmlNode{ - Storage::Details::XmlNodeType::Text, nullptr, options.Enabled ? "true" : "false"}); + Storage::Details::XmlNodeType::Text, nullptr, options.IsEnabled ? "true" : "false"}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (options.IncludeApis.HasValue()) { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "IncludeAPIs"}); - writer.Write( - Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - options.IncludeApis.GetValue() ? "true" : "false"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.IncludeApis.GetValue() ? "true" : "false"}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "RetentionPolicy"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "RetentionPolicy"}); BlobRetentionPolicyToXml(writer, options.RetentionPolicy); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } @@ -3477,9 +3475,10 @@ namespace Azure { namespace Storage { namespace Blobs { { writer.Write( Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Days"}); - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - std::to_string(options.Days.GetValue()).data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + std::to_string(options.Days.GetValue()).data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } } @@ -3495,30 +3494,32 @@ namespace Azure { namespace Storage { namespace Blobs { writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); if (options.IndexDocument.HasValue()) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "IndexDocument"}); - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - options.IndexDocument.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "IndexDocument"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.IndexDocument.GetValue().data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } if (options.DefaultIndexDocumentPath.HasValue()) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "DefaultIndexDocumentPath"}); - writer.Write( - Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - options.DefaultIndexDocumentPath.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "DefaultIndexDocumentPath"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.DefaultIndexDocumentPath.GetValue().data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } if (options.ErrorDocument404Path.HasValue()) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "ErrorDocument404Path"}); - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::Text, - nullptr, - options.ErrorDocument404Path.GetValue().data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "ErrorDocument404Path"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::Text, + nullptr, + options.ErrorDocument404Path.GetValue().data()}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } } @@ -4826,7 +4827,7 @@ namespace Azure { namespace Storage { namespace Blobs { } else if (path.size() == 1 && path[0] == XmlTagName::k_Deleted) { - ret.Deleted = std::strcmp(node.Value, "true") == 0; + ret.IsDeleted = std::strcmp(node.Value, "true") == 0; } else if (path.size() == 1 && path[0] == XmlTagName::k_Snapshot) { @@ -4928,7 +4929,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.size() == 2 && path[0] == XmlTagName::k_Properties && path[1] == XmlTagName::k_AccessTierInferred) { - ret.AccessTierInferred = std::strcmp(node.Value, "true") == 0; + ret.IsAccessTierInferred = std::strcmp(node.Value, "true") == 0; } else if ( path.size() == 2 && path[0] == XmlTagName::k_Properties @@ -4952,7 +4953,7 @@ namespace Azure { namespace Storage { namespace Blobs { path.size() == 2 && path[0] == XmlTagName::k_Properties && path[1] == XmlTagName::k_ServerEncrypted) { - ret.ServerEncrypted = std::strcmp(node.Value, "true") == 0; + ret.IsServerEncrypted = std::strcmp(node.Value, "true") == 0; } else if ( path.size() == 2 && path[0] == XmlTagName::k_Properties @@ -5203,8 +5204,8 @@ namespace Azure { namespace Storage { namespace Blobs { Storage::Details::XmlWriter& writer, const SetBlobContainerAccessPolicyOptions& options) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "SignedIdentifiers"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "SignedIdentifiers"}); for (const auto& i : options.SignedIdentifiers) { BlobSignedIdentifierToXml(writer, i); @@ -5216,8 +5217,8 @@ namespace Azure { namespace Storage { namespace Blobs { Storage::Details::XmlWriter& writer, const BlobSignedIdentifier& options) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - "SignedIdentifier"}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, "SignedIdentifier"}); writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "Id"}); writer.Write(Storage::Details::XmlNode{ Storage::Details::XmlNodeType::Text, nullptr, options.Id.data()}); @@ -5414,12 +5415,8 @@ namespace Azure { namespace Storage { namespace Blobs { { response.Metadata.emplace(i->first.substr(10), i->second); } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -5877,12 +5874,8 @@ namespace Azure { namespace Storage { namespace Blobs { { response.IsSealed = response_is_sealed_iterator->second == "true"; } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -5901,11 +5894,12 @@ namespace Azure { namespace Storage { namespace Blobs { { response.Tier = AccessTierFromString(response_tier_iterator->second); } - auto response_access_tier_inferred_iterator + auto response_is_access_tier_inferred_iterator = httpResponse.GetHeaders().find("x-ms-access-tier-inferred"); - if (response_access_tier_inferred_iterator != httpResponse.GetHeaders().end()) + if (response_is_access_tier_inferred_iterator != httpResponse.GetHeaders().end()) { - response.AccessTierInferred = response_access_tier_inferred_iterator->second == "true"; + response.IsAccessTierInferred + = response_is_access_tier_inferred_iterator->second == "true"; } auto response_archive_status_iterator = httpResponse.GetHeaders().find("x-ms-archive-status"); @@ -6519,12 +6513,8 @@ namespace Azure { namespace Storage { namespace Blobs { } response.ETag = httpResponse.GetHeaders().at("etag"); response.LastModified = httpResponse.GetHeaders().at("last-modified"); - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -7291,12 +7281,8 @@ namespace Azure { namespace Storage { namespace Blobs { { response.VersionId = response_version_id_iterator->second; } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -7412,12 +7398,8 @@ namespace Azure { namespace Storage { namespace Blobs { response.TransactionalContentHash = std::move(hash); } } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -7572,12 +7554,8 @@ namespace Azure { namespace Storage { namespace Blobs { response.TransactionalContentHash = std::move(hash); } } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -7734,12 +7712,8 @@ namespace Azure { namespace Storage { namespace Blobs { { response.VersionId = response_version_id_iterator->second; } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -7960,9 +7934,10 @@ namespace Azure { namespace Storage { namespace Blobs { Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, "BlockList"}); for (const auto& i : options.BlockList) { - writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::StartTag, - BlockTypeToString(i.first).data(), - i.second.data()}); + writer.Write(Storage::Details::XmlNode{ + Storage::Details::XmlNodeType::StartTag, + BlockTypeToString(i.first).data(), + i.second.data()}); } writer.Write(Storage::Details::XmlNode{Storage::Details::XmlNodeType::EndTag}); } @@ -8107,12 +8082,8 @@ namespace Azure { namespace Storage { namespace Blobs { { response.VersionId = response_version_id_iterator->second; } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -8281,12 +8252,8 @@ namespace Azure { namespace Storage { namespace Blobs { } response.SequenceNumber = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-sequence-number")); - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -8461,12 +8428,8 @@ namespace Azure { namespace Storage { namespace Blobs { } response.SequenceNumber = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-sequence-number")); - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -8599,25 +8562,6 @@ namespace Azure { namespace Storage { namespace Blobs { response.LastModified = httpResponse.GetHeaders().at("last-modified"); response.SequenceNumber = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-sequence-number")); - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } - auto response_encryption_key_sha256_iterator - = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); - if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) - { - response.EncryptionKeySha256 - = Base64Decode(response_encryption_key_sha256_iterator->second); - } - auto response_encryption_scope_iterator - = httpResponse.GetHeaders().find("x-ms-encryption-scope"); - if (response_encryption_scope_iterator != httpResponse.GetHeaders().end()) - { - response.EncryptionScope = response_encryption_scope_iterator->second; - } return Azure::Core::Response( std::move(response), std::move(pHttpResponse)); } @@ -9212,12 +9156,8 @@ namespace Azure { namespace Storage { namespace Blobs { { response.VersionId = response_version_id_iterator->second; } - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -9373,12 +9313,8 @@ namespace Azure { namespace Storage { namespace Blobs { = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-append-offset")); response.CommittedBlockCount = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-committed-block-count")); - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) @@ -9551,12 +9487,8 @@ namespace Azure { namespace Storage { namespace Blobs { = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-append-offset")); response.CommittedBlockCount = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-committed-block-count")); - auto response_server_encrypted_iterator - = httpResponse.GetHeaders().find("x-ms-request-server-encrypted"); - if (response_server_encrypted_iterator != httpResponse.GetHeaders().end()) - { - response.ServerEncrypted = response_server_encrypted_iterator->second == "true"; - } + response.IsServerEncrypted + = httpResponse.GetHeaders().at("x-ms-request-server-encrypted") == "true"; auto response_encryption_key_sha256_iterator = httpResponse.GetHeaders().find("x-ms-encryption-key-sha256"); if (response_encryption_key_sha256_iterator != httpResponse.GetHeaders().end()) diff --git a/sdk/storage/azure-storage-blobs/src/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp index 2ae7298de..b10e3f524 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp @@ -290,7 +290,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.HttpHeaders = std::move(response->HttpHeaders); ret.Metadata = std::move(response->Metadata); ret.BlobType = response->BlobType; - ret.ServerEncrypted = response->ServerEncrypted; + ret.IsServerEncrypted = response->IsServerEncrypted; ret.EncryptionKeySha256 = std::move(response->EncryptionKeySha256); return Azure::Core::Response( std::move(ret), @@ -431,7 +431,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.HttpHeaders = std::move(response->HttpHeaders); ret.Metadata = std::move(response->Metadata); ret.BlobType = response->BlobType; - ret.ServerEncrypted = response->ServerEncrypted; + ret.IsServerEncrypted = response->IsServerEncrypted; ret.EncryptionKeySha256 = std::move(response->EncryptionKeySha256); return Azure::Core::Response( std::move(ret), diff --git a/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp index d012e8bbe..83cc99839 100644 --- a/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp @@ -171,7 +171,7 @@ namespace Azure { namespace Storage { namespace Blobs { ret.ETag = std::move(commitBlockListResponse->ETag); ret.LastModified = std::move(commitBlockListResponse->LastModified); ret.VersionId = std::move(commitBlockListResponse->VersionId); - ret.ServerEncrypted = commitBlockListResponse->ServerEncrypted; + ret.IsServerEncrypted = commitBlockListResponse->IsServerEncrypted; ret.EncryptionKeySha256 = std::move(commitBlockListResponse->EncryptionKeySha256); ret.EncryptionScope = std::move(commitBlockListResponse->EncryptionScope); return Azure::Core::Response( @@ -252,7 +252,7 @@ namespace Azure { namespace Storage { namespace Blobs { result.ETag = commitBlockListResponse->ETag; result.LastModified = commitBlockListResponse->LastModified; result.VersionId = commitBlockListResponse->VersionId; - result.ServerEncrypted = commitBlockListResponse->ServerEncrypted; + result.IsServerEncrypted = commitBlockListResponse->IsServerEncrypted; result.EncryptionKeySha256 = commitBlockListResponse->EncryptionKeySha256; result.EncryptionScope = commitBlockListResponse->EncryptionScope; return Azure::Core::Response( diff --git a/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp index 4f4d2b2e2..2d71b776b 100644 --- a/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.cpp @@ -180,7 +180,7 @@ namespace Azure { namespace Storage { namespace Test { if (blob.BlobType == Blobs::Models::BlobType::BlockBlob) { EXPECT_TRUE(blob.Tier.HasValue()); - EXPECT_TRUE(blob.AccessTierInferred.HasValue()); + EXPECT_TRUE(blob.IsAccessTierInferred.HasValue()); } if (blob.Tier.HasValue()) { @@ -346,7 +346,7 @@ namespace Azure { namespace Storage { namespace Test { foundNotCurrentVersion = true; } } - if (blob.Deleted) + if (blob.IsDeleted) { foundDeleted = true; } @@ -564,8 +564,7 @@ namespace Azure { namespace Storage { namespace Test { std::string appendBlobName = RandomString(); auto appendBlob = containerClient.GetAppendBlobClient(appendBlobName); auto blobContentInfo = *appendBlob.Create(); - EXPECT_TRUE(blobContentInfo.ServerEncrypted.HasValue()); - EXPECT_TRUE(blobContentInfo.ServerEncrypted.GetValue()); + EXPECT_TRUE(blobContentInfo.IsServerEncrypted); EXPECT_TRUE(blobContentInfo.EncryptionKeySha256.HasValue()); EXPECT_EQ( blobContentInfo.EncryptionKeySha256.GetValue(), @@ -603,8 +602,7 @@ namespace Azure { namespace Storage { namespace Test { std::string pageBlobName = RandomString(); auto pageBlob = containerClient.GetPageBlobClient(pageBlobName); auto blobContentInfo = *pageBlob.Create(0); - EXPECT_TRUE(blobContentInfo.ServerEncrypted.HasValue()); - EXPECT_TRUE(blobContentInfo.ServerEncrypted.GetValue()); + EXPECT_TRUE(blobContentInfo.IsServerEncrypted); EXPECT_TRUE(blobContentInfo.EncryptionKeySha256.HasValue()); EXPECT_EQ( blobContentInfo.EncryptionKeySha256.GetValue(), diff --git a/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp index 81a006337..27f605afb 100644 --- a/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp @@ -174,7 +174,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_TRUE(logging.RetentionPolicy.Days.HasValue()); } auto hourMetrics = properties.HourMetrics; - if (hourMetrics.Enabled) + if (hourMetrics.IsEnabled) { EXPECT_FALSE(hourMetrics.Version.empty()); if (hourMetrics.RetentionPolicy.Enabled) @@ -183,7 +183,7 @@ namespace Azure { namespace Storage { namespace Test { } } auto minuteMetrics = properties.HourMetrics; - if (minuteMetrics.Enabled) + if (minuteMetrics.IsEnabled) { EXPECT_FALSE(minuteMetrics.Version.empty()); if (minuteMetrics.RetentionPolicy.Enabled) @@ -218,12 +218,12 @@ namespace Azure { namespace Storage { namespace Test { properties.Logging.RetentionPolicy.Enabled = true; properties.Logging.RetentionPolicy.Days = 3; - properties.HourMetrics.Enabled = true; + properties.HourMetrics.IsEnabled = true; properties.HourMetrics.RetentionPolicy.Enabled = true; properties.HourMetrics.RetentionPolicy.Days = 4; properties.HourMetrics.IncludeApis = true; - properties.MinuteMetrics.Enabled = true; + properties.MinuteMetrics.IsEnabled = true; properties.MinuteMetrics.RetentionPolicy.Enabled = true; properties.MinuteMetrics.RetentionPolicy.Days = 4; properties.MinuteMetrics.IncludeApis = true; @@ -266,7 +266,7 @@ namespace Azure { namespace Storage { namespace Test { EXPECT_EQ(downloadedProperties.Logging.RetentionPolicy, properties.Logging.RetentionPolicy); EXPECT_EQ(downloadedProperties.HourMetrics.Version, properties.HourMetrics.Version); - EXPECT_EQ(downloadedProperties.HourMetrics.Enabled, properties.HourMetrics.Enabled); + EXPECT_EQ(downloadedProperties.HourMetrics.IsEnabled, properties.HourMetrics.IsEnabled); EXPECT_EQ( downloadedProperties.HourMetrics.IncludeApis.HasValue(), properties.HourMetrics.IncludeApis.HasValue()); @@ -281,7 +281,7 @@ namespace Azure { namespace Storage { namespace Test { downloadedProperties.HourMetrics.RetentionPolicy, properties.HourMetrics.RetentionPolicy); EXPECT_EQ(downloadedProperties.MinuteMetrics.Version, properties.MinuteMetrics.Version); - EXPECT_EQ(downloadedProperties.MinuteMetrics.Enabled, properties.MinuteMetrics.Enabled); + EXPECT_EQ(downloadedProperties.MinuteMetrics.IsEnabled, properties.MinuteMetrics.IsEnabled); EXPECT_EQ( downloadedProperties.MinuteMetrics.IncludeApis.HasValue(), properties.MinuteMetrics.IncludeApis.HasValue()); diff --git a/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp index a3fc8757a..a15a52a11 100644 --- a/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.cpp @@ -207,9 +207,11 @@ namespace Azure { namespace Storage { namespace Test { auto snapshotClient = m_blockBlobClient->WithSnapshot(res->Snapshot); EXPECT_EQ(ReadBodyStream(snapshotClient.Download()->BodyStream), m_blobContent); EXPECT_EQ(snapshotClient.GetProperties()->Metadata, m_blobUploadOptions.Metadata); + EXPECT_TRUE(snapshotClient.GetProperties()->IsServerEncrypted); auto versionClient = m_blockBlobClient->WithVersionId(res->VersionId.GetValue()); EXPECT_EQ(ReadBodyStream(versionClient.Download()->BodyStream), m_blobContent); EXPECT_EQ(versionClient.GetProperties()->Metadata, m_blobUploadOptions.Metadata); + EXPECT_TRUE(versionClient.GetProperties()->IsServerEncrypted); auto emptyContent = Azure::Core::Http::MemoryBodyStream(nullptr, 0); EXPECT_THROW(snapshotClient.Upload(&emptyContent), StorageException); EXPECT_THROW(snapshotClient.SetMetadata({}), StorageException); 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 bb43105b1..8ab33a80a 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 @@ -382,7 +382,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.ContentLength = result->ContentLength; ret.HttpHeaders = FromBlobHttpHeaders(std::move(result->HttpHeaders)); ret.Metadata = std::move(result->Metadata); - ret.ServerEncrypted = std::move(result->ServerEncrypted); + ret.ServerEncrypted = result->IsServerEncrypted; ret.EncryptionKeySha256 = std::move(result->EncryptionKeySha256); return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); @@ -399,7 +399,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.ContentLength = result->ContentLength; ret.HttpHeaders = FromBlobHttpHeaders(std::move(result->HttpHeaders)); ret.Metadata = std::move(result->Metadata); - ret.ServerEncrypted = std::move(result->ServerEncrypted); + ret.ServerEncrypted = result->IsServerEncrypted; ret.EncryptionKeySha256 = std::move(result->EncryptionKeySha256); return Azure::Core::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 0b1b4635f..9460cdeb4 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 @@ -308,9 +308,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.HttpHeaders.ContentEncoding = std::move(result->HttpHeaders.ContentEncoding); ret.HttpHeaders.ContentLanguage = std::move(result->HttpHeaders.ContentLanguage); ret.HttpHeaders.ContentType = std::move(result->HttpHeaders.ContentType); - ret.ServerEncrypted = std::move(result->ServerEncrypted); + ret.ServerEncrypted = result->IsServerEncrypted; ret.EncryptionKeySha256 = std::move(result->EncryptionKeySha256); - ret.AccessTierInferred = std::move(result->AccessTierInferred); + ret.AccessTierInferred = std::move(result->IsAccessTierInferred); ret.AccessTierChangeTime = std::move(result->AccessTierChangeTime); ret.CopyId = std::move(result->CopyId); ret.CopySource = std::move(result->CopySource);