diff --git a/terraform/main.tf b/terraform/main.tf index b2cba67..a6d0540 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -73,17 +73,17 @@ module "ecs_ecr" { } module "product-copy-completion-checker" { - source = "./terraform-modules/product-copy-completion-checker" - database_port = var.database_port - vpc_id = var.vpc_id - permission_boundary_for_iam_roles = var.permission_boundary_for_iam_roles - nucleus_security_group_id = module.common.pds_nucleus_security_group_id - pds_nucleus_staging_bucket_name_postfix = var.pds_nucleus_staging_bucket_name_postfix - pds_nucleus_config_bucket_name = var.pds_nucleus_config_bucket_name - subnet_ids = var.subnet_ids - pds_nucleus_default_airflow_dag_id = var.pds_nucleus_default_airflow_dag_id - pds_nucleus_cold_archive_name_postfix = var.pds_nucleus_cold_archive_name_postfix - pds_nucleus_hot_archive_name_postfix = var.pds_nucleus_hot_archive_name_postfix + source = "./terraform-modules/product-copy-completion-checker" + database_port = var.database_port + vpc_id = var.vpc_id + permission_boundary_for_iam_roles = var.permission_boundary_for_iam_roles + nucleus_security_group_id = module.common.pds_nucleus_security_group_id + pds_nucleus_staging_bucket_name_postfix = var.pds_nucleus_staging_bucket_name_postfix + pds_nucleus_config_bucket_name = var.pds_nucleus_config_bucket_name + subnet_ids = var.subnet_ids + pds_nucleus_default_airflow_dag_id = var.pds_nucleus_default_airflow_dag_id + pds_nucleus_hot_archive_bucket_name_postfix = var.pds_nucleus_hot_archive_bucket_name_postfix + pds_nucleus_cold_archive_bucket_name_postfix = var.pds_nucleus_cold_archive_bucket_name_postfix pds_node_names = var.pds_node_names pds_nucleus_opensearch_urls = var.pds_nucleus_opensearch_urls diff --git a/terraform/terraform-modules/product-copy-completion-checker/product-copy-completion-checker.tf b/terraform/terraform-modules/product-copy-completion-checker/product-copy-completion-checker.tf index ee2be45..e0a4bc1 100644 --- a/terraform/terraform-modules/product-copy-completion-checker/product-copy-completion-checker.tf +++ b/terraform/terraform-modules/product-copy-completion-checker/product-copy-completion-checker.tf @@ -245,8 +245,8 @@ resource "aws_lambda_function" "pds_nucleus_product_completion_checker_function" PDS_NUCLEUS_CONFIG_BUCKET_NAME = var.pds_nucleus_config_bucket_name REPLACE_PREFIX_WITH = var.pds_nucleus_harvest_replace_prefix_with_list[count.index] PDS_MWAA_ENV_NAME = var.airflow_env_name - PDS_HOT_ARCHIVE_S3_BUCKET_NAME = "${lower(replace(var.pds_node_names[count.index], "_", "-"))}-${var.pds_nucleus_hot_archive_name_postfix}" - PDS_COLD_ARCHIVE_S3_BUCKET_NAME = "${lower(replace(var.pds_node_names[count.index], "_", "-"))}-${var.pds_nucleus_cold_archive_name_postfix}" + PDS_HOT_ARCHIVE_S3_BUCKET_NAME = "${lower(replace(var.pds_node_names[count.index], "_", "-"))}-${var.pds_nucleus_hot_archive_bucket_name_postfix}" + PDS_COLD_ARCHIVE_S3_BUCKET_NAME = "${lower(replace(var.pds_node_names[count.index], "_", "-"))}-${var.pds_nucleus_cold_archive_bucket_name_postfix}" PDS_STAGING_S3_BUCKET_NAME = aws_s3_bucket.pds_nucleus_s3_staging_bucket[count.index].id } } diff --git a/terraform/terraform-modules/product-copy-completion-checker/variables.tf b/terraform/terraform-modules/product-copy-completion-checker/variables.tf index c8ed55d..857d9b8 100644 --- a/terraform/terraform-modules/product-copy-completion-checker/variables.tf +++ b/terraform/terraform-modules/product-copy-completion-checker/variables.tf @@ -93,15 +93,15 @@ variable "pds_nucleus_staging_bucket_name_postfix" { sensitive = true } -variable "pds_nucleus_hot_archive_name_postfix" { - description = "The postfix of the name of the hot archive" +variable "pds_nucleus_hot_archive_bucket_name_postfix" { + description = "The postfix of the name of the hot archive s3 bucket" default = "hot-archive-" type = string sensitive = true } -variable "pds_nucleus_cold_archive_name_postfix" { - description = "The postfix of the name of the cold archive" +variable "pds_nucleus_cold_archive_bucket_name_postfix" { + description = "The postfix of the name of the cold archive s3 bucket" default = "cold-archive-" type = string sensitive = true diff --git a/terraform/variables.tf b/terraform/variables.tf index ce28950..a7a81b9 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -53,15 +53,15 @@ variable "pds_nucleus_staging_bucket_name_postfix" { sensitive = true } -variable "pds_nucleus_hot_archive_name_postfix" { - description = "The postfix of the name of the hot archive" +variable "pds_nucleus_hot_archive_bucket_name_postfix" { + description = "The postfix of the name of the hot archive s3 bucket" default = "hot-archive-" type = string sensitive = true } -variable "pds_nucleus_cold_archive_name_postfix" { - description = "The postfix of the name of the cold archive" +variable "pds_nucleus_cold_archive_bucket_name_postfix" { + description = "The postfix of the name of the cold archive s3 bucket" default = "cold-archive-" type = string sensitive = true