get_s3_client()

Author: JamesW1-NHS

lambdas/mesh_processor/src/converter.py

@@ -5,7 +5,7 @@
 import boto3
 from smart_open import open
 
-from common.clients import s3_client
+from common.clients import get_s3_client
 
 EXPECTED_BUCKET_OWNER_ACCOUNT = os.getenv("ACCOUNT_ID")
 DESTINATION_BUCKET_NAME = os.getenv("DESTINATION_BUCKET_NAME")
@@ -71,22 +71,22 @@ def stream_part_body(input_file: BinaryIO, boundary: bytes, output_file: BinaryI
 
 
 def move_file(source_bucket: str, source_key: str, destination_bucket: str, destination_key: str) -> None:
-    s3_client.copy_object(
+    get_s3_client().copy_object(
         CopySource={"Bucket": source_bucket, "Key": source_key},
         Bucket=destination_bucket,
         Key=destination_key,
         ExpectedBucketOwner=EXPECTED_BUCKET_OWNER_ACCOUNT,
         ExpectedSourceBucketOwner=EXPECTED_BUCKET_OWNER_ACCOUNT,
     )
-    s3_client.delete_object(
+    get_s3_client().delete_object(
         Bucket=source_bucket,
         Key=source_key,
         ExpectedBucketOwner=EXPECTED_BUCKET_OWNER_ACCOUNT,
     )
 
 
 def transfer_multipart_content(bucket_name: str, file_key: str, boundary: bytes, filename: str) -> None:
-    with open(f"s3://{bucket_name}/{file_key}", "rb", transport_params={"client": s3_client}) as input_file:
+    with open(f"s3://{bucket_name}/{file_key}", "rb", transport_params={"client": get_s3_client()}) as input_file:
         read_until_part_start(input_file, boundary)
 
         headers = read_part_headers(input_file)
@@ -100,7 +100,7 @@ def transfer_multipart_content(bucket_name: str, file_key: str, boundary: bytes,
             f"s3://{DESTINATION_BUCKET_NAME}/streaming/{filename}",
             "wb",
             transport_params={
-                "client": s3_client,
+                "client": get_s3_client(),
                 "client_kwargs": {"S3.Client.create_multipart_upload": {"ContentType": content_type}},
             },
         ) as output_file:
@@ -119,7 +119,7 @@ def process_record(record: dict) -> None:
     file_key = record["s3"]["object"]["key"]
     logger.info(f"Processing {file_key}")
 
-    response = s3_client.head_object(
+    response = get_s3_client().head_object(
         Bucket=bucket_name,
         Key=file_key,
         ExpectedBucketOwner=EXPECTED_BUCKET_OWNER_ACCOUNT,
@@ -134,7 +134,7 @@ def process_record(record: dict) -> None:
         boundary = content_type_params["boundary"].encode("utf-8")
         transfer_multipart_content(bucket_name, file_key, boundary, filename)
     else:
-        s3_client.copy_object(
+        get_s3_client().copy_object(
             Bucket=DESTINATION_BUCKET_NAME,
             CopySource={"Bucket": bucket_name, "Key": file_key},
             Key=filename,