read error response in try catch (#2684)

* read error response in try catch * add changeset * fix and inv --------- Co-authored-by: iscai-msft <[email protected]> Co-authored-by: msyyc <[email protected]>
Azure · Jul 10, 2024 · 55144a7 · 55144a7
1 parent f276ded
commit 55144a7
Show file tree

Hide file tree

Showing 228 changed files with 6,069 additions and 1,403 deletions.
diff --git a/.chronus/changes/check_error_read-2024-6-9-15-39-6.md b/.chronus/changes/check_error_read-2024-6-9-15-39-6.md
@@ -0,0 +1,8 @@
+---
+changeKind: fix
+packages:
+  - "@autorest/python"
+  - "@azure-tools/typespec-python"
+---
+
+don't throw if stream is already read or consumed when we load in the error body
diff --git a/...les/specification/directives/generated/azure/directives/sample/_operations/_operations.py b/...les/specification/directives/generated/azure/directives/sample/_operations/_operations.py
@@ -18,6 +18,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
@@ -119,7 +121,10 @@ def _basic_polling_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            response.read()  # Load the body in memory and close the socket
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

diff --git a/...specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py b/...specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py
@@ -19,6 +19,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
@@ -90,7 +92,10 @@ async def _basic_polling_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

diff --git a/.../generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py b/.../generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py
@@ -18,6 +18,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
@@ -153,7 +155,10 @@ async def _test_lro_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -303,7 +308,10 @@ async def _test_lro_and_paging_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

diff --git a/...iapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py b/...iapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py
@@ -17,6 +17,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
@@ -231,7 +233,10 @@ def _test_lro_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            response.read()  # Load the body in memory and close the socket
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -378,7 +383,10 @@ def _test_lro_and_paging_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            response.read()  # Load the body in memory and close the socket
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

diff --git a/.../AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py b/.../AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py
@@ -19,6 +19,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
@@ -1576,7 +1578,10 @@ async def _get_multiple_pages_lro_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

diff --git a/...cted/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py b/...cted/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py
@@ -18,6 +18,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
@@ -2035,7 +2037,10 @@ def _get_multiple_pages_lro_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            response.read()  # Load the body in memory and close the socket
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

diff --git a/...legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py b/...legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py
@@ -16,6 +16,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
@@ -107,7 +109,10 @@ async def _put_async_retry_succeeded_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -279,7 +284,10 @@ async def _put201_creating_succeeded200_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 201]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -440,7 +448,10 @@ async def _post202_retry200_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -591,7 +602,10 @@ async def _post_async_retry_succeeded_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

diff --git a/...st/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py b/...st/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py
@@ -16,6 +16,8 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
@@ -110,7 +112,10 @@ async def _put201_creating_succeeded200_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 201]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -268,7 +273,10 @@ async def _put_async_relative_retry_succeeded_initial(  # pylint: disable=name-t
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -422,7 +430,10 @@ async def _delete_provisioning202_accepted200_succeeded_initial(  # pylint: disa
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -520,7 +531,10 @@ async def _delete202_retry200_initial(self, **kwargs: Any) -> AsyncIterator[byte
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -608,7 +622,10 @@ async def _delete_async_relative_retry_succeeded_initial(  # pylint: disable=nam
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -716,7 +733,10 @@ async def _post202_retry200_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -864,7 +884,10 @@ async def _post_async_relative_retry_succeeded_initial(  # pylint: disable=name-
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
-            await response.read()  # Load the body in memory and close the socket
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)