Skip to content

Commit dfb0ac4

Browse files
committed
remove region attribute
1 parent 92acbe3 commit dfb0ac4

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

main.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ resource "aws_s3_bucket" "s3_default" {
2323

2424
bucket = module.labels.id
2525
force_destroy = var.force_destroy
26-
region = var.region
2726
acl = var.acl
2827

2928
versioning {
@@ -86,7 +85,6 @@ resource "aws_s3_bucket" "s3_website" {
8685

8786
bucket = module.labels.id
8887
force_destroy = var.force_destroy
89-
region = var.region
9088
acl = var.acl
9189

9290
versioning {
@@ -154,7 +152,6 @@ resource "aws_s3_bucket" "s3_logging" {
154152

155153
bucket = module.labels.id
156154
force_destroy = var.force_destroy
157-
region = var.region
158155
acl = var.acl
159156

160157
versioning {
@@ -220,7 +217,6 @@ resource "aws_s3_bucket" "s3_encryption" {
220217

221218
bucket = module.labels.id
222219
force_destroy = var.force_destroy
223-
region = var.region
224220
acl = var.acl
225221

226222
versioning {

outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
# Description : Terraform module to create default S3 bucket with logging and encryption
33
# type specific features.
44
output "id" {
5-
value = var.bucket_enabled ? join("", aws_s3_bucket.s3_default.*.id) : (var.website_hosting_bucket ? join("", aws_s3_bucket.s3_website.*.id) : (var.bucket_logging_enabled ? join("", aws_s3_bucket.s3_logging.*.id) : join("", aws_s3_bucket.s3_encryption.*.id)))
5+
value = var.bucket_enabled ? join("", aws_s3_bucket.s3_default.*.id) : (var.website_hosting_bucket ? join("", aws_s3_bucket.s3_website.*.id) : (var.bucket_logging_enabled ? join("", aws_s3_bucket.s3_logging.*.id) : join("", aws_s3_bucket.s3_encryption.*.id)))
66
description = "The ID of the s3 bucket."
77

88
}
99

1010
output "arn" {
11-
value = var.bucket_enabled ? join("", aws_s3_bucket.s3_default.*.arn) : (var.website_hosting_bucket ? join("", aws_s3_bucket.s3_website.*.arn) : (var.bucket_logging_enabled ? join("", aws_s3_bucket.s3_logging.*.arn) : join("", aws_s3_bucket.s3_encryption.*.arn)))
11+
value = var.bucket_enabled ? join("", aws_s3_bucket.s3_default.*.arn) : (var.website_hosting_bucket ? join("", aws_s3_bucket.s3_website.*.arn) : (var.bucket_logging_enabled ? join("", aws_s3_bucket.s3_logging.*.arn) : join("", aws_s3_bucket.s3_encryption.*.arn)))
1212
description = "The ARN of the s3 bucket."
1313

1414
}
1515

1616
output "bucket_domain_name" {
17-
value = var.bucket_enabled ? join("", aws_s3_bucket.s3_default.*.bucket_domain_name) : (var.website_hosting_bucket ? join("", aws_s3_bucket.s3_website.*.bucket_domain_name) : (var.bucket_logging_enabled ? join("", aws_s3_bucket.s3_logging.*.bucket_domain_name) : join("", aws_s3_bucket.s3_encryption.*.bucket_domain_name)))
17+
value = var.bucket_enabled ? join("", aws_s3_bucket.s3_default.*.bucket_domain_name) : (var.website_hosting_bucket ? join("", aws_s3_bucket.s3_website.*.bucket_domain_name) : (var.bucket_logging_enabled ? join("", aws_s3_bucket.s3_logging.*.bucket_domain_name) : join("", aws_s3_bucket.s3_encryption.*.bucket_domain_name)))
1818
description = "The Domain of the s3 bucket."
1919

2020
}

variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ variable "environment" {
1919
}
2020

2121
variable "label_order" {
22-
type = list
22+
type = list(any)
2323
default = []
2424
description = "Label order, e.g. `name`,`application`."
2525
}
2626

2727
variable "attributes" {
28-
type = list
28+
type = list(any)
2929
default = []
3030
description = "Additional attributes (e.g. `1`)."
3131
}
@@ -37,7 +37,7 @@ variable "delimiter" {
3737
}
3838

3939
variable "tags" {
40-
type = map
40+
type = map(any)
4141
default = {}
4242
description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)."
4343
}

0 commit comments

Comments
 (0)