diff --git a/cloudtrail/README.md b/cloudtrail/README.md index d25d4cf..1bf5b1b 100644 --- a/cloudtrail/README.md +++ b/cloudtrail/README.md @@ -206,8 +206,8 @@ No modules. | Name | Description | |------|-------------| -| [additional\_sqs\_arn](#output\_additional\_sqs\_arn) | Additional SQS ARNs (main, deadletter) | +| [additional\_sqs\_info](#output\_additional\_sqs\_info) | Additional SQS ARNs and IDs (main, deadletter) | | [s3\_bucket\_arn](#output\_s3\_bucket\_arn) | Created S3 Bucket ARN | | [s3\_bucket\_id](#output\_s3\_bucket\_id) | Created S3 Bucket ID | | [sns\_arn](#output\_sns\_arn) | SNS ARN | -| [sqs\_arn](#output\_sqs\_arn) | Main SQS ARNs (main, deadletter) | +| [sqs\_info](#output\_sqs\_info) | Main SQS ARNs and IDs (main, deadletter) | diff --git a/cloudtrail/outputs.tf b/cloudtrail/outputs.tf index e12d563..bdaed8f 100644 --- a/cloudtrail/outputs.tf +++ b/cloudtrail/outputs.tf @@ -8,20 +8,32 @@ output "s3_bucket_id" { value = aws_s3_bucket.this.id } -output "sqs_arn" { - description = "Main SQS ARNs (main, deadletter)" +output "sqs_info" { + description = "Main SQS ARNs and IDs (main, deadletter)" value = { - "main" = var.enable_sqs ? aws_sqs_queue.cloudtrail[0].arn : null - "deadletter" = var.enable_sqs ? aws_sqs_queue.cloudtrail_deadletter[0].arn : null + "main" = { + arn = var.enable_sqs ? aws_sqs_queue.cloudtrail[0].arn : null + id = var.enable_sqs ? aws_sqs_queue.cloudtrail[0].id : null + } + "deadletter" = { + arn = var.enable_sqs ? aws_sqs_queue.cloudtrail_deadletter[0].arn : null + id = var.enable_sqs ? aws_sqs_queue.cloudtrail_deadletter[0].id : null + } } } -output "additional_sqs_arn" { - description = "Additional SQS ARNs (main, deadletter)" +output "additional_sqs_info" { + description = "Additional SQS ARNs and IDs (main, deadletter)" value = { for k in local.additional_sqs_names : k => { - "name" = k - "main" = lookup(aws_sqs_queue.additional_cloudtrail, k, { arn : null }).arn - "deadletter" = lookup(aws_sqs_queue.additional_cloudtrail_deadletter, k, { arn : null }).arn + "name" = k + "main" = { + arn = lookup(aws_sqs_queue.additional_cloudtrail, k, { arn : null }).arn + id = lookup(aws_sqs_queue.additional_cloudtrail, k, { id : null }).id + } + "deadletter" = { + arn = lookup(aws_sqs_queue.additional_cloudtrail_deadletter, k, { arn : null }).arn + id = lookup(aws_sqs_queue.additional_cloudtrail_deadletter, k, { id : null }).id + } } } }