Namespace relation embedder subsystem topics with pipeline date

wellcomecollection · Jan 21, 2025 · a30e21a · a30e21a
1 parent 428348c
commit a30e21a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/pipeline/terraform/modules/stack/relation_embedder/batcher.tf b/pipeline/terraform/modules/stack/relation_embedder/batcher.tf
@@ -22,7 +22,7 @@ locals {
 module "batcher_lambda_output_topic" {
   source = "../../topic"
 
-  name       = "${var.namespace}_batcher_lambda_output"
+  name       = "${local.topic_namespace}_batcher_lambda_output"
   role_names = [module.batcher_lambda.lambda_role_name]
 }
 

diff --git a/pipeline/terraform/modules/stack/relation_embedder/embedder.tf b/pipeline/terraform/modules/stack/relation_embedder/embedder.tf
@@ -5,7 +5,7 @@ locals {
 module "embedder_lambda_output_topic" {
   source = "../../topic"
 
-  name       = "${var.namespace}_embedder_lambda_output"
+  name       = "${local.topic_namespace}_embedder_lambda_output"
   role_names = [module.embedder_lambda.lambda_role_name]
 }
 

diff --git a/pipeline/terraform/modules/stack/relation_embedder/path_concatenator.tf b/pipeline/terraform/modules/stack/relation_embedder/path_concatenator.tf
@@ -2,7 +2,7 @@
 module "path_concatenator_output_topic" {
   source = "../../topic"
 
-  name       = "${var.namespace}_path_concatenator_output_topic"
+  name       = "${local.topic_namespace}_path_concatenator_output_topic"
   role_names = [module.path_concatenator.task_role_name]
 }
 

diff --git a/pipeline/terraform/modules/stack/relation_embedder/router.tf b/pipeline/terraform/modules/stack/relation_embedder/router.tf
@@ -1,21 +1,21 @@
 module "router_path_output_topic" {
   source = "../../topic"
 
-  name       = "${var.namespace}_router_path_output"
+  name       = "${local.topic_namespace}_router_path_output"
   role_names = [module.router.task_role_name]
 }
 
 module "router_candidate_incomplete_paths_output_topic" {
   source = "../../topic"
 
-  name       = "${var.namespace}_router_candidate_incomplete_paths_output"
+  name       = "${local.topic_namespace}_router_candidate_incomplete_paths_output"
   role_names = [module.router.task_role_name]
 }
 
 module "router_work_output_topic" {
   source = "../../topic"
 
-  name       = "${var.namespace}_router_work_output"
+  name       = "${local.topic_namespace}_router_work_output"
   role_names = [module.router.task_role_name]
 }
 

diff --git a/pipeline/terraform/modules/stack/relation_embedder/variables.tf b/pipeline/terraform/modules/stack/relation_embedder/variables.tf
@@ -6,6 +6,9 @@ variable "pipeline_date" {
   type = string
 }
 
+locals {
+  topic_namespace = "catalogue-${var.pipeline_date}-${var.namespace}"
+}
 variable "reindexing_state" {
   type = object({
     listen_to_reindexer      = bool