Merge pull request #8586 from ministryofjustice/TM-610-add-env-prefix…

…-efs-multi-env-setup TM-610 add multienv naming to ldap efs
ministryofjustice · Nov 7, 2024 · af4e2b2 · af4e2b2
2 parents 9f0801f + f733a2b
commit af4e2b2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/terraform/environments/delius-core/modules/components/ldap/efs.tf b/terraform/environments/delius-core/modules/components/ldap/efs.tf
@@ -11,7 +11,8 @@ module "efs" {
   tags                            = var.tags
   enable_platform_backups         = var.enable_platform_backups
 
-  vpc_id     = var.account_config.shared_vpc_id
-  subnet_ids = var.account_config.private_subnet_ids
-  vpc_cidr   = var.account_config.shared_vpc_cidr
+  vpc_id       = var.account_config.shared_vpc_id
+  subnet_ids   = var.account_config.private_subnet_ids
+  vpc_cidr     = var.account_config.shared_vpc_cidr
+  account_info = var.account_info
 }
diff --git a/terraform/environments/delius-core/modules/helpers/efs/main.tf b/terraform/environments/delius-core/modules/helpers/efs/main.tf
@@ -9,7 +9,7 @@ resource "aws_efs_file_system" "this" {
 
   tags = merge(
     var.tags,
-    { Name = var.name },
+    { Name = "${var.account_info.application_name}-${var.env_name}-${var.name}" },
     var.enable_platform_backups != null ? { "backup" = var.enable_platform_backups ? "true" : "false" } : {}
   )
 }
@@ -23,19 +23,24 @@ resource "aws_efs_mount_target" "this" {
 }
 
 # module for efs access point
-resource "aws_efs_access_point" "ldap" {
+resource "aws_efs_access_point" "this" {
   file_system_id = aws_efs_file_system.this.id
   root_directory {
     path = "/"
   }
   tags = merge(
     var.tags,
     {
-      Name = "${var.env_name}-${var.name}-efs-access-point"
+      Name = "${var.account_info.application_name}-${var.env_name}-efs-access-point"
     }
   )
 }
 
+moved {
+  from = aws_efs_access_point.ldap
+  to   = aws_efs_access_point.this
+}
+
 # Security Group
 resource "aws_security_group" "default" {
   name        = "${var.env_name}-${var.name}-efs"

diff --git a/terraform/environments/delius-core/modules/helpers/efs/outputs.tf b/terraform/environments/delius-core/modules/helpers/efs/outputs.tf
@@ -16,9 +16,9 @@ output "sg_arn" {
 }
 
 output "access_point_id" {
-  value = aws_efs_access_point.ldap.id
+  value = aws_efs_access_point.this.id
 }
 
 output "name" {
   value = var.name
-}
+}
diff --git a/terraform/environments/delius-core/modules/helpers/efs/variables.tf b/terraform/environments/delius-core/modules/helpers/efs/variables.tf
@@ -68,3 +68,8 @@ variable "enable_platform_backups" {
   type        = bool
   default     = null
 }
+
+variable "account_info" {
+  description = "Account info to pass to the instance"
+  type        = any
+}