From 84c7a7501317d8da01d9caa55fbf1d8d6a39a451 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 21 Mar 2025 21:00:29 -0400
Subject: [PATCH] update bucket naming

---
 prefixes.tf |  1 +
 s3.tf       | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/prefixes.tf b/prefixes.tf
index 4e2709e..e9a6127 100644
--- a/prefixes.tf
+++ b/prefixes.tf
@@ -26,6 +26,7 @@ locals {
     "log-stream"       = "lgs-"
     # EKS
     "eks"                = "eks-"
+    "eks-s3"             = "v-s3-eks-"
     "eks-user"           = "s-eks-"
     "eks-role"           = "r-eks-"
     "eks-policy"         = "p-eks-"
diff --git a/s3.tf b/s3.tf
index dd5a704..c3442c9 100644
--- a/s3.tf
+++ b/s3.tf
@@ -1,8 +1,9 @@
 data "aws_caller_identity" "current" {}
 
-## create bucket
 locals {
-  account_id = data.aws_caller_identity.current.account_id
+  account_id   = data.aws_caller_identity.current.account_id
+  bucket_name  = format("%v%v-loki-%v-%v", local.prefixes["eks-s3"], var.cluster_name, local.account_id, local.region_short)
+  region_short = join("", [for c in split("-", var.region) : substr(c, 0, 1)])
 }
 
 data "aws_s3_bucket" "s3_server_access_logs" {
@@ -12,8 +13,15 @@ data "aws_s3_bucket" "s3_server_access_logs" {
 module "loki_s3" {
   source = "git@github.e.it.census.gov:terraform-modules/aws-s3.git//standard?ref=tf-upgrade"
 
-  bucket_name       = format("%v-loki", var.cluster_name)
+  bucket_name       = local.bucket_name
   access_log_bucket = data.aws_s3_bucket.s3_server_access_logs.id
 
   tags = var.tags
+
+  lifecycle {
+    precondition {
+      condition     = length(local.bucket_name) >= 3 && length(local.bucket_name) <= 63
+      error_message = "S3 bucket name must be between 3 and 63 characters. Current name '${local.bucket_name}' is ${length(local.bucket_name)} characters."
+    }
+  }
 }