sqs_client

Author: JamesW1-NHS

lambdas/delta_backend/src/delta.py

@@ -8,7 +8,7 @@
 from boto3.dynamodb.conditions import Attr
 from botocore.exceptions import ClientError
 
-from common.clients import STREAM_NAME, logger
+from common.clients import STREAM_NAME, get_sqs_client, logger
 from common.log_firehose import send_log_to_firehose
 from converter import Converter
 from mappings import ActionFlag, EventName, Operation
@@ -38,24 +38,6 @@ def get_delta_table():
     return delta_table
 
 
-sqs_client = None
-
-
-def get_sqs_client():
-    """
-    Initialize the SQS client with exception handling.
-    """
-    global sqs_client
-    if not sqs_client:
-        try:
-            logger.info("Initializing SQS Client")
-            sqs_client = boto3.client("sqs", region_name)
-        except Exception:
-            logger.exception("Error initializing SQS Client")
-            sqs_client = None
-    return sqs_client
-
-
 def send_message(record, queue_url=failure_queue_url):
     # Create a message
     message_body = record

lambdas/delta_backend/tests/test_delta.py

@@ -45,7 +45,7 @@ def setUp(self):
         self.send_log_to_firehose_patcher = patch("delta.send_log_to_firehose")
         self.mock_send_log_to_firehose = self.send_log_to_firehose_patcher.start()
 
-        self.sqs_client_patcher = patch("delta.sqs_client")
+        self.sqs_client_patcher = patch("common.clients.global_sqs_client")
         self.mock_sqs_client = self.sqs_client_patcher.start()
 
         self.delta_table_patcher = patch("delta.delta_table")
@@ -660,48 +660,6 @@ def test_returns_none_on_exception(self, mock_boto3_resource):
         self.mock_logger_error.assert_called()
 
 
-class TestGetSqsClient(unittest.TestCase):
-    def setUp(self):
-        # Patch logger.info and logger.error
-        self.logger_info_patcher = patch("logging.Logger.info")
-        self.mock_logger_info = self.logger_info_patcher.start()
-        self.logger_error_patcher = patch("logging.Logger.error")
-        self.mock_logger_error = self.logger_error_patcher.start()
-        self.sqs_client_patcher = patch("delta.boto3.client")
-        self.mock_sqs_client = self.sqs_client_patcher.start()
-        # Reset the global sqs_client before each test
-        delta.sqs_client = None
-
-    def tearDown(self):
-        self.logger_info_patcher.stop()
-        self.logger_error_patcher.stop()
-        self.sqs_client_patcher.stop()
-
-    def test_returns_client_on_success(self):
-        mock_client = MagicMock()
-        self.mock_sqs_client.return_value = mock_client
-
-        client = delta.get_sqs_client()
-        self.assertIs(client, mock_client)
-        # Should cache the client
-        self.assertIs(delta.sqs_client, mock_client)
-
-    def test_returns_cached_client(self):
-        mock_client = MagicMock()
-        delta.sqs_client = mock_client
-
-        client = delta.get_sqs_client()
-        self.assertIs(client, mock_client)
-        # Should not re-initialize
-        self.mock_sqs_client.assert_not_called()
-
-    def test_returns_none_on_exception(self):
-        self.mock_sqs_client.side_effect = Exception("fail")
-        client = delta.get_sqs_client()
-        self.assertIsNone(client)
-        self.mock_logger_error.assert_called()
-
-
 class TestSendMessage(unittest.TestCase):
     def setUp(self):
         self.get_sqs_client_patcher = patch("delta.get_sqs_client")

lambdas/shared/src/common/clients.py

@@ -25,6 +25,18 @@ def get_s3_client():
         global_s3_client = boto3_client("s3", region_name=REGION_NAME)
     return global_s3_client
 
+sqs_client = boto3_client("sqs", region_name=REGION_NAME)
+
+# for lambdas which require a global sqs_client
+global_sqs_client = None
+
+
+def get_sqs_client():
+    global global_sqs_client
+    if global_sqs_client is None:
+        global_sqs_client = boto3_client("sqs", region_name=REGION_NAME)
+    return global_sqs_client
+
 
 firehose_client = boto3_client("firehose", region_name=REGION_NAME)
 secrets_manager_client = boto3_client("secretsmanager", region_name=REGION_NAME)

lambdas/shared/tests/test_common/test_clients.py

@@ -74,3 +74,17 @@ def test_global_s3_client_initialization(self):
         call_count = self.mock_boto3_client.call_count
         clients.get_s3_client()
         self.assertEqual(self.mock_boto3_client.call_count, call_count)
+
+    def test_global_sqs_client(self):
+        """Test global_sqs_client is not initialized on import"""
+        importlib.reload(clients)
+        self.assertEqual(clients.global_sqs_client, None)
+
+    def test_global_sqs_client_initialization(self):
+        """Test global_sqs_client is initialized exactly once even with multiple invocations"""
+        importlib.reload(clients)
+        clients.get_sqs_client()
+        self.assertNotEqual(clients.global_sqs_client, None)
+        call_count = self.mock_boto3_client.call_count
+        clients.get_sqs_client()
+        self.assertEqual(self.mock_boto3_client.call_count, call_count)