diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md index 9941db0fc..1c3389ae2 100644 --- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md @@ -35,6 +35,7 @@ ### Other Changes and Improvements - Changed `DataLakeFileClient::Flush`'s `endingOffset` parameter's name to `position`. +- Renamed `DataLakePathClient::GetAccessControls` to `DataLakePathClient::GetAccessControlList`. - Removed unused parameters, options, results and functions in protocol layer. ## 12.0.0-beta.6 (2020-01-14) diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp index 89110d5d0..01820a353 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp @@ -526,9 +526,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { }; /** - * @brief Optional parameters for PathClient::GetAccessControl + * @brief Optional parameters for PathClient::GetAccessControlList */ - struct GetDataLakePathAccessControlOptions + struct GetDataLakePathAccessControlListOptions { /** * @brief Context for cancelling long running operations. diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp index 9f3636447..769628f7f 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp @@ -183,13 +183,13 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { /** * @brief Returns all access control list stored for the given path. * @param options Optional parameters to get the ACLs from the resource the path points to. - * @return Azure::Core::Response containing the + * @return Azure::Core::Response containing the * access control list of the path. * @remark This request is sent to dfs endpoint. */ - Azure::Core::Response GetAccessControls( - const GetDataLakePathAccessControlOptions& options - = GetDataLakePathAccessControlOptions()) const; + Azure::Core::Response GetAccessControlList( + const GetDataLakePathAccessControlListOptions& options + = GetDataLakePathAccessControlListOptions()) const; /** * @brief Sets the metadata of a resource the path points to. diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp index 38234677a..0bf90f731 100644 --- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp +++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp @@ -165,7 +165,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam std::string RequestId; }; - struct GetDataLakePathAccessControlResult + struct GetDataLakePathAccessControlListResult { std::string ETag; Core::DateTime LastModified; 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 efb039918..e5c77ba8f 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 @@ -394,8 +394,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { std::move(ret), result.ExtractRawResponse()); } - Azure::Core::Response - DataLakePathClient::GetAccessControls(const GetDataLakePathAccessControlOptions& options) const + Azure::Core::Response + DataLakePathClient::GetAccessControlList( + const GetDataLakePathAccessControlListOptions& options) const { Details::DataLakeRestClient::Path::GetPropertiesOptions protocolLayerOptions; protocolLayerOptions.Action = Models::PathGetPropertiesAction::GetAccessControl; @@ -411,7 +412,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { { acl = Models::Acl::DeserializeAcls(result->Acl.GetValue()); } - Models::GetDataLakePathAccessControlResult ret; + Models::GetDataLakePathAccessControlListResult ret; ret.ETag = std::move(result->ETag); ret.LastModified = std::move(result->LastModified); if (!acl.HasValue()) @@ -433,7 +434,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { ret.Permissions = result->Permissions.GetValue(); } ret.RequestId = std::move(result->RequestId); - return Azure::Core::Response( + return Azure::Core::Response( std::move(ret), result.ExtractRawResponse()); } diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp index 5a138a73b..eb2c7f2d4 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.cpp @@ -349,8 +349,8 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::Models::PathSetAccessControlRecursiveMode::Modify, acls)); std::vector resultAcls1; std::vector resultAcls2; - EXPECT_NO_THROW(resultAcls1 = directoryClient1.GetAccessControls()->Acls); - EXPECT_NO_THROW(resultAcls2 = directoryClient2.GetAccessControls()->Acls); + EXPECT_NO_THROW(resultAcls1 = directoryClient1.GetAccessControlList()->Acls); + EXPECT_NO_THROW(resultAcls2 = directoryClient2.GetAccessControlList()->Acls); for (const auto& acl : resultAcls2) { auto iter = std::find_if( diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp index da2298d3d..70d2c2a57 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp @@ -195,7 +195,7 @@ namespace Azure { namespace Storage { namespace Test { std::vector acls = GetValidAcls(); EXPECT_NO_THROW(m_pathClient->SetAccessControlList(acls)); std::vector resultAcls; - EXPECT_NO_THROW(resultAcls = m_pathClient->GetAccessControls()->Acls); + EXPECT_NO_THROW(resultAcls = m_pathClient->GetAccessControlList()->Acls); EXPECT_EQ(resultAcls.size(), acls.size() + 1); // Always append mask::rwx for (const auto& acl : acls) { @@ -245,16 +245,16 @@ namespace Azure { namespace Storage { namespace Test { pathClient.Create(Files::DataLake::Models::PathResourceType::File); std::string pathPermissions = "rwxrw-rw-"; EXPECT_NO_THROW(pathClient.SetPermissions(pathPermissions)); - auto result = pathClient.GetAccessControls(); + auto result = pathClient.GetAccessControlList(); EXPECT_EQ(pathPermissions, result->Permissions); pathPermissions = "rw-rw-rw-"; EXPECT_NO_THROW(pathClient.SetPermissions(pathPermissions)); - result = pathClient.GetAccessControls(); + result = pathClient.GetAccessControlList(); EXPECT_EQ(pathPermissions, result->Permissions); EXPECT_NO_THROW(pathClient.SetPermissions("0766")); - result = pathClient.GetAccessControls(); + result = pathClient.GetAccessControlList(); EXPECT_EQ("rwxrw-rw-", result->Permissions); } { diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp index 578277dc1..1e8cd3493 100644 --- a/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/datalake_sas_test.cpp @@ -131,19 +131,19 @@ namespace Azure { namespace Storage { namespace Test { auto verify_file_execute = [&](const std::string& sas) { fileClient0.Create(); auto fileClient = Files::DataLake::DataLakeFileClient(fileUrl + sas); - EXPECT_NO_THROW(fileClient0.GetAccessControls()); + EXPECT_NO_THROW(fileClient0.GetAccessControlList()); }; auto verify_file_ownership = [&](const std::string& sas) { fileClient0.Create(); auto fileClient = Files::DataLake::DataLakeFileClient(fileUrl + sas); - EXPECT_NO_THROW(fileClient0.GetAccessControls()); + EXPECT_NO_THROW(fileClient0.GetAccessControlList()); }; auto verify_file_permissions = [&](const std::string& sas) { fileClient0.Create(); auto fileClient = Files::DataLake::DataLakeFileClient(fileUrl + sas); - auto acls = fileClient0.GetAccessControls()->Acls; + auto acls = fileClient0.GetAccessControlList()->Acls; EXPECT_NO_THROW(fileClient.SetAccessControlList(acls)); };