feat: Use for_each instead of count to create resource (#86)

BREAKING CHANGE: The resource state locations have changed to use for_each, please see the upgrade guide for details.
terraform-google-modules · Sep 21, 2020 · af73533 · af73533
1 parent fa2ee63
commit af73533
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,8 @@ Functional examples are included in the
 | Name | Description |
 |------|-------------|
 | bucket | Bucket resource (for single use). |
-| buckets | Bucket resources. |
+| buckets | Bucket resources as list. |
+| buckets\_map | Bucket resources by name. |
 | name | Bucket name (for single use). |
 | names | Bucket names. |
 | names\_list | List of bucket names. |

diff --git a/main.tf b/main.tf
@@ -15,7 +15,10 @@
  */
 
 locals {
-  prefix = var.prefix == "" ? "" : join("-", list(var.prefix, lower(var.location), ""))
+  prefix       = var.prefix == "" ? "" : join("-", list(var.prefix, lower(var.location), ""))
+  names_set    = toset(var.names)
+  buckets_list = [for name in var.names : google_storage_bucket.buckets[name]]
+  first_bucket = local.buckets_list[0]
   folder_list = flatten([
     for bucket, folders in var.folders : [
       for folder in folders : {
@@ -27,39 +30,40 @@ locals {
 }
 
 resource "google_storage_bucket" "buckets" {
-  count         = length(var.names)
-  name          = "${local.prefix}${lower(element(var.names, count.index))}"
+  for_each = local.names_set
+
+  name          = "${local.prefix}${lower(each.value)}"
   project       = var.project_id
   location      = var.location
   storage_class = var.storage_class
-  labels        = merge(var.labels, { name = replace("${local.prefix}${lower(element(var.names, count.index))}", ".", "-") })
+  labels        = merge(var.labels, { name = replace("${local.prefix}${lower(each.value)}", ".", "-") })
   force_destroy = lookup(
     var.force_destroy,
-    lower(element(var.names, count.index)),
+    lower(each.value),
     false,
   )
   uniform_bucket_level_access = lookup(
     var.bucket_policy_only,
-    lower(element(var.names, count.index)),
+    lower(each.value),
     true,
   )
   versioning {
     enabled = lookup(
       var.versioning,
-      lower(element(var.names, count.index)),
+      lower(each.value),
       false,
     )
   }
   # Having a permanent encryption block with default_kms_key_name = "" works but results in terraform applying a change every run
   # There is no enabled = false attribute available to ask terraform to ignore the block
   dynamic "encryption" {
     # If an encryption key name is set for this bucket name -> Create a single encryption block
-    for_each = trimspace(lookup(var.encryption_key_names, lower(element(var.names, count.index)), "")) != "" ? [true] : []
+    for_each = trimspace(lookup(var.encryption_key_names, lower(each.value), "")) != "" ? [true] : []
     content {
       default_kms_key_name = trimspace(
         lookup(
           var.encryption_key_names,
-          lower(element(var.names, count.index)),
+          lower(each.value),
           "Error retrieving kms key name", # Should be unreachable due to the for_each check
           # Omitting default is deprecated & can help show if there was a bug
           # https://www.terraform.io/docs/configuration/functions/lookup.html
@@ -68,7 +72,7 @@ resource "google_storage_bucket" "buckets" {
     }
   }
   dynamic "cors" {
-    for_each = lookup(var.cors, element(var.names, count.index), {}) != {} ? { v = lookup(var.cors, element(var.names, count.index)) } : {}
+    for_each = lookup(var.cors, each.value, {}) != {} ? { v = lookup(var.cors, each.value) } : {}
     content {
       origin          = lookup(cors.value, "origin", null)
       method          = lookup(cors.value, "method", null)
@@ -77,7 +81,7 @@ resource "google_storage_bucket" "buckets" {
     }
   }
   dynamic "website" {
-    for_each = lookup(var.website, element(var.names, count.index), {}) != {} ? { v = lookup(var.website, element(var.names, count.index)) } : {}
+    for_each = lookup(var.website, each.value, {}) != {} ? { v = lookup(var.website, each.value) } : {}
     content {
       main_page_suffix = lookup(website.value, "main_page_suffix", null)
       not_found_page   = lookup(website.value, "not_found_page", null)
@@ -105,53 +109,53 @@ resource "google_storage_bucket" "buckets" {
 }
 
 resource "google_storage_bucket_iam_binding" "admins" {
-  count  = var.set_admin_roles ? length(var.names) : 0
-  bucket = element(google_storage_bucket.buckets.*.name, count.index)
-  role   = "roles/storage.objectAdmin"
+  for_each = var.set_admin_roles ? local.names_set : []
+  bucket   = google_storage_bucket.buckets[each.value].name
+  role     = "roles/storage.objectAdmin"
   members = compact(
     concat(
       var.admins,
       split(
         ",",
-        lookup(var.bucket_admins, element(var.names, count.index), ""),
+        lookup(var.bucket_admins, each.value, ""),
       ),
     ),
   )
 }
 
 resource "google_storage_bucket_iam_binding" "creators" {
-  count  = var.set_creator_roles ? length(var.names) : 0
-  bucket = element(google_storage_bucket.buckets.*.name, count.index)
-  role   = "roles/storage.objectCreator"
+  for_each = var.set_creator_roles ? local.names_set : toset([])
+  bucket   = google_storage_bucket.buckets[each.value].name
+  role     = "roles/storage.objectCreator"
   members = compact(
     concat(
       var.creators,
       split(
         ",",
-        lookup(var.bucket_creators, element(var.names, count.index), ""),
+        lookup(var.bucket_creators, each.value, ""),
       ),
     ),
   )
 }
 
 resource "google_storage_bucket_iam_binding" "viewers" {
-  count  = var.set_viewer_roles ? length(var.names) : 0
-  bucket = element(google_storage_bucket.buckets.*.name, count.index)
-  role   = "roles/storage.objectViewer"
+  for_each = var.set_viewer_roles ? local.names_set : toset([])
+  bucket   = google_storage_bucket.buckets[each.value].name
+  role     = "roles/storage.objectViewer"
   members = compact(
     concat(
       var.viewers,
       split(
         ",",
-        lookup(var.bucket_viewers, element(var.names, count.index), ""),
+        lookup(var.bucket_viewers, each.value, ""),
       ),
     ),
   )
 }
 
 resource "google_storage_bucket_object" "folders" {
   for_each = { for obj in local.folder_list : "${obj.bucket}_${obj.folder}" => obj }
-  bucket   = element(google_storage_bucket.buckets.*.name, index(var.names, each.value.bucket))
+  bucket   = google_storage_bucket.buckets[each.value.bucket].name
   name     = "${each.value.folder}/" # Declaring an object with a trailing '/' creates a directory
   content  = "foo"                   # Note that the content string isn't actually used, but is only there since the resource requires it
 }
diff --git a/outputs.tf b/outputs.tf
@@ -16,40 +16,49 @@
 
 output "bucket" {
   description = "Bucket resource (for single use)."
-  value       = google_storage_bucket.buckets[0]
+  value       = local.first_bucket
 }
 
 output "name" {
   description = "Bucket name (for single use)."
-  value       = google_storage_bucket.buckets[0].name
+  value       = local.first_bucket.name
 }
 
 output "url" {
   description = "Bucket URL (for single use)."
-  value       = google_storage_bucket.buckets[0].url
+  value       = local.first_bucket.url
 }
 
 output "buckets" {
-  description = "Bucket resources."
+  description = "Bucket resources as list."
+  value       = local.buckets_list
+}
+
+output "buckets_map" {
+  description = "Bucket resources by name."
   value       = google_storage_bucket.buckets
 }
 
 output "names" {
   description = "Bucket names."
-  value       = zipmap(var.names, slice(google_storage_bucket.buckets[*].name, 0, length(var.names)))
+  value = { for name, bucket in google_storage_bucket.buckets :
+    name => bucket.name
+  }
 }
 
 output "urls" {
   description = "Bucket URLs."
-  value       = zipmap(var.names, slice(google_storage_bucket.buckets[*].url, 0, length(var.names)))
+  value = { for name, bucket in google_storage_bucket.buckets :
+    name => bucket.url
+  }
 }
 
 output "names_list" {
   description = "List of bucket names."
-  value       = google_storage_bucket.buckets[*].name
+  value       = local.buckets_list[*].name
 }
 
 output "urls_list" {
   description = "List of bucket URLs."
-  value       = google_storage_bucket.buckets[*].url
+  value       = local.buckets_list[*].url
 }