From 3988a1031fcb6fa57d3f7a5865dce5df8a3e4522 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon <96087589+jalauzon-msft@users.noreply.github.com> Date: Tue, 18 Oct 2022 16:52:38 -0700 Subject: [PATCH 1/5] [Storage] Hotfix for empty file download through Azurite (#26897) --- sdk/storage/azure-storage-blob/CHANGELOG.md | 5 +++++ .../azure-storage-blob/azure/storage/blob/_download.py | 2 +- .../azure-storage-blob/azure/storage/blob/_version.py | 2 +- .../azure/storage/blob/aio/_download_async.py | 2 +- sdk/storage/azure-storage-file-datalake/CHANGELOG.md | 5 +++++ .../azure/storage/filedatalake/_version.py | 2 +- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- sdk/storage/azure-storage-file-share/CHANGELOG.md | 5 +++++ .../azure/storage/fileshare/_download.py | 2 +- .../azure/storage/fileshare/_version.py | 2 +- .../azure/storage/fileshare/aio/_download_async.py | 2 +- shared_requirements.txt | 2 +- 12 files changed, 24 insertions(+), 9 deletions(-) diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md index c2df51840eeb..0f876824ed6e 100644 --- a/sdk/storage/azure-storage-blob/CHANGELOG.md +++ b/sdk/storage/azure-storage-blob/CHANGELOG.md @@ -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 diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py index 1414aaa500e6..9d2b2346826c 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py @@ -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) diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py index 7777ec2fc86d..e4d6df9851a1 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py @@ -4,4 +4,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "12.14.0" +VERSION = "12.14.1" diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py index fe1afaae8768..d13da65f19cb 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py @@ -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) diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md index dacdc1c0f79e..e5f0a42e0bf3 100644 --- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md @@ -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 diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py index 68dc9539e3f5..4a05b531a35d 100644 --- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py +++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py @@ -4,4 +4,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "12.9.0" +VERSION = "12.9.1" diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index f234256dc0a8..3e0c6cb5cc04 100644 --- a/sdk/storage/azure-storage-file-datalake/setup.py +++ b/sdk/storage/azure-storage-file-datalake/setup.py @@ -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" ], ) diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md index a259721db1b3..fa373b721847 100644 --- a/sdk/storage/azure-storage-file-share/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md @@ -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 diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_download.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_download.py index 3d54cb5fea94..94a0e25ec773 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_download.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_download.py @@ -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: diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py index ebd52d612793..13f4a7220094 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py @@ -4,4 +4,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "12.10.0" +VERSION = "12.10.1" diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_download_async.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_download_async.py index d1fc02bc7394..ffcddb2e7843 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_download_async.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_download_async.py @@ -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: diff --git a/shared_requirements.txt b/shared_requirements.txt index 236ad3b9f156..115277a1a480 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -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 From d22956005dd08eb76b1f978d10ce5a1b266f0b57 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Tue, 18 Oct 2022 16:55:03 -0700 Subject: [PATCH 2/5] Update release date --- sdk/storage/azure-storage-blob/CHANGELOG.md | 2 +- sdk/storage/azure-storage-file-datalake/CHANGELOG.md | 2 +- sdk/storage/azure-storage-file-share/CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md index 0f876824ed6e..c452ced556cd 100644 --- a/sdk/storage/azure-storage-blob/CHANGELOG.md +++ b/sdk/storage/azure-storage-blob/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 12.14.1 (Unreleased) +## 12.14.1 (2022-10-18) ### Bugs Fixed - Fixed possible `ValueError` for invalid content range that gets raised when downloading empty blobs through Azurite. diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md index e5f0a42e0bf3..f9125d407a6b 100644 --- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 12.9.1 (Unreleased) +## 12.9.1 (2022-10-18) ### Bugs Fixed - Fixed possible `ValueError` for invalid content range that gets raised when downloading empty files through Azurite. diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md index fa373b721847..7ab634dc4dc1 100644 --- a/sdk/storage/azure-storage-file-share/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 12.10.1 (Unreleased) +## 12.10.1 (2022-10-18) ### Bugs Fixed - Fixed possible `ValueError` for invalid content range that gets raised when downloading empty files through Azurite. From c8f51bc61b8a6d3e45fa415d32d74ec12cb8b3d2 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 18 Oct 2022 21:52:50 -0400 Subject: [PATCH 3/5] Increment version for storage releases (#26905) Increment package version after release of azure-storage-file-share --- sdk/storage/azure-storage-file-share/CHANGELOG.md | 10 ++++++++++ .../azure/storage/fileshare/_version.py | 2 +- sdk/storage/azure-storage-file-share/setup.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md index 7ab634dc4dc1..e37cbe9a0b27 100644 --- a/sdk/storage/azure-storage-file-share/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 12.10.2 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 12.10.1 (2022-10-18) ### Bugs Fixed diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py index 13f4a7220094..7e690e2de2e8 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_version.py @@ -4,4 +4,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "12.10.1" +VERSION = "12.10.2" diff --git a/sdk/storage/azure-storage-file-share/setup.py b/sdk/storage/azure-storage-file-share/setup.py index 69532fadfc59..9b7eb160e99e 100644 --- a/sdk/storage/azure-storage-file-share/setup.py +++ b/sdk/storage/azure-storage-file-share/setup.py @@ -44,7 +44,7 @@ author_email='ascl@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-share', classifiers=[ - 'Development Status :: 5 - Production/Stable', + "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', "Programming Language :: Python :: 3 :: Only", 'Programming Language :: Python :: 3', From c8747b9150d31a82b5143e6b0a9b71c0eca7c4d9 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 18 Oct 2022 21:53:46 -0400 Subject: [PATCH 4/5] Increment version for storage releases (#26906) Increment package version after release of azure-storage-blob --- sdk/storage/azure-storage-blob/CHANGELOG.md | 10 ++++++++++ .../azure-storage-blob/azure/storage/blob/_version.py | 2 +- sdk/storage/azure-storage-blob/setup.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md index c452ced556cd..4ed964994735 100644 --- a/sdk/storage/azure-storage-blob/CHANGELOG.md +++ b/sdk/storage/azure-storage-blob/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 12.14.2 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 12.14.1 (2022-10-18) ### Bugs Fixed diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py index e4d6df9851a1..c60928535f97 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_version.py @@ -4,4 +4,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "12.14.1" +VERSION = "12.14.2" diff --git a/sdk/storage/azure-storage-blob/setup.py b/sdk/storage/azure-storage-blob/setup.py index 473b2e5f27da..6104fa16c73b 100644 --- a/sdk/storage/azure-storage-blob/setup.py +++ b/sdk/storage/azure-storage-blob/setup.py @@ -55,7 +55,7 @@ author_email='ascl@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-blob', classifiers=[ - 'Development Status :: 5 - Production/Stable', + "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', "Programming Language :: Python :: 3 :: Only", 'Programming Language :: Python :: 3', From cb44a33edabffecedfbafcdd9bfb51895a6ccce0 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 18 Oct 2022 22:10:20 -0400 Subject: [PATCH 5/5] Increment version for storage releases (#26909) Increment package version after release of azure-storage-file-datalake --- sdk/storage/azure-storage-file-datalake/CHANGELOG.md | 10 ++++++++++ .../azure/storage/filedatalake/_version.py | 2 +- sdk/storage/azure-storage-file-datalake/setup.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md index f9125d407a6b..d0a1f453f590 100644 --- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 12.9.2 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 12.9.1 (2022-10-18) ### Bugs Fixed diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py index 4a05b531a35d..0a9869951e15 100644 --- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py +++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_version.py @@ -4,4 +4,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "12.9.1" +VERSION = "12.9.2" diff --git a/sdk/storage/azure-storage-file-datalake/setup.py b/sdk/storage/azure-storage-file-datalake/setup.py index 3e0c6cb5cc04..37e4ef3aca8d 100644 --- a/sdk/storage/azure-storage-file-datalake/setup.py +++ b/sdk/storage/azure-storage-file-datalake/setup.py @@ -56,7 +56,7 @@ author_email='ascl@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python', classifiers=[ - 'Development Status :: 5 - Production/Stable', + "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', "Programming Language :: Python :: 3 :: Only", 'Programming Language :: Python :: 3',