return error for invalid data fields

googleapis · Feb 26, 2024 · cd5d13b · cd5d13b
1 parent def33e4
commit cd5d13b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/gcs/upload.py b/gcs/upload.py
@@ -208,8 +208,8 @@ def init_write_object_grpc(cls, db, request_iterator, context):
                 upload.complete = True
                 continue
             else:
-                print("WARNING unexpected data field %s\n" % data)
-                continue
+                testbench.error.invalid("Invalid data field in upload", context)
+                return None, False
 
             content = checksummed_data.content
             crc32c_hash = (
@@ -332,8 +332,7 @@ def process_bidi_write_object_grpc(cls, db, request_iterator, context):
                 upload.complete = True
                 continue
             else:
-                print("WARNING unexpected data field %s\n" % data)
-                continue
+                return testbench.error.invalid("Invalid data field in upload", context)
 
             content = checksummed_data.content
             crc32c_hash = (

diff --git a/tests/test_upload.py b/tests/test_upload.py
@@ -694,7 +694,7 @@ def test_init_object_write_grpc_final_message_empty_data(self):
         self.assertEqual(upload.metadata.name, "object")
         self.assertEqual(upload.metadata.bucket, "projects/_/buckets/bucket-name")
 
-    def test_init_object_write_grpc_message_empty_data(self):
+    def test_init_object_write_grpc_message_invalid_data(self):
         request = testbench.common.FakeRequest(
             args={}, data=json.dumps({"name": "bucket-name"})
         )
@@ -719,14 +719,11 @@ def test_init_object_write_grpc_message_empty_data(self):
         db = unittest.mock.Mock()
         db.get_bucket = unittest.mock.MagicMock(return_value=bucket)
         db.get_upload = unittest.mock.MagicMock(return_value=upload)
-        upload, is_resumable = gcs.upload.Upload.init_write_object_grpc(
-            db, [r1], context
+        upload, _ = gcs.upload.Upload.init_write_object_grpc(db, [r1], context)
+        self.assertIsNone(upload)
+        context.abort.assert_called_once_with(
+            grpc.StatusCode.INVALID_ARGUMENT, unittest.mock.ANY
         )
-        self.assertIsNotNone(upload)
-        self.assertFalse(upload.complete)
-        self.assertTrue(is_resumable)
-        self.assertEqual(upload.metadata.name, "object")
-        self.assertEqual(upload.metadata.bucket, "projects/_/buckets/bucket-name")
 
     def test_process_bidi_write_grpc_resumable(self):
         request = testbench.common.FakeRequest(
@@ -1025,7 +1022,7 @@ def test_process_bidi_write_grpc_final_message_empty_data(self):
         self.assertEqual(blob.bucket, "projects/_/buckets/bucket-name")
         self.assertTrue(upload.complete)
 
-    def test_process_bidi_write_grpc_message_empty_data(self):
+    def test_process_bidi_write_grpc_message_invalid_data(self):
         request = testbench.common.FakeRequest(
             args={}, data=json.dumps({"name": "bucket-name"})
         )
@@ -1049,8 +1046,9 @@ def test_process_bidi_write_grpc_message_empty_data(self):
         db = unittest.mock.Mock()
         db.get_bucket = unittest.mock.MagicMock(return_value=bucket)
         db.get_upload = unittest.mock.MagicMock(return_value=upload)
-        responses = list(
-            gcs.upload.Upload.process_bidi_write_object_grpc(db, [r1], context)
+        list(gcs.upload.Upload.process_bidi_write_object_grpc(db, [r1], context))
+        context.abort.assert_called_once_with(
+            grpc.StatusCode.INVALID_ARGUMENT, unittest.mock.ANY
         )
         self.assertFalse(upload.complete)