Cleanup

Author: robertnovac1

filenameprocessor/src/file_name_processor.py

@@ -70,7 +70,6 @@ def handle_record(record) -> dict:
             created_at_formatted_string = get_created_at_formatted_string(bucket_name, file_key)
 
             vaccine_type, supplier = validate_file_key(file_key)
-
             permissions = validate_vaccine_type_permissions(vaccine_type=vaccine_type, supplier=supplier)
             if not is_existing_file:
                 ensure_file_is_not_a_duplicate(file_key, created_at_formatted_string)

filenameprocessor/src/logging_decorator.py

@@ -6,8 +6,6 @@
 from datetime import datetime
 from functools import wraps
 from clients import firehose_client, logger
-from file_key_validation import validate_file_key
-
 
 STREAM_NAME = os.getenv("SPLUNK_FIREHOSE_NAME", "immunisation-fhir-api-internal-dev-splunk-firehose")
 
@@ -53,11 +51,7 @@ def wrapper(*args, **kwargs):
             return result
 
         except Exception as e:
-            file_key = args[0]["s3"]["object"]["key"]
-            vaccine_type, supplier = validate_file_key(file_key)
-
-            additional_log_data = {"statusCode": 500, "error": str(e), "vaccine_type": vaccine_type,
-                                   "supplier": supplier}
+            additional_log_data = {"statusCode": 500, "error": str(e)}
             generate_and_send_logs(start_time, base_log_data, additional_log_data, is_error_log=True)
             raise