fix: remove event info logging across all the lambdas, to prevent potential leak of sensitive customer data

aws_sra_examples/solutions/account/account_alternate_contacts/lambda/src/app.py

@@ -316,7 +316,7 @@ def local_testing(aws_account: AccountTypeDef, params: dict) -> None:
     process_alternate_contacts(account_client, aws_account, params)
 
 
-def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], params: dict) -> None:
+def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], params: dict) -> None:  # noqa: U100
     """Process Accounts and Create SNS Messages for each account for solution deployment.
 
     Args:
@@ -339,7 +339,7 @@ def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], para
     process_sns_message_batches(sns_messages, params["SNS_TOPIC_ARN"])
 
 
-def process_account(event: dict, aws_account_id: str, params: dict) -> None:
+def process_account(event: dict, aws_account_id: str, params: dict) -> None:  # noqa: U100
     """Process Account and Create SNS Message for account for solution deployment.
 
     Args:
@@ -359,20 +359,18 @@ def process_account(event: dict, aws_account_id: str, params: dict) -> None:
         publish_sns_message(sns_message, "Account Alternate Contacts", params["SNS_TOPIC_ARN"])
 
 
-def process_event(event: dict) -> None:
+def process_event(event: dict) -> None:  # noqa: U100
     """Process Event.
 
     Args:
         event: event data
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters({})
 
     process_accounts(event, params)
 
 
-def process_event_sns(event: dict) -> None:
+def process_event_sns(event: dict) -> None:  # noqa: U100
     """Process SNS event.
 
     Args:
@@ -392,14 +390,12 @@ def process_event_sns(event: dict) -> None:
         process_alternate_contacts(account_client, aws_account, params)
 
 
-def process_event_organizations(event: dict) -> None:
+def process_event_organizations(event: dict) -> None:  # noqa: U100
     """Process Event from AWS Organizations.
 
     Args:
         event: event data
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters({})
 
     if event["detail"]["eventName"] == "TagResource" and params["EXCLUDE_ACCOUNT_TAGS"]:
@@ -418,7 +414,7 @@ def process_event_organizations(event: dict) -> None:
         LOGGER.info("Organization event does not match expected values.")
 
 
-def process_event_lifecycle(event: dict) -> None:
+def process_event_lifecycle(event: dict) -> None:  # noqa: U100
     """Process Lifecycle Event from AWS Control Tower.
 
     Args:
@@ -427,8 +423,6 @@ def process_event_lifecycle(event: dict) -> None:
     Raises:
         ValueError: Control Tower Lifecycle Event not 'createManagedAccountStatus' or 'updateManagedAccountStatus'
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters({})
 
     aws_account_id = ""
@@ -455,9 +449,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
     Returns:
         AWS CloudFormation physical resource id
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
-
     if event["RequestType"] in ["Create", "Update"]:
         params = get_validated_parameters({"RequestType": event["RequestType"]})
         process_accounts(event, params)
@@ -588,7 +579,7 @@ def get_validated_parameters(event: dict) -> dict:
     return params
 
 
-def orchestrator(event: dict, context: Any) -> None:
+def orchestrator(event: dict, context: Any) -> None:  # noqa: U100
     """Orchestration of Events.
 
     Args:
@@ -607,7 +598,7 @@ def orchestrator(event: dict, context: Any) -> None:
         process_event(event)
 
 
-def lambda_handler(event: dict, context: Any) -> None:
+def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:
@@ -619,8 +610,6 @@ def lambda_handler(event: dict, context: Any) -> None:
     """
     LOGGER.info("....Lambda Handler Started....")
     try:
-        event_info = {"Event": event}
-        LOGGER.info(event_info)
         orchestrator(event, context)
     except Exception:
         LOGGER.exception(UNEXPECTED)

aws_sra_examples/solutions/ami_bakery/ami_bakery_org/lambda/src/app.py

@@ -299,7 +299,7 @@ def delete(event: Dict[str, Any], context: Context) -> None:  # noqa: U100
     iam.delete_role(session, params["CODEPIPELINE_ROLE_NAME"])
 
 
-def lambda_handler(event: Dict[str, Any], context: Context) -> None:
+def lambda_handler(event: Dict[str, Any], context: Context) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:

