From 2726177c46577605816e28345012630eb98c14b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:54:58 -0300 Subject: [PATCH 1/3] Bump aioboto3 from 11.2.0 to 11.3.0 in /stix_shifter (#1575) --- stix_shifter/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stix_shifter/requirements.txt b/stix_shifter/requirements.txt index 63f659cba..4baa59df2 100644 --- 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 From 7331a6517d0c4b3071d07b608df6373aa8f3578a Mon Sep 17 00:00:00 2001 From: Md Azam Date: Fri, 29 Sep 2023 14:13:51 -0300 Subject: [PATCH 2/3] Update Azure Log Analytics stix transmission to use BaseJsonSyncConnector (#1584) --- .../azure_log_analytics/stix_transmission/connector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stix_shifter_modules/azure_log_analytics/stix_transmission/connector.py b/stix_shifter_modules/azure_log_analytics/stix_transmission/connector.py index 8014130ee..c24bf72e6 100644 --- 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. From d4c29d61373e9bc1e82230023c84dc46868aa15b Mon Sep 17 00:00:00 2001 From: Danny Elliott Date: Fri, 29 Sep 2023 16:57:52 -0300 Subject: [PATCH 3/3] include connector type in logger error (#1585) --- stix_shifter_utils/utils/error_response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stix_shifter_utils/utils/error_response.py b/stix_shifter_utils/utils/error_response.py index 667250ba2..b6d73206c 100644 --- 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