clients.py

Author: JamesW1-NHS

lambdas/redis_sync/src/clients.py

@@ -8,7 +8,7 @@
 import time
 from datetime import datetime
 from functools import wraps
-from clients import firehose_client, logger, STREAM_NAME
+from common.clients import firehose_client, logger, STREAM_NAME
 
 
 def send_log_to_firehose(log_data: dict) -> None:

lambdas/redis_sync/src/log_decorator.py

@@ -1,4 +1,4 @@
-from clients import logger
+from common.clients import logger
 from s3_event import S3EventRecord
 from redis_cacher import RedisCacher
 '''

lambdas/redis_sync/src/record_processor.py

@@ -1,8 +1,7 @@
 "Upload the content from a config file in S3 to ElastiCache (Redis)"
 
 import json
-from clients import redis_client
-from clients import logger
+from common.clients import redis_client, logger
 from transform_map import transform_map
 from s3_reader import S3Reader
 

lambdas/redis_sync/src/redis_cacher.py

@@ -1,9 +1,8 @@
-from clients import logger
+from common.clients import redis_client, logger
 from s3_event import S3Event
 from record_processor import process_record
 from event_read import read_event
 from log_decorator import logging_decorator
-from clients import redis_client
 '''
     Event Processor
     The Business Logic for the Redis Sync Lambda Function.

lambdas/redis_sync/src/redis_sync.py

@@ -1,5 +1,4 @@
-from clients import s3_client
-from clients import logger
+from common.clients import s3_client, logger
 
 
 class S3Reader:

lambdas/redis_sync/src/s3_reader.py

@@ -1,4 +1,4 @@
-from clients import logger
+from common.clients import logger
 
 
 def transform_vaccine_map(mapping):

lambdas/redis_sync/src/transform_configs.py

@@ -1,5 +1,5 @@
 from constants import RedisCacheKey
-from clients import logger
+from common.clients import logger
 from transform_configs import transform_vaccine_map, transform_supplier_permissions
 '''
 Transform config file to format required in REDIS cache.

lambdas/redis_sync/src/transform_map.py

@@ -1,7 +1,7 @@
 import os
 import logging
-from boto3 import client as boto3_client
-import boto3
+import redis
+from boto3 import client as boto3_client, resource as boto3_resource
 
 logging.basicConfig(level="INFO")
 logger = logging.getLogger()
@@ -12,9 +12,15 @@
 
 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_resource = boto3_resource("dynamodb", region_name=REGION_NAME)
 dynamodb_client = boto3_client("dynamodb", region_name=REGION_NAME)
+
+logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
+redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)