Back to object

Crown-Commercial-Service · Oct 15, 2024 · 49c7210 · 49c7210
1 parent aa85bff
commit 49c7210
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 34 deletions.
diff --git a/modules/postgres-etl/extract/extract_task.tf b/modules/postgres-etl/extract/extract_task.tf
@@ -41,7 +41,7 @@ module "extract_task" {
       ]
     }
   }
-  ecs_execution_role_arn = var.ecs_extract_execution_role_arn
+  ecs_execution_role_arn = var.ecs_extract_execution_role.arn
   family_name            = "${var.migrator_name}_extract"
   task_cpu               = var.extract_task_cpu
   task_memory            = var.extract_task_memory

diff --git a/modules/postgres-etl/extract/variables.tf b/modules/postgres-etl/extract/variables.tf
@@ -23,14 +23,12 @@ variable "ecs_cluster_arn" {
   description = "ARN of cluster into which tasks will be deployed"
 }
 
-variable "ecs_extract_execution_role_arn" {
-  type        = string
-  description = "ARN of the role which is assumed by the ECS execution processes"
-}
-
-variable "ecs_extract_execution_role_name" {
-  type = string
-  description = "Name of the role which is assumed by the ECS execution processes"
+variable "ecs_extract_execution_role" {
+  type = object({
+    arn  = string
+    name = string
+  })
+  description = "Details of the role which is assumed by the ECS execution processes"
 }
 
 variable "efs_subnet_ids" {

diff --git a/modules/postgres-etl/load/load_task.tf b/modules/postgres-etl/load/load_task.tf
@@ -34,7 +34,7 @@ module "load_task" {
       ]
     }
   }
-  ecs_execution_role_arn = var.ecs_load_execution_role_arn
+  ecs_execution_role_arn = var.ecs_load_execution_role.arn
   family_name            = "${var.migrator_name}_load"
   task_cpu               = var.load_task_cpu
   task_memory            = var.load_task_memory

diff --git a/modules/postgres-etl/load/variables.tf b/modules/postgres-etl/load/variables.tf
@@ -23,14 +23,12 @@ variable "ecs_cluster_arn" {
   description = "ARN of cluster into which tasks will be deployed"
 }
 
-variable "ecs_load_execution_role_arn" {
-  type        = string
-  description = "ARN of the role which is assumed by the ECS execution processes"
-}
-
-variable "ecs_load_execution_role_name" {
-  type = string
-  description = "Name of the role which is assumed by the ECS execution processes"
+variable "ecs_load_execution_role" {
+  type = object({
+    arn  = string
+    name = string
+  })
+  description = "Details of the role which is assumed by the ECS execution processes"
 }
 
 variable "efs_subnet_ids" {

diff --git a/modules/postgres-etl/variables.tf b/modules/postgres-etl/variables.tf
@@ -23,24 +23,20 @@ variable "ecs_cluster_arn" {
   description = "ARN of cluster into which tasks will be deployed"
 }
 
-variable "ecs_extract_execution_role_arn" {
-  type        = string
-  description = "ARN of the role which is assumed by the ECS execution processes"
-}
-
-variable "ecs_load_execution_role_arn" {
-  type        = string
-  description = "ARN of the role which is assumed by the ECS execution processes"
-}
-
-variable "ecs_extract_execution_role_name" {
-  type = string
-  description = "Name of the role which is assumed by the ECS execution processes"
+variable "ecs_extract_execution_role" {
+  type = object({
+    arn  = string
+    name = string
+  })
+  description = "Details of the role which is assumed by the ECS execution processes"
 }
 
-variable "ecs_load_execution_role_name" {
-  type = string
-  description = "Name of the role which is assumed by the ECS execution processes"
+variable "ecs_load_execution_role" {
+  type = object({
+    arn  = string
+    name = string
+  })
+  description = "Details of the role which is assumed by the ECS execution processes"
 }
 
 variable "efs_subnet_ids" {