VED-26: Move Redis client into its own file to avoid the record forwarder Lambda from attempting to connect to Redis.

Author: mfjarvis

backend/src/clients.py backend/src/aws_clients.pybackend/src/clients.py renamed to backend/src/aws_clients.py

@@ -1,9 +1,6 @@
-"""Initialise s3, kinesis, lambda and redis clients"""
-
 from boto3 import client as boto3_client
 import os
-import logging
-import redis
+
 
 REGION_NAME = os.getenv("AWS_REGION", "eu-west-2")
 
@@ -12,13 +9,3 @@
 lambda_client = boto3_client("lambda", region_name=REGION_NAME)
 firehose_client = boto3_client("firehose", region_name=REGION_NAME)
 sqs_client = boto3_client("sqs", region_name=REGION_NAME)
-
-REDIS_HOST = os.getenv("REDIS_HOST", "")
-REDIS_PORT = int(os.getenv("REDIS_PORT", 6379))
-
-
-logging.basicConfig(level="INFO")
-logger = logging.getLogger()
-logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
-
-redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)

backend/src/forwarding_batch_lambda.py

@@ -7,7 +7,7 @@
 import logging
 from fhir_batch_repository import create_table
 from fhir_batch_controller import ImmunizationBatchController, make_batch_controller
-from clients import sqs_client
+from aws_clients import sqs_client
 from models.errors import (
     MessageNotSuccessfulError,
     RecordProcessorError,

backend/src/models/utils/permissions.py

@@ -1,4 +1,4 @@
-from clients import redis_client
+from redis_client import redis_client
 import json
 
 def get_supplier_permissions(supplier: str) -> list[str]:

backend/src/models/utils/validation_utils.py

@@ -10,7 +10,7 @@
 from models.errors import MandatoryError
 from constants import Urls
 from models.constants import Constants
-from clients import redis_client
+from redis_client import redis_client
 
 
 def get_target_disease_codes(immunization: dict):
@@ -54,7 +54,7 @@ def convert_disease_codes_to_vaccine_type(disease_codes_input: list) -> Union[st
     """
     key = ":".join(sorted(disease_codes_input))
     vaccine_type = redis_client.hget(Constants.DISEASES_TO_VACCINE_TYPE_HASH_KEY, key)
-    
+
     if not vaccine_type:
         raise ValueError(
             f"Validation errors: protocolApplied[0].targetDisease[*].coding[?(@.system=='http://snomed.info/sct')].code - "

backend/src/parameter_parser.py

@@ -6,7 +6,7 @@
 from typing import Optional
 from urllib.parse import parse_qs, urlencode, quote
 
-from clients import redis_client
+from redis_client import redis_client
 from models.errors import ParameterException
 from models.constants import Constants
 

backend/src/redis_client.py

@@ -0,0 +1,14 @@
+import logging
+import os
+
+import redis
+
+
+REDIS_HOST = os.getenv("REDIS_HOST", "")
+REDIS_PORT = int(os.getenv("REDIS_PORT", 6379))
+
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
+logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
+
+redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)

backend/tests/test_immunization_pre_validator.py

@@ -7,7 +7,7 @@
 
 from jsonpath_ng.ext import parse
 
-from clients import redis_client
+from redis_client import redis_client
 from models.fhir_immunization import ImmunizationValidator
 from models.utils.generic_utils import get_generic_extension_value
 from utils.generic_utils import (
@@ -36,9 +36,9 @@ def setUp(self):
         self.validator = ImmunizationValidator(add_post_validators=False)
         self.redis_patcher = patch("models.utils.validation_utils.redis_client")
         self.mock_redis_client = self.redis_patcher.start()
-        
-        
-        
+
+
+
     def tearDown(self):
         patch.stopall()
 

backend/tests/utils/test_permissions.py

@@ -1,17 +1,17 @@
 import unittest
 from unittest.mock import patch
-from src.models.utils.permissions import get_supplier_permissions
+from models.utils.permissions import get_supplier_permissions
 
 
 class TestPermissions(unittest.TestCase):
 
-    @patch("clients.redis_client.hget")
+    @patch("redis_client.redis_client.hget")
     def test_returns_list_if_permissions_exist(self, mock_hget):
         mock_hget.return_value = '["COVID19.CRUDS", "FLU.C"]'
         result = get_supplier_permissions("DPSFULL")
         self.assertEqual(result, ["COVID19.CRUDS", "FLU.C"])
 
-    @patch("clients.redis_client.hget")
+    @patch("redis_client.redis_client.hget")
     def test_returns_empty_list_if_no_permissions(self, mock_hget):
         mock_hget.return_value = None
         result = get_supplier_permissions("UNKNOWN")