common/redis_client

Author: JamesW1-NHS

lambdas/mns_subscription/poetry.lock

@@ -2,7 +2,8 @@
 
 import json
 from transform_map import transform_map
-from common.clients import get_redis_client, logger
+from common.clients import logger
+from common.redis_client import get_redis_client
 from common.s3_reader import S3Reader
 
 

lambdas/redis_sync/src/redis_cacher.py

@@ -1,7 +1,8 @@
 from event_read import read_event
 from record_processor import process_record
-from common.clients import get_redis_client, STREAM_NAME, logger
+from common.clients import STREAM_NAME, logger
 from common.log_decorator import logging_decorator
+from common.redis_client import get_redis_client
 from common.s3_event import S3Event
 '''
     Event Processor

lambdas/redis_sync/src/redis_sync.py

@@ -11,7 +11,7 @@ def setUp(self):
         self.mock_s3_reader = self.s3_reader_patcher.start()
         self.transform_map_patcher = patch("redis_cacher.transform_map")
         self.mock_transform_map = self.transform_map_patcher.start()
-        self.redis_client_patcher = patch("common.clients.redis_client")
+        self.redis_client_patcher = patch("common.redis_client.redis_client")
         self.mock_redis_client = self.redis_client_patcher.start()
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()

lambdas/redis_sync/tests/test_redis_cacher.py

@@ -1,6 +1,5 @@
 import os
 import logging
-import redis
 from boto3 import client as boto3_client, resource as boto3_resource
 
 logging.basicConfig(level="INFO")
@@ -12,22 +11,9 @@
 
 REGION_NAME = os.getenv("AWS_REGION", "eu-west-2")
 
-REDIS_HOST = os.getenv("REDIS_HOST", "")
-REDIS_PORT = os.getenv("REDIS_PORT", 6379)
-
 s3_client = boto3_client("s3", region_name=REGION_NAME)
 firehose_client = boto3_client("firehose", region_name=REGION_NAME)
 
 secrets_manager_client = boto3_client("secretsmanager", region_name=REGION_NAME)
 dynamodb_resource = boto3_resource("dynamodb", region_name=REGION_NAME)
 dynamodb_client = boto3_client("dynamodb", region_name=REGION_NAME)
-
-redis_client = None
-
-
-def get_redis_client():
-    global redis_client
-    if redis_client is None:
-        logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
-        redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
-    return redis_client

lambdas/shared/src/common/clients.py

@@ -0,0 +1,21 @@
+import os
+import redis
+from common.clients import logger
+
+STREAM_NAME = os.getenv("SPLUNK_FIREHOSE_NAME", "firehose-name-not-defined")
+CONFIG_BUCKET_NAME = os.getenv("CONFIG_BUCKET_NAME", "variconfig-bucketable-not-defined")
+
+REGION_NAME = os.getenv("AWS_REGION", "eu-west-2")
+
+REDIS_HOST = os.getenv("REDIS_HOST", "")
+REDIS_PORT = os.getenv("REDIS_PORT", 6379)
+
+redis_client = None
+
+
+def get_redis_client():
+    global redis_client
+    if redis_client is None:
+        logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
+        redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
+    return redis_client

lambdas/shared/src/common/redis_client.py

@@ -8,8 +8,6 @@ class TestClients(unittest.TestCase):
 
     BUCKET_NAME = "default-bucket"
     AWS_REGION = "eu-west-2"
-    REDIS_HOST = "mock-redis-host"
-    REDIS_PORT = 6379
 
     def setUp(self):
         self.boto3_client_patch = patch("boto3.client")
@@ -23,14 +21,8 @@ def setUp(self):
         self.mock_getenv.side_effect = lambda key, default=None: {
             "CONFIG_BUCKET_NAME": self.BUCKET_NAME,
             "AWS_REGION": self.AWS_REGION,
-            "REDIS_HOST": self.REDIS_HOST,
-            "REDIS_PORT": self.REDIS_PORT
         }.get(key, default)
 
-        self.redis_patch = patch("redis.StrictRedis")
-        self.mock_redis = self.redis_patch.start()
-
-        self.mock_redis.return_value = self.mock_redis
         self.mock_boto3_client.return_value = self.mock_boto3_client
         self.mock_boto3_client.return_value.send_message = {}
 
@@ -42,8 +34,6 @@ def test_os_environ(self):
         importlib.reload(clients)
         self.assertEqual(clients.CONFIG_BUCKET_NAME, self.BUCKET_NAME)
         self.assertEqual(clients.REGION_NAME, self.AWS_REGION)
-        self.assertEqual(clients.REDIS_HOST, self.REDIS_HOST)
-        self.assertEqual(clients.REDIS_PORT, self.REDIS_PORT)
 
     def test_boto3_client(self):
         ''' Test boto3 client is created with correct parameters '''
@@ -55,11 +45,6 @@ def test_firehose_client(self):
         importlib.reload(clients)
         self.mock_boto3_client.assert_any_call("firehose", region_name=self.AWS_REGION)
 
-    def test_redis_client(self):
-        ''' Test redis client is not initialized on import '''
-        importlib.reload(clients)
-        self.mock_redis.assert_not_called()
-
     def test_logging_setup(self):
         ''' Test logging is set up correctly '''
         importlib.reload(clients)
@@ -70,15 +55,6 @@ def test_logging_configuration(self):
         importlib.reload(clients)
         clients.logger.setLevel.assert_called_once_with("INFO")
 
-    def test_redis_client_initialization(self):
-        ''' Test redis client is initialized exactly once even with multiple invocations'''
-        importlib.reload(clients)
-        clients.get_redis_client()
-        clients.get_redis_client()
-        self.mock_redis.assert_called_once_with(host=self.REDIS_HOST, port=self.REDIS_PORT, decode_responses=True)
-        self.assertTrue(hasattr(clients, 'redis_client'))
-        self.assertIsInstance(clients.redis_client, self.mock_redis.return_value.__class__)
-
     def test_logging_initialization(self):
         ''' Test logging initialization '''
         importlib.reload(clients)