From 84f7445302e535746ab509b7ded205ae074fbb0e Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Mon, 25 Jan 2021 15:35:56 +0800 Subject: [PATCH] `PublicAccessType::Private` was renamed to `PublicAccessType::None` (#1453) * rename PublicAccessType::Private to None * changelog * fix --- sdk/storage/azure-storage-blobs/CHANGELOG.md | 1 + .../inc/azure/storage/blobs/blob_options.hpp | 4 ++-- .../storage/blobs/protocol/blob_rest_client.hpp | 12 ++++++------ .../azure-storage-blobs/src/blob_rest_client.cpp | 2 +- .../test/blob_container_client_test.cpp | 2 +- .../src/datalake_file_system_client.cpp | 6 +++--- .../src/datalake_service_client.cpp | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md index 4a85cfb6d..c4497bd90 100644 --- a/sdk/storage/azure-storage-blobs/CHANGELOG.md +++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md @@ -13,6 +13,7 @@ - `ListType` in `GetBlockListOptions` was changed to non-nullable. - Added `BlobLeaseClient`, all lease related APIs are moved to `BlobLeaseClient`. - Type for lease duration in requests was changed to `std::chrono::seconds`, in response was changed to enum. +- `PublicAccessType::Private` was renamed to `PublicAccessType::None`. - `startsOn` parameter for `GetUserDelegationKey` was changed to optional. ## 12.0.0-beta.6 (2020-01-14) diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp index 742da11b3..77c240218 100644 --- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp +++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp @@ -293,7 +293,7 @@ namespace Azure { namespace Storage { namespace Blobs { * @brief Specifies whether data in the container may be accessed publicly and the level * of access. */ - Models::PublicAccessType AccessType = Models::PublicAccessType::Private; + Models::PublicAccessType AccessType = Models::PublicAccessType::None; /** * @brief Name-value pairs to associate with the container as metadata. @@ -445,7 +445,7 @@ namespace Azure { namespace Storage { namespace Blobs { * @brief Specifies whether data in the container may be accessed publicly and the level * of access. */ - Models::PublicAccessType AccessType = Models::PublicAccessType::Private; + Models::PublicAccessType AccessType = Models::PublicAccessType::None; /** * @brief Stored access policies that you can use to provide fine grained control over 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 cdaf9e8f4..749bb67f9 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 @@ -543,7 +543,7 @@ namespace Azure { namespace Storage { namespace Blobs { const std::string& Get() const { return m_value; } AZ_STORAGE_BLOBS_DLLEXPORT const static PublicAccessType BlobContainer; AZ_STORAGE_BLOBS_DLLEXPORT const static PublicAccessType Blob; - AZ_STORAGE_BLOBS_DLLEXPORT const static PublicAccessType Private; + AZ_STORAGE_BLOBS_DLLEXPORT const static PublicAccessType None; private: std::string m_value; @@ -751,7 +751,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; Azure::Core::DateTime LastModified; Storage::Metadata Metadata; - PublicAccessType AccessType = PublicAccessType::Private; + PublicAccessType AccessType = PublicAccessType::None; bool HasImmutabilityPolicy = false; bool HasLegalHold = false; Azure::Core::Nullable LeaseDuration; @@ -799,7 +799,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct GetBlobContainerAccessPolicyResult { std::string RequestId; - PublicAccessType AccessType = PublicAccessType::Private; + PublicAccessType AccessType = PublicAccessType::None; std::string ETag; Azure::Core::DateTime LastModified; std::vector SignedIdentifiers; @@ -811,7 +811,7 @@ namespace Azure { namespace Storage { namespace Blobs { std::string ETag; Azure::Core::DateTime LastModified; Storage::Metadata Metadata; - PublicAccessType AccessType = PublicAccessType::Private; + PublicAccessType AccessType = PublicAccessType::None; bool HasImmutabilityPolicy = false; bool HasLegalHold = false; Azure::Core::Nullable LeaseDuration; @@ -3093,7 +3093,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct CreateBlobContainerOptions { Azure::Core::Nullable Timeout; - PublicAccessType AccessType = PublicAccessType::Private; + PublicAccessType AccessType = PublicAccessType::None; Storage::Metadata Metadata; Azure::Core::Nullable DefaultEncryptionScope; Azure::Core::Nullable PreventEncryptionScopeOverride; @@ -3580,7 +3580,7 @@ namespace Azure { namespace Storage { namespace Blobs { struct SetBlobContainerAccessPolicyOptions { Azure::Core::Nullable Timeout; - PublicAccessType AccessType = PublicAccessType::Private; + PublicAccessType AccessType = PublicAccessType::None; Azure::Core::Nullable LeaseId; Azure::Core::Nullable IfModifiedSince; Azure::Core::Nullable IfUnmodifiedSince; diff --git a/sdk/storage/azure-storage-blobs/src/blob_rest_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_rest_client.cpp index a44dc5293..398bca5e9 100644 --- a/sdk/storage/azure-storage-blobs/src/blob_rest_client.cpp +++ b/sdk/storage/azure-storage-blobs/src/blob_rest_client.cpp @@ -73,7 +73,7 @@ namespace Azure { namespace Storage { namespace Blobs { namespace Models { const PublicAccessType PublicAccessType::BlobContainer("container"); const PublicAccessType PublicAccessType::Blob("blob"); - const PublicAccessType PublicAccessType::Private(""); + const PublicAccessType PublicAccessType::None(""); const RehydratePriority RehydratePriority::High("High"); const RehydratePriority RehydratePriority::Standard("Standard"); 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 770d3fa45..759747c51 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 @@ -681,7 +681,7 @@ namespace Azure { namespace Storage { namespace Test { auto timeAfter = lastModifiedTime + std::chrono::seconds(1); Blobs::SetBlobContainerAccessPolicyOptions options; - options.AccessType = Blobs::Models::PublicAccessType::Private; + options.AccessType = Blobs::Models::PublicAccessType::None; if (condition == Condition::ModifiedSince) { options.AccessConditions.IfModifiedSince 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 6defa3d67..72d83e7e0 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 @@ -203,7 +203,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } else if (options.AccessType == Models::PublicAccessType::None) { - blobOptions.AccessType = Blobs::Models::PublicAccessType::Private; + blobOptions.AccessType = Blobs::Models::PublicAccessType::None; } else { @@ -340,7 +340,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { ret.AccessType = Models::PublicAccessType::Path; } - else if (result->AccessType == Blobs::Models::PublicAccessType::Private) + else if (result->AccessType == Blobs::Models::PublicAccessType::None) { ret.AccessType = Models::PublicAccessType::None; } @@ -376,7 +376,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { } else if (options.AccessType == Models::PublicAccessType::None) { - blobOptions.AccessType = Blobs::Models::PublicAccessType::Private; + blobOptions.AccessType = Blobs::Models::PublicAccessType::None; } else { 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 5065bb1c6..b15718cfb 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 @@ -54,7 +54,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { fileSystem.AccessType = Models::PublicAccessType::Path; } - else if (item.AccessType == Blobs::Models::PublicAccessType::Private) + else if (item.AccessType == Blobs::Models::PublicAccessType::None) { fileSystem.AccessType = Models::PublicAccessType::None; }