Fixes storage bucket custom_time_before/noncurrent_time_before update…

… issue (GoogleCloudPlatform#10601)
ma-g-22 · May 21, 2024 · a7b411d · a7b411d
1 parent eb80e51
commit a7b411d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.erb b/mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.erb
@@ -1640,6 +1640,14 @@ func resourceGCSBucketLifecycleRuleConditionHash(v interface{}) int {
 		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
 	}
 
+	if v, ok := m["custom_time_before"]; ok {
+		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
+	}
+
+	if v, ok := m["noncurrent_time_before"]; ok {
+		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
+	}
+
 	withStateV, withStateOk := m["with_state"]
 	if withStateOk {
 		switch withStateV.(string) {

diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb
@@ -1955,6 +1955,14 @@ resource "google_storage_bucket" "bucket" {
       custom_time_before = "2019-01-01"
     }
   }
+  lifecycle_rule {
+    action {
+      type = "Delete"
+    }
+    condition {
+      noncurrent_time_before = "2019-01-01"
+    }
+  }
   lifecycle_rule {
     action {
       type          = "SetStorageClass"
@@ -2043,7 +2051,15 @@ resource "google_storage_bucket" "bucket" {
       type = "Delete"
     }
     condition {
-      custom_time_before = "2019-01-01"
+      custom_time_before = "2019-01-12"
+    }
+  }
+  lifecycle_rule {
+    action {
+      type = "Delete"
+    }
+    condition {
+      noncurrent_time_before = "2019-01-12"
     }
   }
   lifecycle_rule {