fix: Fix deprecation of is_live lifecycle rule (#91)

terraform-google-modules · Sep 28, 2020 · f73041b · f73041b
1 parent af73533
commit f73041b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/main.tf b/main.tf
@@ -98,8 +98,7 @@ resource "google_storage_bucket" "buckets" {
       condition {
         age                   = lookup(lifecycle_rule.value.condition, "age", null)
         created_before        = lookup(lifecycle_rule.value.condition, "created_before", null)
-        with_state            = lookup(lifecycle_rule.value.condition, "with_state", null)
-        is_live               = lookup(lifecycle_rule.value.condition, "is_live", null)
+        with_state            = lookup(lifecycle_rule.value.condition, "with_state", lookup(lifecycle_rule.value.condition, "is_live", false) ? "LIVE" : null)
         matches_storage_class = contains(keys(lifecycle_rule.value.condition), "matches_storage_class") ? split(",", lifecycle_rule.value.condition["matches_storage_class"]) : null
         num_newer_versions    = lookup(lifecycle_rule.value.condition, "num_newer_versions", null)
       }

diff --git a/modules/simple_bucket/main.tf b/modules/simple_bucket/main.tf
@@ -52,8 +52,7 @@ resource "google_storage_bucket" "bucket" {
       condition {
         age                   = lookup(lifecycle_rule.value.condition, "age", null)
         created_before        = lookup(lifecycle_rule.value.condition, "created_before", null)
-        is_live               = lookup(lifecycle_rule.value.condition, "is_live", null)
-        with_state            = lookup(lifecycle_rule.value.condition, "with_state", null)
+        with_state            = lookup(lifecycle_rule.value.condition, "with_state", lookup(lifecycle_rule.value.condition, "is_live", false) ? "LIVE" : null)
         matches_storage_class = lookup(lifecycle_rule.value.condition, "matches_storage_class", null)
         num_newer_versions    = lookup(lifecycle_rule.value.condition, "num_newer_versions", null)
       }