diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7e4e7daf..7900442e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.96.1 + rev: v1.99.0 hooks: - id: terraform_fmt - id: terraform_wrapper_module_for_each diff --git a/modules/service/main.tf b/modules/service/main.tf index b7ecef9e..c69c12da 100644 --- a/modules/service/main.tf +++ b/modules/service/main.tf @@ -285,7 +285,7 @@ resource "aws_ecs_service" "ignore_task_definition" { dynamic "network_configuration" { # Set by task set if deployment controller is external - for_each = var.network_mode == "awsvpc" ? [{ for k, v in local.network_configuration : k => v if !local.is_external_deployment }] : [] + for_each = var.network_mode == "awsvpc" && !local.is_external_deployment ? [local.network_configuration] : [] content { assign_public_ip = network_configuration.value.assign_public_ip @@ -381,7 +381,7 @@ resource "aws_ecs_service" "ignore_task_definition" { wait_for_steady_state = var.wait_for_steady_state propagate_tags = var.propagate_tags - tags = var.tags + tags = merge(var.tags, var.service_tags) timeouts { create = try(var.timeouts.create, null)