Skip to content

Commit 639e72a

Browse files
Generalise S3 module
1 parent aec6d24 commit 639e72a

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

modules/deployment-helper/locals.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
locals {
2+
bucket_prefix = "${lower(var.central_account_resource_name_prefix)}tf-state-"
3+
24
terraform_state_bucket_name = (
35
var.terraform_state_bucket_name != "" ? var.terraform_state_bucket_name :
46
module.tf_state_bucket[0].s3_bucket_name

modules/deployment-helper/s3.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ module "tf_state_bucket" {
22
source = "../s3"
33
count = var.terraform_state_bucket_name == "" ? 1 : 0
44

5-
central_account_resource_name_prefix = var.central_account_resource_name_prefix
5+
bucket_prefix = local.bucket_prefix
66
}

modules/s3/locals.tf

Lines changed: 0 additions & 3 deletions
This file was deleted.

modules/s3/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "aws_s3_bucket" "bucket" {
2-
bucket_prefix = local.bucket_prefix
2+
bucket_prefix = var.bucket_prefix
33
force_destroy = var.force_destroy
44

55
tags = var.tags

modules/s3/variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
variable "central_account_resource_name_prefix" {
1+
variable "bucket_prefix" {
22
type = string
3-
description = "Central account resource name prefix, e.g. aws-backup-"
3+
description = "S3 Terraform state bucket name prefix, e.g. aws-backup-tf-state-"
44

55
validation {
6-
condition = length(var.central_account_resource_name_prefix) <= 28
7-
error_message = "central_account_resource_name_prefix must be less than or equal to 28 characters"
6+
condition = length(var.bucket_prefix) <= 37
7+
error_message = "bucket name prefix must be less than or equal to 37 characters"
88
}
99
}
1010

0 commit comments

Comments
 (0)