From a63be2ea6be1d520431b1a2432df27e7234f4a55 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 21 Mar 2025 21:06:51 -0400 Subject: [PATCH] nope --- README.md | 2 ++ s3.tf | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index efb515c..ea3cc8b 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ to loki. |------|---------| | [aws](#provider\_aws) | 5.89.0 | | [helm](#provider\_helm) | 2.17.0 | +| [terraform](#provider\_terraform) | n/a | ## Modules @@ -41,6 +42,7 @@ to loki. | Name | Type | |------|------| | [helm_release.loki](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | +| [terraform_data.bucket_name_validator](https://registry.terraform.io/providers/hashicorp/terraform/latest/docs/resources/data) | resource | | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_s3_bucket.s3_server_access_logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/s3_bucket) | data source | diff --git a/s3.tf b/s3.tf index c3442c9..5a83d5a 100644 --- a/s3.tf +++ b/s3.tf @@ -10,13 +10,9 @@ data "aws_s3_bucket" "s3_server_access_logs" { bucket = format("inf-logs-%v-%v", local.account_id, var.region) } -module "loki_s3" { - source = "git@github.e.it.census.gov:terraform-modules/aws-s3.git//standard?ref=tf-upgrade" - - bucket_name = local.bucket_name - access_log_bucket = data.aws_s3_bucket.s3_server_access_logs.id - - tags = var.tags +# Validate S3 bucket name length +resource "terraform_data" "bucket_name_validator" { + input = local.bucket_name lifecycle { precondition { @@ -25,3 +21,13 @@ module "loki_s3" { } } } + +module "loki_s3" { + depends_on = [terraform_data.bucket_name_validator] + source = "git@github.e.it.census.gov:terraform-modules/aws-s3.git//standard?ref=tf-upgrade" + + bucket_name = local.bucket_name + access_log_bucket = data.aws_s3_bucket.s3_server_access_logs.id + + tags = var.tags +}