diff --git a/eventbridge.guardduty.tf b/eventbridge.guardduty.tf index 8e756c7..7b12e37 100644 --- a/eventbridge.guardduty.tf +++ b/eventbridge.guardduty.tf @@ -8,6 +8,7 @@ resource "aws_cloudwatch_log_group" "guardduty_event_log" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["log"], ) } @@ -145,12 +146,14 @@ module "eventbridge_guardduty" { role_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["role"], ) tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["guardduty"], ) } diff --git a/eventbridge.s3.tf b/eventbridge.s3.tf index ffdc1b0..d671431 100644 --- a/eventbridge.s3.tf +++ b/eventbridge.s3.tf @@ -81,6 +81,7 @@ module "eventbridge_s3" { role_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["role"], ) diff --git a/lambda.layer.tf b/lambda.layer.tf index 623ace3..d03dadf 100644 --- a/lambda.layer.tf +++ b/lambda.layer.tf @@ -29,6 +29,7 @@ module "lambda_layer" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["lambda"], ) } diff --git a/lambda.move.tf b/lambda.move.tf index 681e22c..c868d34 100644 --- a/lambda.move.tf +++ b/lambda.move.tf @@ -14,6 +14,7 @@ module "lambda_move" { cloudwatch_logs_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["log"], ) @@ -59,12 +60,14 @@ module "lambda_move" { role_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["role"], ) tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["lambda"], ) } @@ -165,6 +168,7 @@ module "lambda_move_failure" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["sqs"], ) } diff --git a/lambda.notify.tf b/lambda.notify.tf index d52ee61..1c16ed3 100644 --- a/lambda.notify.tf +++ b/lambda.notify.tf @@ -15,6 +15,7 @@ module "lambda_notify" { cloudwatch_logs_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["log"], ) @@ -77,12 +78,14 @@ module "lambda_notify" { role_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["role"], ) tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["lambda"], ) } @@ -149,6 +152,7 @@ module "lambda_notify_failure" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["sqs"], ) } diff --git a/lambda.s3-tag.tf b/lambda.s3-tag.tf index ada3aa7..89a69cf 100644 --- a/lambda.s3-tag.tf +++ b/lambda.s3-tag.tf @@ -15,6 +15,7 @@ module "lambda_s3_tag" { cloudwatch_logs_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["log"], ) @@ -76,12 +77,14 @@ module "lambda_s3_tag" { role_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["role"], ) tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["lambda"], ) } @@ -156,6 +159,7 @@ module "lambda_s3_tag_failure" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["sqs"], ) } diff --git a/lambda.s3.tf b/lambda.s3.tf index b289b89..6d0ef45 100644 --- a/lambda.s3.tf +++ b/lambda.s3.tf @@ -15,6 +15,7 @@ module "lambda_s3" { cloudwatch_logs_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["log"], ) @@ -77,12 +78,14 @@ module "lambda_s3" { role_tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["role"], ) tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["lambda"], ) } @@ -149,6 +152,7 @@ module "lambda_s3_failure" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["sqs"], ) } diff --git a/role.tf b/role.tf index 5883d5e..6b92ed4 100644 --- a/role.tf +++ b/role.tf @@ -6,6 +6,7 @@ resource "aws_iam_role" "guardduty_malware_role" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["guardduty"], ) } diff --git a/s3.tf b/s3.tf index a510f12..2253a88 100644 --- a/s3.tf +++ b/s3.tf @@ -14,6 +14,7 @@ module "files_in" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["s3"], ) } @@ -34,6 +35,7 @@ module "files_clean" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["s3"], ) } @@ -59,6 +61,7 @@ module "files_quarantine" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["s3"], ) } @@ -79,6 +82,7 @@ module "files_out_clean" { tags = merge( local.base_tags, var.tags, + var.output_resource_tags, local.output_finops_roles["s3"], ) } @@ -107,6 +111,7 @@ resource "aws_guardduty_malware_protection_plan" "s3_malware" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["guardduty"], ) } diff --git a/secret.tf b/secret.tf index 560d398..1bc3b6b 100644 --- a/secret.tf +++ b/secret.tf @@ -12,6 +12,7 @@ resource "aws_secretsmanager_secret" "app_secret" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["secret"], { Name = var.secret_name }, ) @@ -85,6 +86,7 @@ resource "aws_kms_key" "app_secret" { tags = merge( local.base_tags, var.tags, + var.input_resource_tags, local.input_finops_roles["kms"], { Name = format("v-kms-%v", var.secret_key_name) }, ) diff --git a/version.tf b/version.tf index a9f27c0..e7bbb9e 100644 --- a/version.tf +++ b/version.tf @@ -1,4 +1,4 @@ locals { _module_name = "aws-app-ditd-darhts-s3-transfer" - _module_version = "0.9.11" + _module_version = "0.9.12" }