fix delete logic

Author: cyphronix

aws_sra_examples/solutions/genai/bedrock_org/lambda/src/app.py

@@ -1246,11 +1246,11 @@ def delete_event(event, context):
         LOGGER.info("CloudWatch observability access manager sink not found")
 
     # 3) Delete metric alarms and filters
-    accounts, regions = get_accounts_and_regions(event["ResourceProperties"])
+    # accounts, regions = get_accounts_and_regions(event["ResourceProperties"])
     for filter in CLOUDWATCH_METRIC_FILTERS:
-        # filter_deploy, filter_accounts, filter_regions, filter_params = get_filter_params(filter, event)
-        for acct in accounts:
-            for region in regions:
+        filter_deploy, filter_accounts, filter_regions, filter_params = get_filter_params(filter, event["ResourceProperties"])
+        for acct in filter_accounts:
+            for region in filter_regions:
                 # 3a) Delete KMS key (schedule deletion) and delete kms alias
                 kms.KMS_CLIENT = sts.assume_role(acct, sts.CONFIGURATION_ROLE, "kms", region)
                 search_alarm_kms_key, alarm_key_alias, alarm_key_id, alarm_key_arn = kms.check_alias_exists(kms.KMS_CLIENT, f"alias/{ALARM_SNS_KEY_ALIAS}")
@@ -1301,9 +1301,9 @@ def delete_event(event, context):
                     # 3c) Delete the CloudWatch metric filter
                     LOGGER.info(f"Deleting {filter} CloudWatch metric filter")
                     LIVE_RUN_DATA[f"{filter}_CloudWatchDelete"] = f"Deleted {filter} CloudWatch metric filter"
-                    search_metric_filter = cloudwatch.find_metric_filter(filter_params["log_group_name"], filter)
+                    search_metric_filter = cloudwatch.find_metric_filter(event["ResourceProperties"][filter.upper()]["log_group_name"], filter)
                     if search_metric_filter is True:
-                        cloudwatch.delete_metric_filter(filter_params["log_group_name"], filter)
+                        cloudwatch.delete_metric_filter(event["ResourceProperties"][filter.upper()]["log_group_name"], filter)
                         LIVE_RUN_DATA[f"{filter}_CloudWatchDelete"] = f"Deleted {filter} CloudWatch metric filter"
                         CFN_RESPONSE_DATA["deployment_info"]["action_count"] += 1
                         CFN_RESPONSE_DATA["deployment_info"]["resources_deployed"] -= 1