Revert "capture request data with aiohttp multipart/form-data (#32543)"

This reverts commit bf0213f.

Author: kristapratico

sdk/core/azure-core/CHANGELOG.md

@@ -8,8 +8,6 @@
 
 ### Bugs Fixed
 
-- Fixed an issue with `multipart/form-data` in the async transport where `data` was not getting encoded into the request body. #32473
-
 ### Other Changes
 
 ## 1.29.4 (2023-09-07)

sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py

@@ -164,7 +164,7 @@ def _get_request_data(self, request):
         :return: The request data
         """
         if request.files:
-            form_data = aiohttp.FormData(request.data or {})
+            form_data = aiohttp.FormData()
             for form_file, data in request.files.items():
                 content_type = data[2] if len(data) > 2 else None
                 try:

sdk/core/azure-core/tests/async_tests/test_rest_http_response_async.py

@@ -221,25 +221,14 @@ async def test_urlencoded_content(send_request):
     )
 
 
-@pytest.mark.asyncio
-async def test_multipart_files_content(send_request):
-    request = HttpRequest(
-        "POST",
-        "/multipart/basic",
-        files={"fileContent": io.BytesIO(b"<file content>")},
-    )
-    await send_request(request)
-
-
-@pytest.mark.asyncio
-async def test_multipart_data_and_files_content(send_request):
-    request = HttpRequest(
-        "POST",
-        "/multipart/data-and-files",
-        data={"message": "Hello, world!"},
-        files={"fileContent": io.BytesIO(b"<file content>")},
-    )
-    await send_request(request)
+# @pytest.mark.asyncio
+# async def test_multipart_files_content(send_request):
+#     request = HttpRequest(
+#         "POST",
+#         "/multipart/basic",
+#         files={"fileContent": io.BytesIO(b"<file content>")},
+#     )
+#     await send_request(request)
 
 
 @pytest.mark.asyncio

sdk/core/azure-core/tests/testserver_tests/coretestserver/coretestserver/test_routes/multipart.py

@@ -26,7 +26,7 @@ def basic():
     assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
     if request.files:
         # aiohttp
-        assert_with_message("content length", 228, request.content_length)
+        assert_with_message("content length", 258, request.content_length)
         assert_with_message("num files", 1, len(request.files))
         assert_with_message("has file named fileContent", True, bool(request.files.get("fileContent")))
         file_content = request.files["fileContent"]
@@ -38,7 +38,7 @@ def basic():
         )
         assert_with_message(
             "content disposition",
-            'form-data; name="fileContent"; filename="fileContent"',
+            'form-data; name="fileContent"; filename="fileContent"; filename*=utf-8\'\'fileContent',
             file_content.headers["Content-Disposition"],
         )
     elif request.form:
@@ -52,30 +52,9 @@ def basic():
 
 @multipart_api.route("/data-and-files", methods=["POST"])
 def data_and_files():
-    if request.files:
-        # aiohttp
-        assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
-        assert_with_message("has file named fileContent", True, bool(request.files.get("fileContent")))
-        assert_with_message("message", "Hello, world!", request.form["message"])
-        file_content = request.files["fileContent"]
-        assert_with_message("file content type", "application/octet-stream", file_content.content_type)
-        assert_with_message("file content length", 14, file_content.content_length)
-        assert_with_message("filename", "fileContent", file_content.filename)
-        assert_with_message(
-            "has content disposition header", True, bool(file_content.headers.get("Content-Disposition"))
-        )
-        assert_with_message(
-            "content disposition",
-            'form-data; name="fileContent"; filename="fileContent"',
-            file_content.headers["Content-Disposition"],
-        )
-    elif request.form:
-        # requests
-        assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
-        assert_with_message("message", "Hello, world!", request.form["message"])
-        assert_with_message("message", "<file content>", request.form["fileContent"])
-    else:
-        return Response(status=400)
+    assert_with_message("content type", multipart_header_start, request.content_type[: len(multipart_header_start)])
+    assert_with_message("message", "Hello, world!", request.form["message"])
+    assert_with_message("message", "<file content>", request.form["fileContent"])
     return Response(status=200)