remove region attribute

clouddrove · Jan 5, 2022 · dfb0ac4 · dfb0ac4
1 parent 92acbe3
commit dfb0ac4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/main.tf b/main.tf
@@ -23,7 +23,6 @@ resource "aws_s3_bucket" "s3_default" {
 
   bucket        = module.labels.id
   force_destroy = var.force_destroy
-  region        = var.region
   acl           = var.acl
 
   versioning {
@@ -86,7 +85,6 @@ resource "aws_s3_bucket" "s3_website" {
 
   bucket        = module.labels.id
   force_destroy = var.force_destroy
-  region        = var.region
   acl           = var.acl
 
   versioning {
@@ -154,7 +152,6 @@ resource "aws_s3_bucket" "s3_logging" {
 
   bucket        = module.labels.id
   force_destroy = var.force_destroy
-  region        = var.region
   acl           = var.acl
 
   versioning {
@@ -220,7 +217,6 @@ resource "aws_s3_bucket" "s3_encryption" {
 
   bucket        = module.labels.id
   force_destroy = var.force_destroy
-  region        = var.region
   acl           = var.acl
 
   versioning {

diff --git a/outputs.tf b/outputs.tf
@@ -2,19 +2,19 @@
 # Description : Terraform module to create default S3 bucket with logging and encryption
 #               type specific features.
 output "id" {
-  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)))
+  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)))
   description = "The ID of the s3 bucket."
 
 }
 
 output "arn" {
-  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)))
+  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)))
   description = "The ARN of the s3 bucket."
 
 }
 
 output "bucket_domain_name" {
-  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)))
+  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)))
   description = "The Domain of the s3 bucket."
 
 }

diff --git a/variables.tf b/variables.tf
@@ -19,13 +19,13 @@ variable "environment" {
 }
 
 variable "label_order" {
-  type        = list
+  type        = list(any)
   default     = []
   description = "Label order, e.g. `name`,`application`."
 }
 
 variable "attributes" {
-  type        = list
+  type        = list(any)
   default     = []
   description = "Additional attributes (e.g. `1`)."
 }
@@ -37,7 +37,7 @@ variable "delimiter" {
 }
 
 variable "tags" {
-  type        = map
+  type        = map(any)
   default     = {}
   description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)."
 }