Merge pull request #104 from uktrade/feat/arango

feat: add ArangoDB
uktrade · Jul 22, 2024 · cb04641 · cb04641
2 parents 84ec2f0 + 69924d8
commit cb04641
Show file tree

Hide file tree

Showing 11 changed files with 1,159 additions and 22 deletions.
diff --git a/infra/ecr.tf b/infra/ecr.tf
@@ -98,6 +98,11 @@ resource "aws_ecr_repository" "mlflow" {
   name = "${var.prefix}-mlflow"
 }
 
+resource "aws_ecr_repository" "arango" {
+  count = var.arango_on ? 1 : 0
+  name  = "${var.prefix}-arango"
+}
+
 resource "aws_vpc_endpoint" "ecr_dkr" {
   vpc_id              = aws_vpc.main.id
   service_name        = "com.amazonaws.${data.aws_region.aws_region.name}.ecr.dkr"

diff --git a/infra/ecs_main_admin.tf b/infra/ecs_main_admin.tf
@@ -1,5 +1,5 @@
 locals {
-  admin_container_vars = {
+  admin_container_vars = merge({
     container_image = "${aws_ecr_repository.admin.repository_url}:${data.external.admin_current_tag.result.tag}"
     container_name  = "${local.admin_container_name}"
     container_port  = "${local.admin_container_port}"
@@ -98,7 +98,16 @@ locals {
 
     jwt_private_key = "${var.jwt_private_key}"
     mlflow_port     = "${local.mlflow_port}"
-  }
+    }, var.arango_on ? {
+    arango_db__host     = "${aws_lb.arango[0].dns_name}"
+    arango_db__password = "${random_string.aws_arangodb_root_password[0].result}"
+    arango_db__port     = "${local.arango_container_port}"
+    } : {
+    arango_db__host     = ""
+    arango_db__password = ""
+    arango_db__port     = ""
+    }
+  )
 }
 
 resource "aws_ecs_service" "admin" {

diff --git a/infra/ecs_main_admin_container_definitions.json b/infra/ecs_main_admin_container_definitions.json
@@ -55,6 +55,22 @@
       "name": "EXPLORER_DEFAULT_CONNECTION",
       "value": "datasets_1"
     },
+    {
+      "name": "ARANGO_DB__HOST",
+      "value": "${arango_db__host}"
+    },
+    {
+      "name": "ARANGO_DB__PORT",
+      "value": "${arango_db__port}"
+    },
+    {
+      "name": "ARANGO_DB__USER",
+      "value": "root"
+    },
+    {
+      "name": "ARANGO_DB__PASSWORD",
+      "value": "${arango_db__password}"
+    },
     {
       "name": "ALLOWED_HOSTS__1",
       "value": "${root_domain}"