Merge pull request #5708 from ministryofjustice/oasys-7777

oasys 7777
ministryofjustice · Apr 13, 2024 · 703291d · 703291d
2 parents d8cd6da + d7ca313
commit 703291d
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/terraform/environments/oasys/locals.tf b/terraform/environments/oasys/locals.tf
@@ -87,6 +87,7 @@ locals {
     lb_target_groups = {
       pv-http-8080 = local.target_group_http_8080
       pb-http-8080 = local.target_group_http_8080
+      pv-http-7777 = local.target_group_http_7777
     }
     tags = {
       component         = "web"
@@ -128,6 +129,26 @@ locals {
       type    = "lb_cookie"
     }
   }
+  target_group_http_7777 = {
+    port                 = 7777
+    protocol             = "HTTP"
+    deregistration_delay = 30
+    health_check = {
+      enabled             = true
+      interval            = 30
+      healthy_threshold   = 3
+      matcher             = "200-399"
+      path                = "/"
+      port                = 7777
+      protocol            = "HTTP"
+      timeout             = 5
+      unhealthy_threshold = 5
+    }
+    stickiness = {
+      enabled = true
+      type    = "lb_cookie"
+    }
+  }
 
   ###
   #  db

diff --git a/terraform/environments/oasys/locals_security_groups.tf b/terraform/environments/oasys/locals_security_groups.tf
@@ -59,6 +59,7 @@ locals {
     ])
     http7xxx = flatten([
       "10.0.0.0/8",
+      module.ip_addresses.moj_cidr.aws_cloud_platform_vpc,
     ])
   }
   security_group_cidrs_prod = {
@@ -107,6 +108,7 @@ locals {
     ])
     http7xxx = flatten([
       "10.0.0.0/8",
+      module.ip_addresses.moj_cidr.aws_cloud_platform_vpc,
     ])
   }
   security_group_cidrs_by_environment = {
@@ -159,6 +161,15 @@ locals {
             local.security_group_cidrs.https_internal,
           ])
         }
+        http7777 = {
+          description = "Allow http7777 ingress"
+          from_port   = 7777
+          to_port     = 7777
+          protocol    = "tcp"
+          cidr_blocks = flatten([
+            local.security_group_cidrs.http7xxx,
+          ])
+        }
       }
       egress = {
         all = {
@@ -190,6 +201,13 @@ locals {
             local.security_group_cidrs.https_external,
           ])
         }
+        http7777 = {
+          description = "Allow http7777 ingress"
+          from_port   = 7777
+          to_port     = 7777
+          protocol    = "tcp"
+          cidr_blocks = local.security_group_cidrs.http7xxx
+        }
       }
       egress = {
         all = {
@@ -223,6 +241,14 @@ locals {
           ]))
           security_groups = ["private_lb", "public_lb"]
         }
+        http7777 = {
+          description = "Allow http7777 ingress"
+          from_port   = 7777
+          to_port     = 7777
+          protocol    = "tcp"
+          security_groups = ["private_lb", "public_lb"]
+          cidr_blocks = local.security_group_cidrs.http7xxx
+        }
       }
       egress = {
         all = {