Skip to content

[Storage] Hotfix for empty file download through Azurite #26897

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.

Sign up for GitHub

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

Merged
jalauzon-msft merged 5 commits into from
Oct 18, 2022
Merged

[Storage] Hotfix for empty file download through Azurite #26897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb485e1
[Storage] Fix content range check for empty files (#26872)
daviddavis Oct 18, 2022
36a6720
Bump versions and update CHANGELOGs
jalauzon-msft Oct 18, 2022
dcb680c
Bump blob dep in datalake
jalauzon-msft Oct 18, 2022
cd5ad6c
Fix other file-share bug
jalauzon-msft Oct 18, 2022
66180e4
Pull file-share fix
jalauzon-msft Oct 18, 2022
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
5 changes: 5 additions & 0 deletions sdk/storage/azure-storage-blob/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release History

## 12.14.1 (Unreleased)

### Bugs Fixed
- Fixed possible `ValueError` for invalid content range that gets raised when downloading empty blobs through Azurite.

## 12.14.0 (2022-10-11)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/azure/storage/blob/_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def _initial_request(self):
# Parse the total file size and adjust the download size if ranges
# were specified
self._file_size = parse_length_from_content_range(response.properties.content_range)
if not self._file_size:
if self._file_size is None:
raise ValueError("Required Content-Range response header is missing or malformed.")
# Remove any extra encryption data size from blob size
self._file_size = adjust_blob_size_for_encryption(self._file_size, self._encryption_data)
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/azure/storage/blob/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# license information.
# --------------------------------------------------------------------------

VERSION = "12.14.0"
VERSION = "12.14.1"
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ async def _initial_request(self):
# Parse the total file size and adjust the download size if ranges
# were specified
self._file_size = parse_length_from_content_range(response.properties.content_range)
if not self._file_size:
if self._file_size is None:
raise ValueError("Required Content-Range response header is missing or malformed.")
# Remove any extra encryption data size from blob size
self._file_size = adjust_blob_size_for_encryption(self._file_size, self._encryption_data)
Expand Down
5 changes: 5 additions & 0 deletions sdk/storage/azure-storage-file-datalake/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release History

## 12.9.1 (Unreleased)

### Bugs Fixed
- Fixed possible `ValueError` for invalid content range that gets raised when downloading empty files through Azurite.

## 12.9.0 (2022-10-11)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# license information.
# --------------------------------------------------------------------------

VERSION = "12.9.0"
VERSION = "12.9.1"
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-file-datalake/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
install_requires=[
"azure-core<2.0.0,>=1.24.2",
"msrest>=0.7.1",
"azure-storage-blob<13.0.0,>=12.14.0"
"azure-storage-blob<13.0.0,>=12.14.1"
],
)
5 changes: 5 additions & 0 deletions sdk/storage/azure-storage-file-share/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release History

## 12.10.1 (Unreleased)

### Bugs Fixed
- Fixed possible `ValueError` for invalid content range that gets raised when downloading empty files through Azurite.

## 12.10.0 (2022-10-11)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-file-share/azure/storage/fileshare/_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def _initial_request(self):
# Parse the total file size and adjust the download size if ranges
# were specified
self._file_size = parse_length_from_content_range(response.properties.content_range)
if not self._file_size:
if self._file_size is None:
raise ValueError("Required Content-Range response header is missing or malformed.")

if self._end_range is not None:
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# license information.
# --------------------------------------------------------------------------

VERSION = "12.10.0"
VERSION = "12.10.1"
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_download_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ async def _initial_request(self):
# Parse the total file size and adjust the download size if ranges
# were specified
self._file_size = parse_length_from_content_range(response.properties.content_range)
if not self._file_size:
if self._file_size is None:
raise ValueError("Required Content-Range response header is missing or malformed.")

if self._end_range is not None:
Expand Down
2 changes: 1 addition & 1 deletion shared_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ yarl<2.0,>=1.0
#override azure-storage-file-share msrest>=0.7.1
#override azure-storage-file-datalake azure-core<2.0.0,>=1.24.2
#override azure-storage-file-datalake msrest>=0.7.1
#override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.14.0
#override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.14.1
#override azure-security-attestation azure-core<2.0.0,>=1.8.2
#override azure-schemaregistry azure-core<2.0.0,>=1.24.0
#override azure-schemaregistry-avroencoder typing-extensions>=4.0.1
Expand Down