Fixes storage bucket custom_time_before/noncurrent_time_before update issue (#10601) (#18127)

[upstream:2250d3049c8ec081c0b7dc378615c32dd74704bb]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google/services/storage/resource_storage_bucket.go

@@ -1641,6 +1641,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) {

google/services/storage/resource_storage_bucket_test.go

@@ -1956,6 +1956,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"
@@ -2044,7 +2052,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 {