aws_sra_examples/solutions/cloudtrail/cloudtrail_org/lambda/src/app.py

@@ -313,7 +313,7 @@ def process_create_update(params: dict) -> None:
 @helper.create
 @helper.update
 @helper.delete
-def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str:
+def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str:  # noqa: U100
     """Process CloudFormation Event. Creates, updates, and deletes a CloudTrail with the provided parameters.
 
     Args:
@@ -323,8 +323,6 @@ def process_event(event: CloudFormationCustomResourceEvent, context: Context) ->
     Returns:
         AWS CloudFormation physical resource id
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     LOGGER.debug(f"{context}")
 
     params = get_validated_parameters(event)
@@ -342,7 +340,7 @@ def process_event(event: CloudFormationCustomResourceEvent, context: Context) ->
     return f"{params['CLOUDTRAIL_NAME']}-CloudTrail"
 
 
-def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
+def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:
@@ -360,7 +358,7 @@ def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -
         raise ValueError(f"Unexpected error executing Lambda function. Review CloudWatch logs '{context.log_group_name}' for details.") from None
 
 
-def terraform_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
+def terraform_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:

aws_sra_examples/solutions/common/common_prerequisites/lambda/src/app.py

@@ -444,8 +444,6 @@ def create_update_event(event: CloudFormationCustomResourceEvent, context: Conte
     Returns:
         AWS CloudFormation physical resource id
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters(event)
     tags: Sequence[TagTypeDef] = [{"Key": params["TAG_KEY"], "Value": params["TAG_VALUE"]}]
 
@@ -473,13 +471,11 @@ def delete_event(event: CloudFormationCustomResourceEvent, context: Context) ->
         event: event data
         context: runtime information
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     LOGGER.info("SRA SSM Parameters are being retained.")
     # delete_ssm_parameters_in_regions(get_enabled_regions())  # noqa: E800
 
 
-def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
+def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:

aws_sra_examples/solutions/common/common_register_delegated_administrator/lambda/src/app.py

@@ -265,7 +265,7 @@ def lambda_handler(
         raise ValueError(f"Unexpected error executing Lambda function. Review CloudWatch logs '{context.log_group_name}' for details.") from None
 
 
-def terraform_handler(event: dict, context: Context) -> None:
+def terraform_handler(event: dict, context: Context) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:
@@ -276,8 +276,6 @@ def terraform_handler(event: dict, context: Context) -> None:
         ValueError: Unexpected error executing Lambda function
     """
     LOGGER.info("....Lambda Handler Started....")
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     try:
         request_type = event["RequestType"]
 

aws_sra_examples/solutions/config/config_management_account/lambda/src/app.py

@@ -161,7 +161,7 @@ def get_validated_parameters(event: CloudFormationCustomResourceEvent) -> dict:
 @helper.create
 @helper.update
 @helper.delete
-def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str:
+def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str:  # noqa: U100
     """Process Event from AWS CloudFormation.
 
     Args:
@@ -171,8 +171,6 @@ def process_event(event: CloudFormationCustomResourceEvent, context: Context) ->
     Returns:
         AWS CloudFormation physical resource id
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters(event)
 
     management_account: str = context.invoked_function_arn.split(":")[4]
@@ -189,7 +187,7 @@ def process_event(event: CloudFormationCustomResourceEvent, context: Context) ->
     return f"{params['AUDIT_ACCOUNT_ID']}-{params['AGGREGATOR_NAME']}"
 
 
-def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
+def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:

aws_sra_examples/solutions/config/config_org/lambda/src/app.py

@@ -68,14 +68,12 @@ def process_add_update_event(params: dict, regions: list, accounts: list) -> Non
     LOGGER.info("...ADD_UPDATE_NO_EVENT")
 
 
-def process_event(event: dict) -> None:
+def process_event(event: dict) -> None:  # noqa: U100
     """Process Event.
 
     Args:
         event: event data
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters({"RequestType": "Update"})
 
     accounts = common.get_active_organization_accounts()
@@ -111,14 +109,12 @@ def process_account(aws_account_id: str, params: dict) -> None:
         config.set_delivery_channel(aws_account_id, region, params["CONFIGURATION_ROLE_NAME"], delivery_channel)
 
 
