From cb3f696cd6520b67c25c212c72141b71c81d5203 Mon Sep 17 00:00:00 2001 From: Boban Date: Mon, 4 Nov 2024 17:39:00 -0500 Subject: [PATCH] move eCR metadata db variables to modules (#38) --- terraform/implementation/ecs/_variable.tf | 12 ------------ terraform/modules/ecs/_local.tf | 8 ++++++++ terraform/modules/ecs/_variable.tf | 12 ++++++++++++ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/terraform/implementation/ecs/_variable.tf b/terraform/implementation/ecs/_variable.tf index 6eabe8b..ae70941 100644 --- a/terraform/implementation/ecs/_variable.tf +++ b/terraform/implementation/ecs/_variable.tf @@ -64,15 +64,3 @@ variable "vpc_cidr" { type = string default = "176.24.0.0/16" } - -variable "ecr_viewer_database_type" { - description = "The SQL variant used for the eCR data tables" - type = string - default = "postgres" -} - -variable "ecr_viewer_database_schema" { - description = "The database schema used for the eCR data tables" - type = string - default = "core" -} \ No newline at end of file diff --git a/terraform/modules/ecs/_local.tf b/terraform/modules/ecs/_local.tf index 6d2c78d..70195f8 100644 --- a/terraform/modules/ecs/_local.tf +++ b/terraform/modules/ecs/_local.tf @@ -54,6 +54,14 @@ locals { { name = "NEXT_PUBLIC_BASEPATH", value = var.ecr_viewer_basepath + }, + { + name = "METADATA_DATABASE_SCHEMA", + value = var.ecr_viewer_metadata_database_schema + }, + { + name = "METADATA_DATABASE_TYPE", + value = var.ecr_viewer_metadata_database_type } ] }, diff --git a/terraform/modules/ecs/_variable.tf b/terraform/modules/ecs/_variable.tf index 14ad01f..c4d602a 100644 --- a/terraform/modules/ecs/_variable.tf +++ b/terraform/modules/ecs/_variable.tf @@ -190,3 +190,15 @@ Iynom6unaheZpS4DFIh2w9UCAwEAAQ== -----END PUBLIC KEY----- EOT } + +variable "ecr_viewer_metadata_database_schema" { + description = "The database schema used for the eCR metadata tables" + type = string + default = "core" +} + +variable "ecr_viewer_metadata_database_type" { + description = "The SQL variant used for the eCR metadata tables" + type = string + default = "postgres" +}