Skip to content

Fix/efs volume #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix/efs volume #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
857de30
update efs volume var
Apr 22, 2025
3706428
add secret manager kms condition
Apr 30, 2025
8df7701
add secret kms key arn var
Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ locals {
| 1 | 1 | use custom kms */
cloudwatch_log_group_kms_key_arn = var.is_create_cloudwatch_log_group ? var.cloudwatch_log_group_kms_key_arn != null ? var.cloudwatch_log_group_kms_key_arn : var.is_create_default_kms ? module.cloudwatch_log_group_kms[0].key_arn : null : null

secret_kms_key_arn = var.is_create_default_kms && var.secret_kms_key_arn == null ? module.secret_kms_key[0].key_arn : var.secret_kms_key_arn

tags = merge(
{
"Environment" = var.environment,
Expand Down
7 changes: 4 additions & 3 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ module "cloudwatch_log_group_kms" {
name = format("%s-log-group", var.name)
key_type = "service"
append_random_suffix = true
description = format("Secure Secrets Manager's service secrets for service %s", local.name)
description = format("Secure log group for service %s", local.name)
additional_policies = [data.aws_iam_policy_document.cloudwatch_log_group_kms_policy.json]

tags = merge(local.tags, { "Name" : format("%s-log-group", local.name) })
Expand Down Expand Up @@ -193,6 +193,7 @@ resource "aws_lb_listener_rule" "this" {
/* Secret */
/* -------------------------------------------------------------------------- */
module "secret_kms_key" {
count = var.is_create_default_kms && var.secret_kms_key_arn == null ? 1 : 0
source = "oozou/kms-key/aws"
version = "1.0.0"

Expand Down Expand Up @@ -226,7 +227,7 @@ resource "aws_secretsmanager_secret" "this" {

name = "${each.value.name}/${random_string.service_secret_random_suffix[each.key].result}"
description = "Secret for service ${local.name}"
kms_key_id = module.secret_kms_key.key_arn
kms_key_id = local.secret_kms_key_arn

tags = merge({ Name = "${each.value.name}/${random_string.service_secret_random_suffix[each.key].result}" }, local.tags)
}
Expand Down Expand Up @@ -275,7 +276,7 @@ resource "aws_ecs_task_definition" "this" {
container_definitions = jsonencode(local.container_task_definitions)

dynamic "volume" {
for_each = local.volumes
for_each = var.efs_volumes #local.volumes
content {
host_path = lookup(volume.value, "host_path", null)
name = volume.value.name
Expand Down
9 changes: 7 additions & 2 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ variable "cloudwatch_log_group_kms_key_arn" {
default = null
}

variable "secret_kms_key_arn" {
description = "The ARN for the secret manager KMS encryption key."
type = string
default = null
}

/* -------------------------------------------------------------------------- */
/* LoadBalancer */
/* -------------------------------------------------------------------------- */
Expand Down Expand Up @@ -272,8 +278,7 @@ variable "ordered_placement_strategy" {
/* -------------------------------------------------------------------------- */
variable "efs_volumes" {
description = "Task EFS volume definitions as list of configuration objects. You cannot define both Docker volumes and EFS volumes on the same task definition."
type = list(any)
default = []
type = any
}

/* -------------------------------------------------------------------------- */
Expand Down
Loading