Merge branch 'develop' into cisco_secure_email_v1

opencybersecurityalliance · Oct 2, 2023 · d737bd7 · d737bd7
2 parents bf50df0 + d4c29d6
commit d737bd7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/stix_shifter/requirements.txt b/stix_shifter/requirements.txt
@@ -1,4 +1,4 @@
-aioboto3==11.2.0
+aioboto3==11.3.0
 aiohttp-retry==2.8.3
 aiomysql==0.1.1
 antlr4-python3-runtime==4.8

diff --git a/stix_shifter_modules/azure_log_analytics/stix_transmission/connector.py b/stix_shifter_modules/azure_log_analytics/stix_transmission/connector.py
@@ -1,5 +1,5 @@
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 import pandas as pd
@@ -14,7 +14,7 @@
     CONFIG_MAP_PATH
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
 
     def __init__(self, connection, configuration):
         """Initialization.

diff --git a/stix_shifter_utils/utils/error_response.py b/stix_shifter_utils/utils/error_response.py
@@ -88,7 +88,7 @@ def fill_error(return_object, message_struct=None, message_path=None, message=No
         error_msg = ''
         if error is not None:
             str_error = str(error)
-            logger.error("error occurred: " + str_error)
+            logger.error(connector + " connector error occurred: " + str_error)
             logger.debug(utils_logger.exception_to_string(error))
             if isinstance(error, SSLError):
                 error_code = ErrorCode.TRANSMISSION_AUTH_SSL