Update example / Minor refactoring

Author: sestrella

examples/complete/main.tf

@@ -21,6 +21,19 @@ locals {
   }
 }
 
+module "secrets_manager" {
+  for_each = {
+    BAR = "secret1"
+    FOO = "secret2"
+  }
+
+  source = "terraform-aws-modules/secrets-manager/aws"
+  version = "~> 1.3"
+
+  name_prefix   = each.key
+  secret_string = each.value
+}
+
 ################################################################################
 # Cluster
 ################################################################################
@@ -50,7 +63,7 @@ module "ecs" {
       cpu    = 1024
       memory = 4096
 
-      explicit_task_exec_secret_arns = true
+      explicit_task_exec_secret_arns = false
 
       # Container definition(s)
       container_definitions = {
@@ -72,6 +85,17 @@ module "ecs" {
           essential = true
           image     = "public.ecr.aws/aws-containers/ecsdemo-frontend:776fd50"
 
+          secrets = [
+            {
+              name      = "FOO"
+              valueFrom = module.secrets_manager["FOO"].secret_arn
+            },
+            {
+              name      = "BAR"
+              valueFrom = module.secrets_manager["BAR"].secret_arn
+            }
+          ]
+
           health_check = {
             command = ["CMD-SHELL", "curl -f http://localhost:${local.container_port}/health || exit 1"]
           }

modules/container-definition/outputs.tf

@@ -7,6 +7,11 @@ output "container_definition" {
   value       = local.container_definition
 }
 
+output "secrets_arns" {
+  description = "The secrets ARNs for all containers defined"
+  value = [for v in try(local.container_definition.secrets, []): v.valueFrom]
+}
+
 ################################################################################
 # CloudWatch Log Group
 ################################################################################

modules/service/main.tf

@@ -27,8 +27,8 @@ locals {
 
   create_service = var.create && var.create_service
 
-  container_definitions_secrets = flatten([for k, v in module.container_definition : v.container_definition.secrets])
-  task_exec_secret_arns         = var.explicit_task_exec_secret_arns ? [for v in local.container_definitions_secrets : v.valueFrom] : var.task_exec_secret_arns
+  secrets_arns          = flatten([for k, v in module.container_definition : v.secrets_arns])
+  task_exec_secret_arns = var.explicit_task_exec_secret_arns ? local.secrets_arns : var.task_exec_secret_arns
 }
 
 resource "aws_ecs_service" "this" {