From 7f8e7d65968d9a8bf1fbaac09fb098b20912da5e Mon Sep 17 00:00:00 2001 From: badra001 Date: Wed, 7 Feb 2024 12:02:05 -0500 Subject: [PATCH] add s3_notification_name --- s3-config-org/README.md | 1 - s3-config-org/main.tf | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/s3-config-org/README.md b/s3-config-org/README.md index 6549862..e41855a 100644 --- a/s3-config-org/README.md +++ b/s3-config-org/README.md @@ -81,7 +81,6 @@ No modules. | [access\_log\_bucket\_prefix](#input\_access\_log\_bucket\_prefix) | Server Access Log bucket prefix, to which the Object Logging bucket name will be appended to make the target\_prefix | `string` | `"s3"` | no | | [account\_alias](#input\_account\_alias) | AWS Account Alias | `string` | `""` | no | | [account\_id](#input\_account\_id) | AWS Account ID (default will pull from current user) | `string` | `""` | no | -| [additional\_s3\_sqs\_names](#input\_additional\_s3\_sqs\_names) | List of additional SQS queues to create and subscribe to the S3 SNS topic (if enabled) | `list(string)` | `[]` | no | | [bucket\_name](#input\_bucket\_name) | Organization Config S3 bucket name | `string` | `null` | no | | [bucket\_name\_prefix](#input\_bucket\_name\_prefix) | Organization Config S3 bucket prefix, prepended to the AWS account ID and region to make the bucket name. | `string` | `"inf-org-config"` | no | | [component\_tags](#input\_component\_tags) | Additional tags for Components (s3, kms) | `map(map(string))` |
{
"kms": {},
"s3": {}
}
| no | diff --git a/s3-config-org/main.tf b/s3-config-org/main.tf index cd07299..daabbf7 100644 --- a/s3-config-org/main.tf +++ b/s3-config-org/main.tf @@ -28,8 +28,9 @@ locals { account_environment = data.aws_arn.current.partition == "aws-us-gov" ? "gov" : "ew" organization_id = data.aws_organizations_organization.org.id - bucket_name = var.bucket_name != null ? var.bucket_name : format("%v-%v-%v", var.bucket_name_prefix, local.account_id, local.region) - key_name = compact([var.key_name, var.bucket_name, var.bucket_name_prefix])[0] + bucket_name = var.bucket_name != null ? var.bucket_name : format("%v-%v-%v", var.bucket_name_prefix, local.account_id, local.region) + key_name = compact([var.key_name, var.bucket_name, var.bucket_name_prefix])[0] + s3_notification_name = var.bucket_name != null ? var.bucket_name : var.bucket_name_prefix base_tags = { "Organization" = "census:aditcio:csvd"