SNOW-1444663: fix SnowSQL PUT failed with a 400 error but the status shows as uploaded (#1956)

Author: sfc-gh-yuwang

DESCRIPTION.md

@@ -13,6 +13,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne
   - Added support for `token_file_path` connection parameter to read an OAuth token from a file when connecting to Snowflake.
   - Added support for `debug_arrow_chunk` connection parameter to allow debugging raw arrow data in case of arrow data parsing failure.
   - Fixed a bug that OCSP certificate signed using SHA384 algorithm cannot be verified.
+  - Fixed a bug that status code shown as uploaded when PUT command failed with 400 error.
 
 - v3.10.1(May 21, 2024)
 

src/snowflake/connector/storage_client.py

@@ -247,7 +247,7 @@ def prepare_upload(self) -> None:
 
     def finish_upload(self) -> None:
         meta = self.meta
-        if self.successful_transfers == self.num_of_chunks:
+        if self.successful_transfers == self.num_of_chunks and self.num_of_chunks != 0:
             if self.num_of_chunks > 1:
                 self._complete_multipart_upload()
             meta.result_status = ResultStatus.UPLOADED

test/unit/test_storage_client.py

@@ -1,3 +1,63 @@
 #
 # Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
 #
+from os import path
+from unittest.mock import MagicMock
+
+try:
+    from snowflake.connector import SnowflakeConnection
+    from snowflake.connector.constants import ResultStatus
+    from snowflake.connector.file_transfer_agent import (
+        SnowflakeFileMeta,
+        StorageCredential,
+    )
+    from snowflake.connector.s3_storage_client import SnowflakeS3RestClient
+except ImportError:
+    # Compatibility for olddriver tests
+    from snowflake.connector.s3_util import ERRORNO_WSAECONNABORTED  # NOQA
+
+    SnowflakeFileMeta = dict
+    SnowflakeS3RestClient = None
+    RequestExceedMaxRetryError = None
+    StorageCredential = None
+    megabytes = 1024 * 1024
+    DEFAULT_MAX_RETRY = 5
+
+THIS_DIR = path.dirname(path.realpath(__file__))
+megabyte = 1024 * 1024
+
+
+def test_status_when_num_of_chunks_is_zero():
+    meta_info = {
+        "name": "data1.txt.gz",
+        "stage_location_type": "S3",
+        "no_sleeping_time": True,
+        "put_callback": None,
+        "put_callback_output_stream": None,
+        "sha256_digest": "123456789abcdef",
+        "dst_file_name": "data1.txt.gz",
+        "src_file_name": path.join(THIS_DIR, "../data", "put_get_1.txt"),
+        "overwrite": True,
+    }
+    meta = SnowflakeFileMeta(**meta_info)
+    creds = {"AWS_SECRET_KEY": "", "AWS_KEY_ID": "", "AWS_TOKEN": ""}
+    rest_client = SnowflakeS3RestClient(
+        meta,
+        StorageCredential(
+            creds,
+            MagicMock(autospec=SnowflakeConnection),
+            "PUT file:/tmp/file.txt @~",
+        ),
+        {
+            "locationType": "AWS",
+            "location": "bucket/path",
+            "creds": creds,
+            "region": "test",
+            "endPoint": None,
+        },
+        8 * megabyte,
+    )
+    rest_client.successful_transfers = 0
+    rest_client.num_of_chunks = 0
+    rest_client.finish_upload()
+    assert meta.result_status == ResultStatus.ERROR