From 4f2649a9c5c03e6c9465aa0d6927978fe26238a1 Mon Sep 17 00:00:00 2001 From: matt-heery Date: Thu, 15 Aug 2024 14:17:33 +0100 Subject: [PATCH 1/2] update tag --- .../environments/electronic-monitoring-data/lambdas_main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/environments/electronic-monitoring-data/lambdas_main.tf b/terraform/environments/electronic-monitoring-data/lambdas_main.tf index 90e59d7ad34..131b513abfd 100644 --- a/terraform/environments/electronic-monitoring-data/lambdas_main.tf +++ b/terraform/environments/electronic-monitoring-data/lambdas_main.tf @@ -299,14 +299,14 @@ module "load_json_table_cadt" { core_shared_services_id = local.environment_management.account_ids["core-shared-services-production"] production_dev = local.is-production ? "prod" : "dev" ecr_repo_name = "create-a-data-task" - function_tag = "v0.0.0-884806f" + function_tag = "v0.0.0-670d05a" environment_variables = { DLT_PROJECT_DIR : "/tmp" DLT_DATA_DIR : "/tmp" DLT_PIPELINE_DIR : "/tmp" JSON_BUCKET_NAME = module.json-directory-structure-bucket.bucket.id - STANDARD_FILESYSTEM__QUERY_RESULT_BUCKET = "s3://${module.athena-s3-bucket.bucket.id}/output" - ATHENA_DUMP_BUCKET_NAME = module.metadata-s3-bucket.bucket.id + STANDARD_FILESYSTEM__QUERY_RESULT_BUCKET = module.athena-s3-bucket.bucket.id + ATHENA_DUMP_BUCKET_NAME = module.athena-s3-bucket.bucket.id pipeline_name = "g4s_atrium_unstructured" environment = local.is-production ? "prod" : "dev" } From d01448fb17d00c755a85a7a8dcfddd5f0f0bcb36 Mon Sep 17 00:00:00 2001 From: matt-heery Date: Thu, 15 Aug 2024 14:27:09 +0100 Subject: [PATCH 2/2] actual changes --- .../electronic-monitoring-data/lambdas_main.tf | 17 +---------------- .../modules/unzipped_structure_extract/main.tf | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/terraform/environments/electronic-monitoring-data/lambdas_main.tf b/terraform/environments/electronic-monitoring-data/lambdas_main.tf index b3d3dfddd9a..adec3972a09 100644 --- a/terraform/environments/electronic-monitoring-data/lambdas_main.tf +++ b/terraform/environments/electronic-monitoring-data/lambdas_main.tf @@ -292,26 +292,11 @@ module "load_g4s_atrium_unstructured" { iam_role = aws_iam_role.load_json_table memory_size = 2048 timeout = 900 - function_tag = "v0.0.0-c79d61f" + function_tag = "v0.0.0-670d05a" dataset_name = "g4s_atrium_unstructured" env_account_id = local.env_account_id core_shared_services_id = local.environment_management.account_ids["core-shared-services-production"] production_dev = local.is-production ? "prod" : "dev" -<<<<<<< HEAD - ecr_repo_name = "create-a-data-task" - function_tag = "v0.0.0-670d05a" - environment_variables = { - DLT_PROJECT_DIR : "/tmp" - DLT_DATA_DIR : "/tmp" - DLT_PIPELINE_DIR : "/tmp" - JSON_BUCKET_NAME = module.json-directory-structure-bucket.bucket.id - STANDARD_FILESYSTEM__QUERY_RESULT_BUCKET = module.athena-s3-bucket.bucket.id - ATHENA_DUMP_BUCKET_NAME = module.athena-s3-bucket.bucket.id - pipeline_name = "g4s_atrium_unstructured" - environment = local.is-production ? "prod" : "dev" - } -======= json_bucket_name = module.json-directory-structure-bucket.bucket.id athena_bucket_name = module.athena-s3-bucket.bucket.id ->>>>>>> main } diff --git a/terraform/environments/electronic-monitoring-data/modules/unzipped_structure_extract/main.tf b/terraform/environments/electronic-monitoring-data/modules/unzipped_structure_extract/main.tf index d61d7f5ae73..505951e966d 100644 --- a/terraform/environments/electronic-monitoring-data/modules/unzipped_structure_extract/main.tf +++ b/terraform/environments/electronic-monitoring-data/modules/unzipped_structure_extract/main.tf @@ -23,7 +23,7 @@ module "this" { DLT_PIPELINE_DIR : "/tmp" JSON_BUCKET_NAME = var.json_bucket_name STANDARD_FILESYSTEM__QUERY_RESULT_BUCKET = "s3://${var.athena_bucket_name}/output" - ATHENA_DUMP_BUCKET_NAME = "s3://${var.athena_bucket_name}/output" + ATHENA_DUMP_BUCKET_NAME = var.athena_bucket_name pipeline_name = var.dataset_name environment = var.production_dev SUPPLIER_NAME = local.SUPPLIER_NAME