paths

Author: JamesW1-NHS

infrastructure/instance/ack_lambda.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  ack_lambda_dir = abspath("${path.root}/../lambdas/ack_backend")
+  ack_lambda_dir = abspath("${path.root}/../../lambdas/ack_backend")
 
   ack_lambda_files = fileset(local.ack_lambda_dir, "**")
 
@@ -21,7 +21,7 @@ resource "aws_ecr_repository" "ack_lambda_repository" {
 module "ack_processor_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version          = "8.1.0"
-  docker_file_path = "./ack_backend/Dockerfile"
+  docker_file_path = "../ack_backend/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.ack_lambda_repository.name
   ecr_repo_lifecycle_policy = jsonencode({
@@ -43,7 +43,7 @@ module "ack_processor_docker_image" {
 
   platform      = "linux/amd64"
   use_image_tag = false
-  source_path   = abspath("${path.root}/../lambdas")
+  source_path   = abspath("${path.root}/../../lambdas")
   triggers = {
     dir_sha        = local.ack_lambda_dir_sha
     shared_dir_sha = local.shared_dir_sha

infrastructure/instance/batch_processor_filter_lambda.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  batch_processor_filter_lambda_dir     = abspath("${path.root}/../batch_processor_filter")
+  batch_processor_filter_lambda_dir     = abspath("${path.root}/../../batch_processor_filter")
   batch_processor_filter_lambda_files   = fileset(local.batch_processor_filter_lambda_dir, "**")
   batch_processor_filter_lambda_dir_sha = sha1(join("", [for f in local.batch_processor_filter_lambda_files : filesha1("${local.batch_processor_filter_lambda_dir}/${f}")]))
 }
@@ -17,6 +17,7 @@ resource "aws_ecr_repository" "batch_processor_filter_lambda_repository" {
 module "batch_processor_filter_docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version = "8.1.0"
+  docker_file_path = "../Dockerfile"
 
   create_ecr_repo = false
   ecr_repo        = aws_ecr_repository.batch_processor_filter_lambda_repository.name

infrastructure/instance/delta.tf

@@ -1,5 +1,5 @@
 locals {
-  delta_lambda_dir = abspath("${path.root}/../delta_backend")
+  delta_lambda_dir = abspath("${path.root}/../../delta_backend")
   delta_files      = fileset(local.delta_lambda_dir, "**")
   delta_dir_sha    = sha1(join("", [for f in local.delta_files : filesha1("${local.delta_lambda_dir}/${f}")]))
   function_name    = "delta"

infrastructure/instance/ecs_batch_processor_config.tf

@@ -5,7 +5,7 @@ resource "aws_ecs_cluster" "ecs_cluster" {
 
 # Locals for Lambda processing paths and hash
 locals {
-  processing_lambda_dir     = abspath("${path.root}/../recordprocessor")
+  processing_lambda_dir     = abspath("${path.root}/../../recordprocessor")
   processing_path_include   = ["**"]
   processing_path_exclude   = ["**/__pycache__/**"]
   processing_files_include  = setunion([for f in local.processing_path_include : fileset(local.processing_lambda_dir, f)]...)
@@ -29,7 +29,7 @@ module "processing_docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version = "8.1.0"
 
-  docker_file_path = "Dockerfile"
+  docker_file_path = "../Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.processing_repository.name
   ecr_repo_lifecycle_policy = jsonencode({

infrastructure/instance/file_name_processor.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  filename_lambda_dir     = abspath("${path.root}/../filenameprocessor")
+  filename_lambda_dir     = abspath("${path.root}/../../filenameprocessor")
   filename_lambda_files   = fileset(local.filename_lambda_dir, "**")
   filename_lambda_dir_sha = sha1(join("", [for f in local.filename_lambda_files : filesha1("${local.filename_lambda_dir}/${f}")]))
 }
@@ -18,6 +18,7 @@ resource "aws_ecr_repository" "file_name_processor_lambda_repository" {
 module "file_processor_docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version = "8.1.0"
+  docker_file_path = "../Dockerfile"
 
   create_ecr_repo = false
   ecr_repo        = aws_ecr_repository.file_name_processor_lambda_repository.name

infrastructure/instance/forwarder_lambda.tf

@@ -1,5 +1,5 @@
 locals {
-  forwarder_lambda_dir    = abspath("${path.root}/../backend")
+  forwarder_lambda_dir    = abspath("${path.root}/../../backend")
   forwarder_source_path   = local.forwarder_lambda_dir
   forwarder_path_include  = ["**"]
   forwarder_path_exclude  = ["**/__pycache__/**"]
@@ -24,7 +24,7 @@ module "forwarding_docker_image" {
 
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.forwarder_lambda_repository.name
-  docker_file_path = "batch.Dockerfile"
+  docker_file_path = "../batch.Dockerfile"
   ecr_repo_lifecycle_policy = jsonencode({
     rules = [
       {

infrastructure/instance/id_sync_lambda.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  id_sync_lambda_dir = abspath("${path.root}/../lambdas/id_sync")
+  id_sync_lambda_dir = abspath("${path.root}/../../lambdas/id_sync")
 
   id_sync_lambda_files = fileset(local.id_sync_lambda_dir, "**")
 
@@ -20,7 +20,7 @@ resource "aws_ecr_repository" "id_sync_lambda_repository" {
 module "id_sync_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version          = "8.1.0"
-  docker_file_path = "./id_sync/Dockerfile"
+  docker_file_path = "../id_sync/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.id_sync_lambda_repository.name
   ecr_repo_lifecycle_policy = jsonencode({
@@ -42,7 +42,7 @@ module "id_sync_docker_image" {
 
   platform      = "linux/amd64"
   use_image_tag = false
-  source_path   = abspath("${path.root}/../lambdas")
+  source_path   = abspath("${path.root}/../../lambdas")
   triggers = {
     dir_sha        = local.id_sync_lambda_dir_sha
     shared_dir_sha = local.shared_dir_sha

infrastructure/instance/lambda.tf

@@ -1,5 +1,5 @@
 locals {
-  lambda_dir    = abspath("${path.root}/../backend")
+  lambda_dir    = abspath("${path.root}/../../backend")
   source_path   = local.lambda_dir
   path_include  = ["**"]
   path_exclude  = ["**/__pycache__/**"]
@@ -25,7 +25,7 @@ module "docker_image" {
 
   create_ecr_repo  = false
   ecr_repo         = "${local.prefix}-operation-lambda-repo"
-  docker_file_path = "lambda.Dockerfile"
+  docker_file_path = "../lambda.Dockerfile"
   ecr_repo_lifecycle_policy = jsonencode({
     "rules" : [
       {

infrastructure/instance/mesh_processor.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  mesh_processor_lambda_dir     = abspath("${path.root}/../mesh_processor")
+  mesh_processor_lambda_dir     = abspath("${path.root}/../../mesh_processor")
   mesh_processor_lambda_files   = fileset(local.mesh_processor_lambda_dir, "**")
   mesh_processor_lambda_dir_sha = sha1(join("", [for f in local.mesh_processor_lambda_files : filesha1("${local.mesh_processor_lambda_dir}/${f}")]))
   # This should match the prefix used in the global Terraform
@@ -35,6 +35,7 @@ module "mesh_processor_docker_image" {
 
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version = "8.1.0"
+  docker_file_path = "../Dockerfile"
 
   create_ecr_repo = false
   ecr_repo        = aws_ecr_repository.mesh_file_converter_lambda_repository[0].name

infrastructure/instance/redis_sync_lambda.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  redis_sync_lambda_dir = abspath("${path.root}/../lambdas/redis_sync")
+  redis_sync_lambda_dir = abspath("${path.root}/../../lambdas/redis_sync")
 
   redis_sync_lambda_files = fileset(local.redis_sync_lambda_dir, "**")
 
@@ -20,7 +20,7 @@ resource "aws_ecr_repository" "redis_sync_lambda_repository" {
 module "redis_sync_docker_image" {
   source           = "terraform-aws-modules/lambda/aws//modules/docker-build"
   version          = "8.1.0"
-  docker_file_path = "./redis_sync/Dockerfile"
+  docker_file_path = "../redis_sync/Dockerfile"
   create_ecr_repo  = false
   ecr_repo         = aws_ecr_repository.redis_sync_lambda_repository.name
   ecr_repo_lifecycle_policy = jsonencode({
@@ -42,7 +42,7 @@ module "redis_sync_docker_image" {
 
   platform      = "linux/amd64"
   use_image_tag = false
-  source_path   = abspath("${path.root}/../lambdas")
+  source_path   = abspath("${path.root}/../../lambdas")
   triggers = {
     dir_sha        = local.redis_sync_lambda_dir_sha
     shared_dir_sha = local.shared_dir_sha