review fixes

Author: JamesW1-NHS

lambdas/ack_backend/Dockerfile

@@ -5,16 +5,14 @@ RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:' >> /etc/group && \
     chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
+# Install ack_backend dependencies
+WORKDIR /var/task
+RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
+
 # Install Poetry dependencies
 # Copy ack_backend Poetry files
 COPY ./ack_backend/poetry.lock ./ack_backend/pyproject.toml ./
-COPY ./shared/src/common ./src/common
 
-RUN echo "Listing /var/task after source code copy:" && ls -R /var/task
-
-# Install ack_backend dependencies
-WORKDIR /var/task
-RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
 # -----------------------------
 FROM base AS build
 

lambdas/ack_backend/src/logging_decorators.py

@@ -6,7 +6,7 @@
 from functools import wraps
 from common.log_decorator import generate_and_send_logs
 
-prefix = "ack_processor"
+PREFIX = "ack_processor"
 STREAM_NAME = os.getenv("SPLUNK_FIREHOSE_NAME", "immunisation-fhir-api-internal-dev-splunk-firehose")
 
 
@@ -15,7 +15,7 @@ def convert_message_to_ack_row_logging_decorator(func):
 
     @wraps(func)
     def wrapper(message, created_at_formatted_string):
-        base_log_data = {"function_name": f"{prefix}_{func.__name__}", "date_time": str(datetime.now())}
+        base_log_data = {"function_name": f"{PREFIX}_{func.__name__}", "date_time": str(datetime.now())}
         start_time = time.time()
 
         try:
@@ -55,7 +55,7 @@ def upload_ack_file_logging_decorator(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
 
-        base_log_data = {"function_name": f"{prefix}_{func.__name__}", "date_time": str(datetime.now())}
+        base_log_data = {"function_name": f"{PREFIX}_{func.__name__}", "date_time": str(datetime.now())}
         start_time = time.time()
 
         # NB this doesn't require a try-catch block as the wrapped function never throws an exception
@@ -76,7 +76,7 @@ def ack_lambda_handler_logging_decorator(func):
     @wraps(func)
     def wrapper(event, context, *args, **kwargs):
 
-        base_log_data = {"function_name": f"{prefix}_{func.__name__}", "date_time": str(datetime.now())}
+        base_log_data = {"function_name": f"{PREFIX}_{func.__name__}", "date_time": str(datetime.now())}
         start_time = time.time()
 
         try:

lambdas/ack_backend/tests/test_splunk_logging.py

@@ -156,7 +156,6 @@ def test_splunk_logging_missing_data(self):
             self.assertEqual(first_logger_info_call_args, expected_first_logger_info_data)
             self.assertEqual(first_logger_error_call_args, expected_first_logger_error_data)
 
-            print(mock_send_log_to_firehose.call_args_list)
             print(call(expected_first_logger_info_data))
             print(call(expected_first_logger_error_data))
             self.assertEqual(

lambdas/id_sync/Dockerfile

@@ -6,17 +6,14 @@ RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:' >> /etc/group && \
     chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
-# Install Poetry dependencies
-# Copy id_sync Poetry files
-COPY ./id_sync/poetry.lock ./id_sync/pyproject.toml ./
-COPY ./shared/src/common ./src/common
-
-RUN echo "Listing /var/task after source code copy:" && ls -R /var/task
-
 # Install id_sync dependencies
 WORKDIR /var/task
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
 
+# Install Poetry dependencies
+# Copy id_sync Poetry files
+COPY ./id_sync/poetry.lock ./id_sync/pyproject.toml ./
+
 # -----------------------------
 FROM base AS build
 

lambdas/redis_sync/Dockerfile

@@ -6,17 +6,14 @@ RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:' >> /etc/group && \
     chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
-# Install Poetry dependencies
-# Copy redis_sync Poetry files
-COPY ./redis_sync/poetry.lock ./redis_sync/pyproject.toml ./
-COPY ./shared/src/common ./src/common
-
-RUN echo "Listing /var/task after source code copy:" && ls -R /var/task
-
 # Install redis_sync dependencies
 WORKDIR /var/task
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
 
+# Install Poetry dependencies
+# Copy redis_sync Poetry files
+COPY ./redis_sync/poetry.lock ./redis_sync/pyproject.toml ./
+
 # -----------------------------
 FROM base AS build