Added exception handling for client side ValueError

Author: gkevinzheng

google/cloud/bigtable/row.py

@@ -467,7 +467,7 @@ def commit(self):
         """
         try:
             self._table._table_impl.mutate_row(self.row_key, self._get_mutations())
-            return status_pb2.Status()
+            return status_pb2.Status(code=code_pb2.OK)
         except GoogleAPICallError as e:
             # If the RPC call returns an error, extract the error into a status object, if possible.
             return status_pb2.Status(
@@ -477,6 +477,12 @@ def commit(self):
                 message=e.message,
                 details=e.details,
             )
+        except ValueError as e:
+            # _table_impl.mutate_row raises a ValueError if invalid arguments are provided.
+            return status_pb2.Status(
+                code=code_pb2.INVALID_ARGUMENT,
+                message=str(e),
+            )
         finally:
             self.clear()
 

tests/system/v2_client/test_data_api.py

@@ -1092,10 +1092,10 @@ def test_table_direct_row_input_errors(data_table, rows_to_delete):
     resp = row.commit()
     assert resp.code == StatusCode.INVALID_ARGUMENT.value[0]
 
-    # Not having any mutations gives a ValueError enforced on the client side.
+    # Not having any mutations gives an INVALID_ARGUMENT
     row.clear()
-    with pytest.raises(ValueError):
-        row.commit()
+    resp = row.commit()
+    assert resp.code == StatusCode.INVALID_ARGUMENT.value[0]
 
 
 def test_table_conditional_row_input_errors(data_table, rows_to_delete):

tests/unit/v2_client/test_row.py

@@ -474,6 +474,34 @@ def test_direct_row_commit_with_unknown_exception():
     assert app_profile_id == call_args.app_profile_id[0]
 
 
+def test_direct_row_commit_with_invalid_argument():
+    from google.cloud.bigtable_v2.services.bigtable import BigtableClient
+    from google.rpc import code_pb2, status_pb2
+
+    project_id = "project-id"
+    row_key = b"row_key"
+    table_name = "projects/more-stuff"
+    app_profile_id = "app_profile_id"
+
+    credentials = _make_credentials()
+    client = _make_client(project=project_id, credentials=credentials, admin=True)
+    table = _Table(table_name, client=client, app_profile_id=app_profile_id)
+    row = _make_direct_row(row_key, table)
+
+    # Set mock
+    api = mock.create_autospec(BigtableClient)
+    client.table_data_client
+    client._table_data_client._gapic_client = api
+
+    # Perform the method and check the result.
+    result = row.commit()
+    assert row._mutations == []
+    assert result == status_pb2.Status(
+        code=code_pb2.Code.INVALID_ARGUMENT, message="No mutations provided"
+    )
+    api.mutate_row.assert_not_called()
+
+
 def _make_conditional_row(*args, **kwargs):
     from google.cloud.bigtable.row import ConditionalRow