From 06d0085edd4a90c5448ee4fb53d08a98d4dc578f Mon Sep 17 00:00:00 2001 From: caiotavaresdito Date: Fri, 15 Oct 2021 13:35:40 -0400 Subject: [PATCH 1/3] removed name of bucket from label field --- modules/gcs/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/gcs/main.tf b/modules/gcs/main.tf index b1e9a548..7de69552 100644 --- a/modules/gcs/main.tf +++ b/modules/gcs/main.tf @@ -34,7 +34,6 @@ resource "google_storage_bucket" "bucket" { } labels = merge(var.labels, { location = lower(var.location) - name = lower(var.name) storage_class = lower(var.storage_class) }) From 910567ce5ce988d2cba2a300712445881c111e09 Mon Sep 17 00:00:00 2001 From: caiotavaresdito Date: Fri, 15 Oct 2021 13:38:23 -0400 Subject: [PATCH 2/3] removed default labels and let user pass values in --- modules/gcs/main.tf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/gcs/main.tf b/modules/gcs/main.tf index 7de69552..f9f519dd 100644 --- a/modules/gcs/main.tf +++ b/modules/gcs/main.tf @@ -32,11 +32,8 @@ resource "google_storage_bucket" "bucket" { versioning { enabled = var.versioning } - labels = merge(var.labels, { - location = lower(var.location) - storage_class = lower(var.storage_class) - }) - + + labels = var.labels dynamic "website" { for_each = var.website == null ? [] : [""] From 75b5c91c2807230750c2895cfb0c5c6b16d8b7e4 Mon Sep 17 00:00:00 2001 From: caiotavaresdito Date: Fri, 15 Oct 2021 13:39:30 -0400 Subject: [PATCH 3/3] Terraform linting --- modules/gcs/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gcs/main.tf b/modules/gcs/main.tf index f9f519dd..c3cb60db 100644 --- a/modules/gcs/main.tf +++ b/modules/gcs/main.tf @@ -29,11 +29,11 @@ resource "google_storage_bucket" "bucket" { storage_class = var.storage_class force_destroy = var.force_destroy uniform_bucket_level_access = var.uniform_bucket_level_access + labels = var.labels versioning { enabled = var.versioning } - - labels = var.labels + dynamic "website" { for_each = var.website == null ? [] : [""]