-def process_event_organizations(event: dict) -> None:
+def process_event_organizations(event: dict) -> None:  # noqa: U100
     """Process Event from AWS Organizations.
 
     Args:
         event: event data
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters({})
 
     if event["detail"]["eventName"] == "AcceptHandshake" and event["detail"]["responseElements"]["handshake"]["state"] == "ACCEPTED":
@@ -432,7 +428,7 @@ def process_sns_message_batches(sns_messages: list, sns_topic_arn_fanout: str) -
         publish_sns_message_batch(batch, sns_topic_arn_fanout)
 
 
-def process_event_sns(event: dict) -> None:
+def process_event_sns(event: dict) -> None:  # noqa: U100
     """Process SNS event to complete the setup process.
 
     Args:
@@ -481,9 +477,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
     Returns:
         AWS CloudFormation physical resource id
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
-
     params = get_validated_parameters({"RequestType": event["RequestType"]})
     accounts = common.get_active_organization_accounts()
     regions = common.get_enabled_regions(params["ENABLED_REGIONS"], params["CONTROL_TOWER_REGIONS_ONLY"] == "true")
@@ -502,7 +495,7 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
     return "SRA-CONFIG-ORG"
 
 
-def orchestrator(event: Dict[str, Any], context: Any) -> None:
+def orchestrator(event: Dict[str, Any], context: Any) -> None:  # noqa: U100
     """Orchestration.
 
     Args:
@@ -520,7 +513,7 @@ def orchestrator(event: Dict[str, Any], context: Any) -> None:
         process_event(event)
 
 
-def lambda_handler(event: Dict[str, Any], context: Any) -> None:
+def lambda_handler(event: Dict[str, Any], context: Any) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:
@@ -533,8 +526,6 @@ def lambda_handler(event: Dict[str, Any], context: Any) -> None:
     LOGGER.info("....Lambda Handler Started....")
     boto3_version = boto3.__version__
     LOGGER.info(f"boto3 version: {boto3_version}")
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     try:
         orchestrator(event, context)
     except Exception:

aws_sra_examples/solutions/detective/detective_org/lambda/src/app.py

@@ -66,14 +66,12 @@ def process_add_update_event(params: dict, regions: list, accounts: list) -> Non
     LOGGER.info("...ADD_UPDATE_NO_EVENT")
 
 
-def process_event(event: dict) -> None:
+def process_event(event: dict) -> None:  # noqa: U100
     """Process Event.
 
     Args:
         event: event data
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     params = get_validated_parameters({"RequestType": "Update"})
 
     excluded_accounts: list = [params["DELEGATED_ADMIN_ACCOUNT_ID"]]
@@ -366,9 +364,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
     Returns:
         AWS CloudFormation physical resource id
     """
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
-
     params = get_validated_parameters({"RequestType": event["RequestType"]})
     excluded_accounts: list = [params["DELEGATED_ADMIN_ACCOUNT_ID"]]
     accounts = common.get_active_organization_accounts(excluded_accounts)
@@ -384,7 +379,7 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
     return f"sra-detective-org-{params['DELEGATED_ADMIN_ACCOUNT_ID']}"
 
 
-def orchestrator(event: Dict[str, Any], context: Any) -> None:
+def orchestrator(event: Dict[str, Any], context: Any) -> None:  # noqa: U100
     """Orchestration.
 
     Args:
@@ -399,7 +394,7 @@ def orchestrator(event: Dict[str, Any], context: Any) -> None:
         process_event(event)
 
 
-def lambda_handler(event: Dict[str, Any], context: Any) -> None:
+def lambda_handler(event: Dict[str, Any], context: Any) -> None:  # noqa: U100
     """Lambda Handler.
 
     Args:
@@ -412,8 +407,6 @@ def lambda_handler(event: Dict[str, Any], context: Any) -> None:
     LOGGER.info("....Lambda Handler Started....")
     boto3_version = boto3.__version__
     LOGGER.info(f"boto3 version: {boto3_version}")
-    event_info = {"Event": event}
-    LOGGER.info(event_info)
     try:
         orchestrator(event, context)
     except Exception: