diff --git a/data_management/opensearch_indexer/opensearch_indexer/index_consignment/lambda_function.py b/data_management/opensearch_indexer/opensearch_indexer/index_consignment/lambda_function.py index 35c19bbb..598d81ee 100644 --- a/data_management/opensearch_indexer/opensearch_indexer/index_consignment/lambda_function.py +++ b/data_management/opensearch_indexer/opensearch_indexer/index_consignment/lambda_function.py @@ -1,3 +1,4 @@ +import json import logging import os from typing import Any, Dict @@ -31,16 +32,21 @@ def lambda_handler(event: Dict[str, Any], context: Any) -> None: Exception: If `consignment_reference` or `SECRET_ID` are missing. """ logger.info("Lambda started") - logger.info("Event received: %s", event) + logger.info("Event received: %s", json.dumps(event)) + + sns_message = json.loads(event["Records"][0]["Sns"]["Message"]) + consignment_reference = sns_message.get("parameters", {}).get("reference") + + if not consignment_reference: + error_message = "Missing reference in SNS Message required for indexing" + logger.error(error_message) + raise Exception(error_message) - # Extract parameters from the event and environment variables - consignment_reference = event.get("parameters", {}).get("reference") secret_id = os.getenv("SECRET_ID") - # Validate required parameters - if not consignment_reference or not secret_id: + if not secret_id: error_message = ( - "Missing consignment_reference or SECRET_ID required for indexing" + "Missing SECRET_ID environment variable required for indexing" ) logger.error(error_message) raise Exception(error_message) diff --git a/data_management/opensearch_indexer/opensearch_indexer/lambda_function.py b/data_management/opensearch_indexer/opensearch_indexer/lambda_function.py index ba06ad4d..0b7f9696 100644 --- a/data_management/opensearch_indexer/opensearch_indexer/lambda_function.py +++ b/data_management/opensearch_indexer/opensearch_indexer/lambda_function.py @@ -1,3 +1,4 @@ +import json import logging import os from typing import Any, Dict, Tuple @@ -12,8 +13,7 @@ def lambda_handler(event: Dict[str, Any], context: Any) -> None: logger.info("Lambda started") - logger.info("Event:") - logger.info(event) + logger.info("Event received: %s", json.dumps(event)) bucket_name, object_key = _extract_s3_event_info(event) secret_id = os.getenv("SECRET_ID") index_file_content_and_metadata_in_opensearch_from_aws(