prefix error (#232)

Author: Juliya Smith

src/code42cli/cmds/search/extraction.py

@@ -58,7 +58,12 @@ def handle_error(exception):
         else:
             message = exception
         logger.log_error(message)
-        secho(str(message), err=True, fg="red")
+
+        message = str(message)
+        if not message.lower().startswith("error:"):
+            message = f"Error: {message}"
+
+        secho(message, err=True, fg="red")
 
     handlers.handle_error = handle_error
     if cursor_store:

tests/cmds/test_alerts.py

@@ -1,4 +1,5 @@
 import json
+import logging
 
 import py42.sdk.queries.alerts.filters as f
 import pytest
@@ -8,6 +9,7 @@
 from tests.cmds.conftest import get_mark_for_search_and_send_to
 from tests.conftest import get_test_date_str
 
+from code42cli import errors
 from code42cli import PRODUCT_NAME
 from code42cli.cmds.search import extraction
 from code42cli.cmds.search.cursor_store import AlertCursorStore
@@ -703,6 +705,21 @@ def test_search_and_send_to_with_or_query_flag_produces_expected_query(
     assert actual_query == expected_query
 
 
+@search_and_send_to_test
+def test_search_and_send_to_when_extraction_handles_error_expected_message_logged_and_printed_and_global_errored_flag_set(
+    runner, cli_state, caplog, command
+):
+    errors.ERRORED = False
+    exception_msg = "Test Exception"
+    cli_state.sdk.alerts.search.side_effect = Exception(exception_msg)
+    with caplog.at_level(logging.ERROR):
+        result = runner.invoke(cli, [*command, "--begin", "1d"], obj=cli_state)
+        assert "Error:" in result.output
+        assert exception_msg in result.output
+        assert exception_msg in caplog.text
+        assert errors.ERRORED
+
+
 @pytest.mark.parametrize(
     "protocol", (ServerProtocol.TLS_TCP, ServerProtocol.TLS_TCP, ServerProtocol.UDP)
 )

tests/cmds/test_auditlogs.py

@@ -61,9 +61,6 @@
         "timestamp": TEST_AUDIT_LOG_TIMESTAMP_3,
     },
 ]
-TEST_CHECKPOINT_EVENT_HASHLIST = [
-    hash_event(event) for event in TEST_EVENTS_WITH_SAME_TIMESTAMP
-]
 search_and_send_to_test = get_mark_for_search_and_send_to("audit-logs")
 
 

tests/cmds/test_securitydata.py

@@ -773,13 +773,10 @@ def test_search_and_send_to_when_extraction_handles_error_expected_message_logge
 ):
     errors.ERRORED = False
     exception_msg = "Test Exception"
-
-    def file_search_error(x):
-        raise Exception(exception_msg)
-
-    cli_state.sdk.securitydata.search_file_events.side_effect = file_search_error
+    cli_state.sdk.securitydata.search_file_events.side_effect = Exception(exception_msg)
     with caplog.at_level(logging.ERROR):
         result = runner.invoke(cli, [*command, "--begin", "1d"], obj=cli_state)
+        assert "Error:" in result.output
         assert exception_msg in result.output
         assert exception_msg in caplog.text
         assert errors.ERRORED