diff --git a/cloudtrail/README.md b/cloudtrail/README.md
index 6d9f4cd..c0c0db9 100644
--- a/cloudtrail/README.md
+++ b/cloudtrail/README.md
@@ -223,8 +223,11 @@ No modules.
| Name | Description |
|------|-------------|
+| [additional\_s3\_sqs\_info](#output\_additional\_s3\_sqs\_info) | Additional S3 SQS ARNs and IDs (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 |
+| [s3\_sns\_arn](#output\_s3\_sns\_arn) | S3 SNS ARN |
+| [s3\_sqs\_info](#output\_s3\_sqs\_info) | Main S3 SQS ARNs and IDs (main, deadletter) |
| [sns\_arn](#output\_sns\_arn) | SNS ARN |
| [sqs\_info](#output\_sqs\_info) | Main SQS ARNs and IDs (main, deadletter) |
diff --git a/cloudtrail/outputs.tf b/cloudtrail/outputs.tf
index bdaed8f..618975a 100644
--- a/cloudtrail/outputs.tf
+++ b/cloudtrail/outputs.tf
@@ -41,3 +41,37 @@ output "sns_arn" {
description = "SNS ARN"
value = var.enable_sns ? aws_sns_topic.cloudtrail[0].arn : null
}
+
+output "s3_sqs_info" {
+ description = "Main S3 SQS ARNs and IDs (main, deadletter)"
+ value = {
+ "main" = {
+ arn = var.enable_s3_sqs ? aws_sqs_queue.cloudtrail_s3[0].arn : null
+ id = var.enable_s3_sqs ? aws_sqs_queue.cloudtrail_s3[0].id : null
+ }
+ "deadletter" = {
+ arn = var.enable_s3_sqs ? aws_sqs_queue.cloudtrail_s3_deadletter[0].arn : null
+ id = var.enable_s3_sqs ? aws_sqs_queue.cloudtrail_s3_deadletter[0].id : null
+ }
+ }
+}
+
+output "additional_s3_sqs_info" {
+ description = "Additional S3 SQS ARNs and IDs (main, deadletter)"
+ value = { for k in local.additional_s3_sqs_names : k => {
+ "name" = k
+ "main" = {
+ arn = lookup(aws_sqs_queue.additional_cloudtrail_s3, k, { arn : null }).arn
+ id = lookup(aws_sqs_queue.additional_cloudtrail_s3, k, { id : null }).id
+ }
+ "deadletter" = {
+ arn = lookup(aws_sqs_queue.additional_cloudtrail_s3_deadletter, k, { arn : null }).arn
+ id = lookup(aws_sqs_queue.additional_cloudtrail_s3_deadletter, k, { id : null }).id
+ }
+ } }
+}
+
+output "s3_sns_arn" {
+ description = "S3 SNS ARN"
+ value = var.enable_s3_sns ? aws_sns_topic.cloudtrail_s3[0].arn : null
+}