Merge pull request #3140 from ministryofjustice/NIT-795-delius-db-add…

…-connectivity-between-delius-core-dev-and-legacy-eng-dev NIT-795 allow legacy rman in
ministryofjustice · Aug 21, 2023 · d5830e7 · d5830e7
2 parents af885cf + 3630130
commit d5830e7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/terraform/environments/delius-core/ec2_instance_db.tf b/terraform/environments/delius-core/ec2_instance_db.tf
@@ -24,6 +24,18 @@ resource "aws_vpc_security_group_egress_rule" "base_ami_test_instance_https_out"
   )
 }
 
+resource "aws_vpc_security_group_ingress_rule" "db_ec2_instance_rman_in" {
+  security_group_id = aws_security_group.base_ami_test_instance_sg.id
+  cidr_ipv4         = local.environment_config_dev.legacy_engineering_vpc_cidr
+  from_port         = 1521
+  to_port           = 1521
+  ip_protocol       = "tcp"
+  description       = "Allow communication in on port 1521 from legacy rman"
+  tags = merge(local.tags,
+    { Name = "legacy-rman-in" }
+  )
+}
+
 # Pre-req - IAM role, attachment for SSM usage and instance profile
 data "aws_iam_policy_document" "base_ami_test_instance_iam_assume_policy" {
   statement {
@@ -170,4 +182,3 @@ resource "aws_instance" "base_ami_test_instance" {
     { database = "delius-db-1" }
   )
 }
-
diff --git a/terraform/environments/delius-core/locals_development_dev1.tf b/terraform/environments/delius-core/locals_development_dev1.tf
@@ -17,6 +17,7 @@ locals {
 
   environment_config_dev = {
     migration_environment_vpc_cidr = "10.161.20.0/22"
+    legacy_engineering_vpc_cidr    = "10.161.98.0/25"
     ec2_user_ssh_key               = file("${path.module}/files/.ssh/${terraform.workspace}-dev/ec2-user.pub")
   }
 

diff --git a/terraform/environments/delius-core/modules/environment_all_components/db_ec2.tf b/terraform/environments/delius-core/modules/environment_all_components/db_ec2.tf
@@ -20,6 +20,18 @@ resource "aws_vpc_security_group_egress_rule" "db_ec2_instance_https_out" {
   )
 }
 
+resource "aws_vpc_security_group_ingress_rule" "db_ec2_instance_rman_in" {
+  security_group_id = aws_security_group.db_ec2_instance_sg.id
+  cidr_ipv4         = var.environment_config.legacy_engineering_vpc_cidr
+  from_port         = 1521
+  to_port           = 1521
+  ip_protocol       = "tcp"
+  description       = "Allow communication in on port 1521 from legacy rman"
+  tags = merge(local.tags,
+    { Name = "legacy-rman-in" }
+  )
+}
+
 # Pre-reqs - IAM role, attachment for SSM usage and instance profile
 data "aws_iam_policy_document" "db_ec2_instance_iam_assume_policy" {
   statement {

diff --git a/terraform/environments/delius-core/modules/environment_all_components/variables.tf b/terraform/environments/delius-core/modules/environment_all_components/variables.tf
@@ -47,7 +47,8 @@ variable "account_config" {
 
 variable "environment_config" {
   type = object({
-    migration_environment_vpc_cidr = optional(string),
+    migration_environment_vpc_cidr = optional(string)
+    legacy_engineering_vpc_cidr    = string
     ec2_user_ssh_key               = string
   })
 }