Renamed DataLakePathClient::GetAccessControls to DataLakePathClient::GetAccessControlList. (#1448)
* Renamed DataLakePathClient::GetAccessControls to DataLakePathClient::GetAccessControl. * Changing to GetAccessControlList
This commit is contained in:
parent
3522c4967f
commit
878bd3bf9a
@ -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)
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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<Models::GetDataLakePathAccessControlResult> containing the
|
||||
* @return Azure::Core::Response<Models::GetDataLakePathAccessControlListResult> containing the
|
||||
* access control list of the path.
|
||||
* @remark This request is sent to dfs endpoint.
|
||||
*/
|
||||
Azure::Core::Response<Models::GetDataLakePathAccessControlResult> GetAccessControls(
|
||||
const GetDataLakePathAccessControlOptions& options
|
||||
= GetDataLakePathAccessControlOptions()) const;
|
||||
Azure::Core::Response<Models::GetDataLakePathAccessControlListResult> GetAccessControlList(
|
||||
const GetDataLakePathAccessControlListOptions& options
|
||||
= GetDataLakePathAccessControlListOptions()) const;
|
||||
|
||||
/**
|
||||
* @brief Sets the metadata of a resource the path points to.
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -394,8 +394,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
|
||||
std::move(ret), result.ExtractRawResponse());
|
||||
}
|
||||
|
||||
Azure::Core::Response<Models::GetDataLakePathAccessControlResult>
|
||||
DataLakePathClient::GetAccessControls(const GetDataLakePathAccessControlOptions& options) const
|
||||
Azure::Core::Response<Models::GetDataLakePathAccessControlListResult>
|
||||
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<Models::GetDataLakePathAccessControlResult>(
|
||||
return Azure::Core::Response<Models::GetDataLakePathAccessControlListResult>(
|
||||
std::move(ret), result.ExtractRawResponse());
|
||||
}
|
||||
|
||||
|
||||
@ -349,8 +349,8 @@ namespace Azure { namespace Storage { namespace Test {
|
||||
Files::DataLake::Models::PathSetAccessControlRecursiveMode::Modify, acls));
|
||||
std::vector<Files::DataLake::Models::Acl> resultAcls1;
|
||||
std::vector<Files::DataLake::Models::Acl> 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(
|
||||
|
||||
@ -195,7 +195,7 @@ namespace Azure { namespace Storage { namespace Test {
|
||||
std::vector<Files::DataLake::Models::Acl> acls = GetValidAcls();
|
||||
EXPECT_NO_THROW(m_pathClient->SetAccessControlList(acls));
|
||||
std::vector<Files::DataLake::Models::Acl> 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);
|
||||
}
|
||||
{
|
||||
|
||||
@ -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));
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user