Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Storage] Fixed parsing of path_name and file_system_name in async clients #23854

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-file-datalake/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

### Bugs Fixed
- Updated `create_file_system()` docstring to have the correct return-type of `None`
- Fixed parsing of extra `/` symbols not being stripped properly in `async` clients

## 12.6.0 (2022-03-08)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ def __init__(
**kwargs)
# to override the class field _container_client sync version
kwargs.pop('_hosts', None)
self._container_client = ContainerClient(self._blob_account_url, file_system_name,
self._container_client = ContainerClient(self._blob_account_url, self.file_system_name,
credential=credential,
_hosts=self._container_client._hosts,# pylint: disable=protected-access
**kwargs) # type: ignore # pylint: disable=protected-access
self._client = AzureDataLakeStorageRESTAPI(self.url, base_url=self.url,
file_system=file_system_name, pipeline=self._pipeline)
file_system=self.file_system_name, pipeline=self._pipeline)
self._datalake_client_for_blob_operation = AzureDataLakeStorageRESTAPI(self._container_client.url,
base_url=self._container_client.url,
file_system=file_system_name,
file_system=self.file_system_name,
pipeline=self._pipeline)
api_version = get_api_version(kwargs)
self._client._config.version = api_version # pylint: disable=protected-access
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ def __init__(

kwargs.pop('_hosts', None)

self._blob_client = BlobClient(account_url=self._blob_account_url, container_name=file_system_name,
blob_name=path_name,
self._blob_client = BlobClient(account_url=self._blob_account_url, container_name=self.file_system_name,
blob_name=self.path_name,
credential=credential,
_hosts=self._blob_client._hosts, # pylint: disable=protected-access
**kwargs)

self._client = AzureDataLakeStorageRESTAPI(self.url, base_url=self.url, file_system=file_system_name,
path=path_name, pipeline=self._pipeline)
self._client = AzureDataLakeStorageRESTAPI(self.url, base_url=self.url, file_system=self.file_system_name,
path=self.path_name, pipeline=self._pipeline)
self._datalake_client_for_blob_operation = AzureDataLakeStorageRESTAPI(self._blob_client.url,
base_url=self._blob_client.url,
file_system=file_system_name,
path=path_name,
file_system=self.file_system_name,
path=self.path_name,
pipeline=self._pipeline)
api_version = get_api_version(kwargs)
self._client._config.version = api_version # pylint: disable=protected-access
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
interactions:
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:26 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.blob.core.windows.net/filesystem916811e6?restype=container&timeout=5
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Wed, 06 Apr 2022 22:36:25 GMT
etag:
- '"0x8DA181DE2E5EAE8"'
last-modified:
- Wed, 06 Apr 2022 22:36:26 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version:
- '2020-10-02'
status:
code: 201
message: Created
- request:
body: null
headers:
Accept:
- application/json
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:26 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.dfs.core.windows.net/filesystem916811e6/file916811e6?resource=file
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Wed, 06 Apr 2022 22:36:26 GMT
etag:
- '"0x8DA181DE33191DD"'
last-modified:
- Wed, 06 Apr 2022 22:36:27 GMT
server:
- Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
x-ms-request-server-encrypted:
- 'true'
x-ms-version:
- '2020-10-02'
status:
code: 201
message: Created
- request:
body: null
headers:
Accept:
- application/json
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:27 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.dfs.core.windows.net/filesystem916811e6/file916811e6?resource=file
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Wed, 06 Apr 2022 22:36:26 GMT
etag:
- '"0x8DA181DE33D9E10"'
last-modified:
- Wed, 06 Apr 2022 22:36:27 GMT
server:
- Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
x-ms-request-server-encrypted:
- 'true'
x-ms-version:
- '2020-10-02'
status:
code: 201
message: Created
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:27 GMT
x-ms-version:
- '2020-10-02'
method: DELETE
uri: https://storagename.blob.core.windows.net/filesystem916811e6?restype=container
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Wed, 06 Apr 2022 22:36:26 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version:
- '2020-10-02'
status:
code: 202
message: Accepted
version: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
interactions:
- request:
body: null
headers:
Accept:
- application/xml
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:34 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.blob.core.windows.net/filesystem8a8a16e0?restype=container&timeout=5
response:
body:
string: ''
headers:
content-length: '0'
date: Wed, 06 Apr 2022 22:36:34 GMT
etag: '"0x8DA181DE7C7C166"'
last-modified: Wed, 06 Apr 2022 22:36:34 GMT
server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version: '2020-10-02'
status:
code: 201
message: Created
url: https://vincenttrancanary.blob.core.windows.net/filesystem8a8a16e0?restype=container&timeout=5
- request:
body: null
headers:
Accept:
- application/json
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:35 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.dfs.core.windows.net/filesystem8a8a16e0/file8a8a16e0?resource=file
response:
body:
string: ''
headers:
content-length: '0'
date: Wed, 06 Apr 2022 22:36:34 GMT
etag: '"0x8DA181DE7F67F66"'
last-modified: Wed, 06 Apr 2022 22:36:35 GMT
server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
x-ms-request-server-encrypted: 'true'
x-ms-version: '2020-10-02'
status:
code: 201
message: Created
url: https://vincenttrancanary.dfs.core.windows.net/filesystem8a8a16e0/file8a8a16e0?resource=file
- request:
body: null
headers:
Accept:
- application/json
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:35 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.dfs.core.windows.net/filesystem8a8a16e0/file8a8a16e0?resource=file
response:
body:
string: ''
headers:
content-length: '0'
date: Wed, 06 Apr 2022 22:36:34 GMT
etag: '"0x8DA181DE80068FD"'
last-modified: Wed, 06 Apr 2022 22:36:35 GMT
server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
x-ms-request-server-encrypted: 'true'
x-ms-version: '2020-10-02'
status:
code: 201
message: Created
url: https://vincenttrancanary.dfs.core.windows.net/filesystem8a8a16e0/file8a8a16e0?resource=file
- request:
body: null
headers:
Accept:
- application/xml
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 22:36:35 GMT
x-ms-version:
- '2020-10-02'
method: DELETE
uri: https://storagename.blob.core.windows.net/filesystem8a8a16e0?restype=container
response:
body:
string: ''
headers:
content-length: '0'
date: Wed, 06 Apr 2022 22:36:34 GMT
server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version: '2020-10-02'
status:
code: 202
message: Accepted
url: https://vincenttrancanary.blob.core.windows.net/filesystem8a8a16e0?restype=container
version: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
interactions:
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 21:20:58 GMT
x-ms-version:
- '2020-10-02'
method: PUT
uri: https://storagename.blob.core.windows.net/filesystem92cc1716/?restype=container
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Wed, 06 Apr 2022 21:20:58 GMT
etag:
- '"0x8DA181357FF4FD1"'
last-modified:
- Wed, 06 Apr 2022 21:20:58 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version:
- '2020-10-02'
status:
code: 201
message: Created
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-dfs/12.7.0b1 Python/3.10.2 (Windows-10-10.0.19044-SP0)
x-ms-date:
- Wed, 06 Apr 2022 21:20:58 GMT
x-ms-version:
- '2020-10-02'
method: DELETE
uri: https://storagename.blob.core.windows.net/filesystem92cc1716?restype=container
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Wed, 06 Apr 2022 21:20:58 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version:
- '2020-10-02'
status:
code: 202
message: Accepted
version: 1
Loading