SNOW-2043816: different puts for multipart and normal

Author: sfc-gh-fpawlowski

test/integ/test_http_interceptor.py

@@ -210,7 +210,7 @@ def _assert_expected_requests_occurred(conn: SnowflakeConnection) -> None:
                     tracker.assert_aws_get_accelerate_issued(optional=True)
 
                 tracker.assert_file_head_issued(test_file.name)
-                tracker.assert_put_file_issued(cloud_platform=current_provider)
+                tracker.assert_put_file_issued(filename=test_file.name)
 
                 get_sql = f"GET @{stage_name}/{test_file.name} file://{download_dir}"
                 cursor.execute(get_sql)

test/test_utils/http_test_utils.py

@@ -291,6 +291,27 @@ def assert_get_file_issued(
         )
 
     def assert_put_file_issued(
+        self,
+        filename: Optional[str] = None,
+        expected_headers: Union[Dict[str, Any], Tuple[Tuple[str, Any], ...]] = (
+            ("test-header", "test-value"),
+        ),
+        sequentially: bool = True,
+        optional: bool = False,
+    ) -> Optional[RequestDTO]:
+        return self._assert_issued_with_custom_headers(
+            ExpectedRequestInfo(
+                "PUT",
+                r".*(s3(.*)?\.amazonaws|blob\.core\.windows|storage\.googleapis).*stages.*"
+                + (filename or "")
+                + r"(.*)?",
+            ),
+            expected_headers,
+            sequentially,
+            optional,
+        )
+
+    def assert_put_file_part_in_multipart_issued(
         self,
         filename: Optional[str] = None,
         cloud_platform: Union[str, None] = None,
@@ -434,10 +455,10 @@ def assert_multiple_put_file_issued(
         sequentially: bool = True,
         optional: bool = True,
     ) -> None:
-        self.assert_put_file_issued(
+        self.assert_put_file_part_in_multipart_issued(
             filename, cloud_platform, expected_headers, sequentially=sequentially
         )
-        while self.assert_put_file_issued(
+        while self.assert_put_file_part_in_multipart_issued(
             filename,
             cloud_platform,
             expected_headers,