Skip to content

Commit 3b09b3a

Browse files
fix: Propagate support for EBS volumes to the root module (#223)
* Add missing support for EBS volumes. The PR #205 failed to update the main module triggered when using the Terraform Registry as the module source. * Set default to true * Correct infra iam role logic.
1 parent 8774416 commit 3b09b3a

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

main.tf

+11
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ module "service" {
8585
service_registries = lookup(each.value, "service_registries", {})
8686
timeouts = try(each.value.timeouts, {})
8787
triggers = try(each.value.triggers, {})
88+
volume_configuration = try(each.value.volume_configuration, {})
8889
wait_for_steady_state = try(each.value.wait_for_steady_state, null)
8990

9091
# Service IAM role
@@ -98,6 +99,16 @@ module "service" {
9899
iam_role_tags = try(each.value.iam_role_tags, {})
99100
iam_role_statements = lookup(each.value, "iam_role_statements", {})
100101

102+
# ECS infrastructure IAM role
103+
create_infrastructure_iam_role = try(each.value.create_infrastructure_iam_role, false)
104+
infrastructure_iam_role_arn = try(each.value.infrastructure_iam_role_arn, null)
105+
infrastructure_iam_role_name = try(each.value.infrastructure_iam_role_name, null)
106+
infrastructure_iam_role_use_name_prefix = try(each.value.infrastructure_iam_role_use_name_prefix, true)
107+
infrastructure_iam_role_path = try(each.value.infrastructure_iam_role_path, null)
108+
infrastructure_iam_role_description = try(each.value.infrastructure_iam_role_description, null)
109+
infrastructure_iam_role_permissions_boundary = try(each.value.infrastructure_iam_role_permissions_boundary, null)
110+
infrastructure_iam_role_tags = try(each.value.infrastructure_iam_role_tags, {})
111+
101112
# Task definition
102113
create_task_definition = try(each.value.create_task_definition, true)
103114
task_definition_arn = lookup(each.value, "task_definition_arn", null)

modules/service/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1505,8 +1505,8 @@ resource "aws_security_group_rule" "this" {
15051505
############################################################################################
15061506

15071507
locals {
1508-
needs_infrastructure_iam_role = var.create_infrastructure_iam_role && var.volume_configuration != null
1509-
create_infrastructure_iam_role = var.create && local.needs_infrastructure_iam_role
1508+
needs_infrastructure_iam_role = var.volume_configuration != null
1509+
create_infrastructure_iam_role = var.create && var.create_infrastructure_iam_role && local.needs_infrastructure_iam_role
15101510
infrastructure_iam_role_name = try(coalesce(var.infrastructure_iam_role_name, var.name), "")
15111511
}
15121512

modules/service/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ variable "security_group_tags" {
673673
variable "create_infrastructure_iam_role" {
674674
description = "Determines whether the ECS infrastructure IAM role should be created"
675675
type = bool
676-
default = false
676+
default = true
677677
}
678678

679679
variable "infrastructure_iam_role_arn" {

0 commit comments

Comments
 (0)