Merge pull request #23 from dxw/fix-use-resource-prefix-instead-of-pr…

…oject-name

Fix: Use `resource_prefix` instead of `project_name`

ecs-cluster-infrastructure-draining-lambda.tf

@@ -1,15 +1,15 @@
 resource "aws_cloudwatch_log_group" "ecs_cluster_infrastructure_draining_lambda_log_group" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled ? 1 : 0
 
-  name              = "/aws/lambda/${local.project_name}-ecs-cluster-infrastructure-draining"
+  name              = "/aws/lambda/${local.resource_prefix}-ecs-cluster-infrastructure-draining"
   kms_key_id        = local.infrastructure_kms_encryption ? aws_kms_key.infrastructure[0].arn : null
   retention_in_days = local.infrastructure_ecs_cluster_draining_lambda_log_retention
 }
 
 resource "aws_iam_role" "ecs_cluster_infrastructure_draining_lambda" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled ? 1 : 0
 
-  name = "${local.project_name}-ecs-cluster-infrastructure-draining-lambda"
+  name = "${local.resource_prefix}-ecs-cluster-infrastructure-draining-lambda"
   assume_role_policy = templatefile(
     "${path.root}/policies/assume-roles/service-principle-standard.json.tpl",
     { services = jsonencode(["lambda.amazonaws.com"]) }
@@ -19,13 +19,13 @@ resource "aws_iam_role" "ecs_cluster_infrastructure_draining_lambda" {
 resource "aws_iam_policy" "ecs_cluster_infrastructure_draining_lambda" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled ? 1 : 0
 
-  name = "${local.project_name}-ecs-cluster-infrastructure-draining-lambda"
+  name = "${local.resource_prefix}-ecs-cluster-infrastructure-draining-lambda"
   policy = templatefile(
     "${path.root}/policies/lambda-default.json.tpl",
     {
       region        = local.aws_region
       account_id    = local.aws_account_id
-      function_name = "${local.project_name}-ecs-cluster-infrastructure-draining"
+      function_name = "${local.resource_prefix}-ecs-cluster-infrastructure-draining"
     }
   )
 }
@@ -40,7 +40,7 @@ resource "aws_iam_role_policy_attachment" "ecs_cluster_infrastructure_draining_l
 resource "aws_iam_policy" "ecs_cluster_infrastructure_draining_ecs_container_instance_state_update_lambda" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled ? 1 : 0
 
-  name = "${local.project_name}-ecs-cluster-infrastructure-ecs-container-instance-state-update"
+  name = "${local.resource_prefix}-ecs-cluster-infrastructure-ecs-container-instance-state-update"
   policy = templatefile(
     "${path.root}/policies/ecs-container-instance-state-update.json.tpl", {}
   )
@@ -56,7 +56,7 @@ resource "aws_iam_role_policy_attachment" "ecs_cluster_infrastructure_draining_e
 resource "aws_iam_policy" "ecs_cluster_infrastructure_draining_sns_publish_lambda" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled ? 1 : 0
 
-  name = "${local.project_name}-ecs-cluster-infrastructure-sns-publish"
+  name = "${local.resource_prefix}-ecs-cluster-infrastructure-sns-publish"
   policy = templatefile(
     "${path.root}/policies/sns-publish.json.tpl",
     { sns_topic_arn = aws_sns_topic.infrastructure_ecs_cluster_autoscaling_lifecycle_termination[0].arn }
@@ -73,7 +73,7 @@ resource "aws_iam_role_policy_attachment" "ecs_cluster_infrastructure_draining_s
 resource "aws_iam_policy" "ecs_cluster_infrastructure_draining_kms_encrypt" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled && local.infrastructure_kms_encryption ? 1 : 0
 
-  name = "${local.project_name}-ecs-cluster-infrastructure-kms-encrypt"
+  name = "${local.resource_prefix}-ecs-cluster-infrastructure-kms-encrypt"
   policy = templatefile(
     "${path.root}/policies/kms-encrypt.json.tpl",
     { kms_key_arn = aws_kms_key.infrastructure[0].arn }
@@ -99,8 +99,8 @@ resource "aws_lambda_function" "ecs_cluster_infrastructure_draining" {
   count = local.infrastructure_ecs_cluster_draining_lambda_enabled ? 1 : 0
 
   filename         = data.archive_file.ecs_cluster_infrastructure_draining_lambda[0].output_path
-  function_name    = "${local.project_name}-ecs-cluster-infrastructure-draining"
-  description      = "${local.project_name} ECS Cluster Infrastructure Draining"
+  function_name    = "${local.resource_prefix}-ecs-cluster-infrastructure-draining"
+  description      = "${local.resource_prefix} ECS Cluster Infrastructure Draining"
   handler          = "function.lambda_handler"
   runtime          = "python3.11"
   role             = aws_iam_role.ecs_cluster_infrastructure_draining_lambda[0].arn

ecs-cluster-infrastructure.tf

@@ -114,7 +114,7 @@ resource "aws_iam_role" "infrastructure_ecs_cluster" {
 resource "aws_iam_policy" "infrastructure_ecs_cluster_ec2_ecs" {
   count = local.enable_infrastructure_ecs_cluster ? 1 : 0
 
-  name   = "${local.project_name}-ec2-ecs"
+  name   = "${local.resource_prefix}-ec2-ecs"
   policy = templatefile("${path.root}/policies/ec2-ecs.json.tpl", {})
 }
 

kms-infrastructure.tf

@@ -22,7 +22,7 @@ resource "aws_kms_key" "infrastructure" {
       )}${local.infrastructure_ecs_cluster_draining_lambda_enabled && local.infrastructure_kms_encryption ? "," : ""}
       ${templatefile("${path.root}/policies/kms-key-policy-statements/cloudwatch-logs-allow.json.tpl",
       {
-        log_group_arn = local.infrastructure_ecs_cluster_draining_lambda_enabled && local.infrastructure_kms_encryption ? "arn:aws:logs:${local.aws_region}:${local.aws_account_id}:log-group:/aws/lambda/${local.project_name}-ecs-cluster-infrastructure-draining" : ""
+        log_group_arn = local.infrastructure_ecs_cluster_draining_lambda_enabled && local.infrastructure_kms_encryption ? "arn:aws:logs:${local.aws_region}:${local.aws_account_id}:log-group:/aws/lambda/${local.resource_prefix}-ecs-cluster-infrastructure-draining" : ""
       }
       )}${local.infrastructure_vpc_flow_logs_s3_with_athena && local.infrastructure_kms_encryption ? "," : ""}
       ${templatefile("${path.root}/policies/kms-key-policy-statements/log-delivery-allow.json.tpl",