Merge branch 'master' into feature/VED-1044-create-cloudwatch-dashboard-parameterised-tf

Author: edhall-nhs

README.md

@@ -276,3 +276,20 @@ run a different set of tests. To do this:
 Please note that this project requires that all commits are verified using a GPG key.
 To set up a GPG key please follow the instructions specified here:
 https://docs.github.com/en/authentication/managing-commit-signature-verification
+
+## AWS configuration: getting credentials for AWS federated user accounts
+
+If you need to run commands that interact with AWS resources e.g. running a terraform plan against a dev environment locally
+then you will need to configure AWS credentials.
+
+Once you have been granted access, the `Access Keys` section within the AWS Access Portal will present you with several
+options. It is _recommended_ to use `Option 2: Add a profile to your AWS credentials file`.
+
+This is because the way that Python unittests using `moto` have been implemented is brittle and cannot handle other methods
+such as IAM Identity Centre SSO. In future, we should consider following [moto recommendations](https://docs.getmoto.org/en/latest/docs/getting_started.html#how-do-i-avoid-tests-from-mutating-my-real-infrastructure)
+to ensure our tests are authentication type agnostic and are fully robust.
+
+If you _are_ using another option, such as SSO, and want to run unit tests then you will need to:
+
+- Add dummy values for `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` to the .env file in the Lambda dir you are testing.
+- Ensure those values are set before running the test, i.e. using the standard setup with direnv and a .envrc file

infrastructure/account/.terraform.lock.hcl

@@ -18,7 +18,7 @@ resource "aws_ecr_repository" "ack_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "ack_processor_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./ack_backend/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.ack_lambda_repository.name

infrastructure/instance/.terraform.lock.hcl

@@ -17,7 +17,7 @@ resource "aws_ecr_repository" "batch_processor_filter_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "batch_processor_filter_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./batch_processor_filter/Dockerfile"
 
   create_ecr_repo = false

infrastructure/instance/ack_lambda.tf

@@ -16,7 +16,7 @@ resource "aws_ecr_repository" "delta_lambda_repository" {
 
 module "delta_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./delta_backend/Dockerfile"
 
   create_ecr_repo = false

infrastructure/instance/batch_processor_filter_lambda.tf

@@ -27,7 +27,7 @@ resource "aws_ecr_repository" "processing_repository" {
 # Build and Push Docker Image to ECR (Reusing the existing module)
 module "processing_docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version = "8.5.0"
+  version = "8.7.0"
 
   create_ecr_repo  = false
   docker_file_path = "./recordprocessor/Dockerfile"

infrastructure/instance/delta.tf

@@ -17,7 +17,7 @@ resource "aws_ecr_repository" "file_name_processor_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "file_processor_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./filenameprocessor/Dockerfile"
 
   create_ecr_repo = false

infrastructure/instance/ecs_batch_processor_config.tf

@@ -17,7 +17,7 @@ resource "aws_ecr_repository" "forwarder_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "forwarding_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./recordforwarder/Dockerfile"
 
   create_ecr_repo = false

infrastructure/instance/file_name_processor.tf

@@ -19,7 +19,7 @@ resource "aws_ecr_repository" "id_sync_lambda_repository" {
 # Module for building and pushing Docker image to ECR
 module "id_sync_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version          = "8.5.0"
+  version          = "8.7.0"
   docker_file_path = "./id_sync/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.id_sync_lambda_repository.name