code changes based on review comments

Author: hrai-nr

lambda-cloudwatch-trigger-stack.yaml

@@ -118,7 +118,7 @@ Resources:
                           add_permission_if_needed(event,context,lambda_arn, log_group_arn, log_group_name)
 
                           # Unique filter name for this stack using Lambda ARN
-                          filter_name = f'LambdaSubscription_{hashlib.sha256(lambda_arn.encode()).hexdigest()[:20]}'
+                          filter_name = f'NewRelicLogsLambdaSubscription_{hashlib.sha256(lambda_arn.encode()).hexdigest()[:20]}'
 
                           # Retry logic for PutSubscriptionFilter                       
                           max_retries = 5
@@ -152,7 +152,7 @@ Resources:
                                   continue
                           
                               # Unique filter name for this stack using Lambda ARN
-                              filter_name = f'LambdaSubscription_{hashlib.sha256(lambda_arn.encode()).hexdigest()[:20]}'
+                              filter_name = f'NewRelicLogsLambdaSubscription_{hashlib.sha256(lambda_arn.encode()).hexdigest()[:20]}'
 
                           
                               #remove the subscription filter

s3-trigger-stack.yaml

@@ -78,12 +78,11 @@ Resources:
           def lambda_handler(event, context):
               response = {}
               try:
+                  event_data = event['ResourceProperties']          
+                  lambda_arn = event_data.get('LambdaFunctionArn', '')
+                  buckets = event_data.get('S3BucketArns', [])              
                   if event['RequestType'] == 'Delete':
                       try:
-
-                          event_data = event['ResourceProperties']
-                          lambda_arn = event_data.get('LambdaFunctionArn', '')
-                          buckets = event_data.get('S3BucketArns', [])
                           for bucket_arn in buckets:
                               parts = bucket_arn.split(":::")[-1].split("/", 1)
                               bucket_name = parts[0]
@@ -92,6 +91,10 @@ Resources:
                               existing_config = s3.get_bucket_notification_configuration(Bucket=bucket_name)
 
                               existing_lambda_configs = existing_config.get('LambdaFunctionConfigurations', [])
+                              if not existing_lambda_configs:
+                                  continue
+                              
+                              # Deleting the existing configuration
                               updated_lambda_configs = [config for config in existing_lambda_configs if config['LambdaFunctionArn'] != lambda_arn]
  
                               notification_config = {
@@ -104,12 +107,7 @@ Resources:
                       except Exception as e:
                           logger.error(f'Delete failed for the bucket triggers  with error: {str(e)}')
                           cfnresponse.send(event, context, cfnresponse.SUCCESS, {})
-                          return {}
                   else:
-                      event_data = event['ResourceProperties']
-          
-                      lambda_arn = event_data.get('LambdaFunctionArn', '')
-                      buckets = event_data.get('S3BucketArns', [])
                       bucket_where_trigger_exists = []
                       for bucket_arn in buckets: