github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Resolved the issue in datalake/file where file/path/directory/share/f… (#796)

Browse Source 
* Resolved the issue in datalake/file where file/path/directory/share/filesystem name are not encoded.

* Refined special char string

* Resolve comments.
This commit is contained in:
Kan Tang 2020-10-16 14:26:50 +08:00 committed by GitHub
parent 95fea7af78
commit ef4b7c5268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 105 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/storage/azure-storage-blobs/CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Release History
## 1.0.0-beta.4
### Bug Fixes
* Unencoded Container/Blob name is now encoded.
## 1.0.0-beta.3 (2020-10-13)
### New Features

2
sdk/storage/azure-storage-blobs/version.txt
View File

@ -1 +1 @@
1.0.0-beta.3
1.0.0-beta.4

6
sdk/storage/azure-storage-files-datalake/CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Release History
## 1.0.0-beta.4
### Bug Fixes
* Unencoded FileSystem/File/Path/Directory name is now encoded.
## 1.0.0-beta.3 (2020-10-13)
### New Features

12
sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp
View File

@ -28,8 +28,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto directoryUri = std::move(parsedConnectionString.DataLakeServiceUri);
directoryUri.AppendPath(fileSystemName);
directoryUri.AppendPath(path);
directoryUri.AppendPath(Storage::Details::UrlEncodePath(fileSystemName));
directoryUri.AppendPath(Storage::Details::UrlEncodePath(path));
if (parsedConnectionString.KeyCredential)
{
@ -132,9 +132,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
FileClient DirectoryClient::GetFileClient(const std::string& path) const
{
auto builder = m_dfsUri;
builder.AppendPath(path);
builder.AppendPath(Storage::Details::UrlEncodePath(path));
auto blobClient = m_blobClient;
blobClient.m_blobUrl.AppendPath(path);
blobClient.m_blobUrl.AppendPath(Storage::Details::UrlEncodePath(path));
auto blockBlobClient = blobClient.GetBlockBlobClient();
return FileClient(
std::move(builder), std::move(blobClient), std::move(blockBlobClient), m_pipeline);
@ -143,9 +143,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
DirectoryClient DirectoryClient::GetSubDirectoryClient(const std::string& path) const
{
auto builder = m_dfsUri;
builder.AppendPath(path);
builder.AppendPath(Storage::Details::UrlEncodePath(path));
auto blobClient = m_blobClient;
blobClient.m_blobUrl.AppendPath(path);
blobClient.m_blobUrl.AppendPath(Storage::Details::UrlEncodePath(path));
return DirectoryClient(std::move(builder), std::move(blobClient), m_pipeline);
}

4
sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
View File

@ -106,8 +106,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto fileUri = std::move(parsedConnectionString.DataLakeServiceUri);
fileUri.AppendPath(fileSystemName);
fileUri.AppendPath(filePath);
fileUri.AppendPath(Storage::Details::UrlEncodePath(fileSystemName));
fileUri.AppendPath(Storage::Details::UrlEncodePath(filePath));
if (parsedConnectionString.KeyCredential)
{

8
sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
View File

@ -46,7 +46,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto fileSystemUri = std::move(parsedConnectionString.DataLakeServiceUri);
fileSystemUri.AppendPath(fileSystemName);
fileSystemUri.AppendPath(Storage::Details::UrlEncodePath(fileSystemName));
if (parsedConnectionString.KeyCredential)
{
@ -163,7 +163,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
PathClient FileSystemClient::GetPathClient(const std::string& path) const
{
auto builder = m_dfsUri;
builder.AppendPath(path);
builder.AppendPath(Storage::Details::UrlEncodePath(path));
return PathClient(builder, m_blobContainerClient.GetBlobClient(path), m_pipeline);
}
@ -171,7 +171,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
auto builder = m_dfsUri;
builder.AppendPath(path);
builder.AppendPath(Storage::Details::UrlEncodePath(path));
auto blobClient = m_blobContainerClient.GetBlobClient(path);
auto blockBlobClient = blobClient.GetBlockBlobClient();
return FileClient(
@ -181,7 +181,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
DirectoryClient FileSystemClient::GetDirectoryClient(const std::string& path) const
{
auto builder = m_dfsUri;
builder.AppendPath(path);
builder.AppendPath(Storage::Details::UrlEncodePath(path));
return DirectoryClient(builder, m_blobContainerClient.GetBlobClient(path), m_pipeline);
}

4
sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
View File

@ -90,8 +90,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto pathUri = std::move(parsedConnectionString.DataLakeServiceUri);
pathUri.AppendPath(fileSystemName);
pathUri.AppendPath(path);
pathUri.AppendPath(Storage::Details::UrlEncodePath(fileSystemName));
pathUri.AppendPath(Storage::Details::UrlEncodePath(path));
if (parsedConnectionString.KeyCredential)
{

6
sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
View File

@ -164,7 +164,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
FileSystemClient ServiceClient::GetFileSystemClient(const std::string& fileSystemName) const
{
auto builder = m_dfsUri;
builder.AppendPath(fileSystemName);
builder.AppendPath(Storage::Details::UrlEncodePath(fileSystemName));
return FileSystemClient(
builder, m_blobServiceClient.GetBlobContainerClient(fileSystemName), m_pipeline);
}
@ -179,8 +179,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
blobOptions.MaxResults = options.MaxResults;
auto result = m_blobServiceClient.ListBlobContainersSegment(blobOptions);
auto response = ListFileSystemsSegmentResult();
response.ContinuationToken
= result->ContinuationToken.empty() ? response.ContinuationToken : result->ContinuationToken;
response.ContinuationToken = result->ContinuationToken.empty() ? response.ContinuationToken
: result->ContinuationToken;
response.Filesystems = FileSystemsFromContainerItems(result->Items);
return Azure::Core::Response<ListFileSystemsSegmentResult>(
std::move(response), result.ExtractRawResponse());

33
sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.cpp
View File

@ -2,6 +2,7 @@
// SPDX-License-Identifier: MIT
#include "datalake_file_system_client_test.hpp"
#include "azure/storage/common/crypt.hpp"
#include "azure/storage/files/datalake/datalake_options.hpp"
#include <algorithm>
@ -249,4 +250,36 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_LE(2U, response->Paths.size());
}
}
TEST_F(DataLakeFileSystemClientTest, UnencodedPathDirectoryFileNameWorks)
{
const std::string non_ascii_word = "\xE6\xB5\x8B\xE8\xAF\x95";
const std::string encoded_non_ascii_word = "%E6%B5%8B%E8%AF%95";
std::string baseName = "a b c / !@#$%^&*(?/<>,.;:'\"[]{}|`~\\) def" + non_ascii_word;
{
std::string pathName = baseName + RandomString();
auto pathClient = m_fileSystemClient->GetPathClient(pathName);
EXPECT_NO_THROW(pathClient.Create(Files::DataLake::PathResourceType::File));
auto pathUrl = pathClient.GetUri();
EXPECT_EQ(
pathUrl, m_fileSystemClient->GetUri() + "/" + Storage::Details::UrlEncodePath(pathName));
}
{
std::string directoryName = baseName + RandomString();
auto directoryClient = m_fileSystemClient->GetDirectoryClient(directoryName);
EXPECT_NO_THROW(directoryClient.Create());
auto directoryUrl = directoryClient.GetUri();
EXPECT_EQ(
directoryUrl,
m_fileSystemClient->GetUri() + "/" + Storage::Details::UrlEncodePath(directoryName));
}
{
std::string fileName = baseName + RandomString();
auto fileClient = m_fileSystemClient->GetFileClient(fileName);
EXPECT_NO_THROW(fileClient.Create());
auto fileUrl = fileClient.GetUri();
EXPECT_EQ(
fileUrl, m_fileSystemClient->GetUri() + "/" + Storage::Details::UrlEncodePath(fileName));
}
}
}}} // namespace Azure::Storage::Test

2
sdk/storage/azure-storage-files-datalake/version.txt
View File

@ -1 +1 @@
1.0.0-beta.3
1.0.0-beta.4

6
sdk/storage/azure-storage-files-shares/CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Release History
## 1.0.0-beta.4
### Bug Fixes
* Unencoded Share/File/Directory name is now encoded.
## 1.0.0-beta.3 (2020-10-13)
### New Features

6
sdk/storage/azure-storage-files-shares/src/share_client.cpp
View File

@ -24,7 +24,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto shareUri = std::move(parsedConnectionString.FileServiceUri);
shareUri.AppendPath(shareName);
shareUri.AppendPath(Storage::Details::UrlEncodePath(shareName));
if (parsedConnectionString.KeyCredential)
{
@ -115,14 +115,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
DirectoryClient ShareClient::GetDirectoryClient(const std::string& directoryPath) const
{
auto builder = m_shareUri;
builder.AppendPath(directoryPath);
builder.AppendPath(Storage::Details::UrlEncodePath(directoryPath));
return DirectoryClient(builder, m_pipeline);
}
FileClient ShareClient::GetFileClient(const std::string& filePath) const
{
auto builder = m_shareUri;
builder.AppendPath(filePath);
builder.AppendPath(Storage::Details::UrlEncodePath(filePath));
return FileClient(builder, m_pipeline);
}

8
sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
View File

@ -24,8 +24,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto directoryUri = std::move(parsedConnectionString.FileServiceUri);
directoryUri.AppendPath(shareName);
directoryUri.AppendPath(directoryPath);
directoryUri.AppendPath(Storage::Details::UrlEncodePath(shareName));
directoryUri.AppendPath(Storage::Details::UrlEncodePath(directoryPath));
if (parsedConnectionString.KeyCredential)
{
@ -118,14 +118,14 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
DirectoryClient DirectoryClient::GetSubDirectoryClient(const std::string& subDirectoryName) const
{
auto builder = m_shareDirectoryUri;
builder.AppendPath(subDirectoryName);
builder.AppendPath(Storage::Details::UrlEncodePath(subDirectoryName));
return DirectoryClient(builder, m_pipeline);
}
FileClient DirectoryClient::GetFileClient(const std::string& filePath) const
{
auto builder = m_shareDirectoryUri;
builder.AppendPath(filePath);
builder.AppendPath(Storage::Details::UrlEncodePath(filePath));
return FileClient(builder, m_pipeline);
}

4
sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
View File

@ -27,8 +27,8 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
auto parsedConnectionString = Azure::Storage::Details::ParseConnectionString(connectionString);
auto fileUri = std::move(parsedConnectionString.FileServiceUri);
fileUri.AppendPath(shareName);
fileUri.AppendPath(filePath);
fileUri.AppendPath(Storage::Details::UrlEncodePath(shareName));
fileUri.AppendPath(Storage::Details::UrlEncodePath(filePath));
if (parsedConnectionString.KeyCredential)
{

2
sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
View File

@ -111,7 +111,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
ShareClient ServiceClient::GetShareClient(const std::string& shareName) const
{
auto builder = m_serviceUri;
builder.AppendPath(shareName);
builder.AppendPath(Storage::Details::UrlEncodePath(shareName));
return ShareClient(builder, m_pipeline);
}

24
sdk/storage/azure-storage-files-shares/test/share_client_test.cpp
View File

@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// SPDX-License-Identifier: MIT
#include "azure/storage/common/crypt.hpp"
#include "share_client_test.hpp"
#include <algorithm>
@ -298,4 +299,27 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_THROW(m_shareClient->Delete(), StorageError);
}
TEST_F(FileShareClientTest, UnencodedDirectoryFileNameWorks)
{
const std::string non_ascii_word = "\xE6\xB5\x8B\xE8\xAF\x95";
const std::string encoded_non_ascii_word = "%E6%B5%8B%E8%AF%95";
std::string baseName = "a b c !@#$%^&(,.;'[]{}`~) def" + non_ascii_word;
{
std::string directoryName = baseName + RandomString();
auto directoryClient = m_shareClient->GetDirectoryClient(directoryName);
EXPECT_NO_THROW(directoryClient.Create());
auto directoryUrl = directoryClient.GetUri();
EXPECT_EQ(
directoryUrl,
m_shareClient->GetUri() + "/" + Storage::Details::UrlEncodePath(directoryName));
}
{
std::string fileName = baseName + RandomString();
auto fileClient = m_shareClient->GetFileClient(fileName);
EXPECT_NO_THROW(fileClient.Create(1024));
auto fileUrl = fileClient.GetUri();
EXPECT_EQ(fileUrl, m_shareClient->GetUri() + "/" + Storage::Details::UrlEncodePath(fileName));
}
}
}}} // namespace Azure::Storage::Test

2
sdk/storage/azure-storage-files-shares/version.txt
View File

@ -1 +1 @@
1.0.0-beta.3
1.0.0-beta.4