Fix storage bucket days_since_custom_time update issue (#5558) (#3936)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Dec 20, 2021 · 1d5bf3b · 1d5bf3b
1 parent 693d0fd
commit 1d5bf3b
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 21 deletions.
diff --git a/.changelog/5558.txt b/.changelog/5558.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+storage: fixed a bug where `google_storage_bucket.lifecycle_rule.condition.days_since_custom_time` was not updating.
+```
diff --git a/google-beta/resource_storage_bucket.go b/google-beta/resource_storage_bucket.go
@@ -1325,6 +1325,10 @@ func resourceGCSBucketLifecycleRuleConditionHash(v interface{}) int {
 		buf.WriteString(fmt.Sprintf("%d-", v.(int)))
 	}
 
+	if v, ok := m["days_since_custom_time"]; ok {
+		buf.WriteString(fmt.Sprintf("%d-", v.(int)))
+	}
+
 	if v, ok := m["days_since_noncurrent_time"]; ok {
 		buf.WriteString(fmt.Sprintf("%d-", v.(int)))
 	}

diff --git a/google-beta/resource_storage_bucket_test.go b/google-beta/resource_storage_bucket_test.go
@@ -150,6 +150,15 @@ func TestAccStorageBucket_lifecycleRulesMultiple(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"force_destroy"},
 			},
+			{
+				Config: testAccStorageBucket_lifecycleRulesMultiple_update(bucketName),
+			},
+			{
+				ResourceName:            "google_storage_bucket.bucket",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"force_destroy"},
+			},
 		},
 	})
 }
@@ -1329,7 +1338,72 @@ resource "google_storage_bucket" "bucket" {
       type = "Delete"
     }
     condition {
-	  matches_storage_class = []
+      matches_storage_class = []
+      age = 10
+    }
+  }
+  lifecycle_rule {
+    action {
+      type = "Delete"
+    }
+    condition {
+      custom_time_before = "2019-01-01"
+    }
+  }
+  lifecycle_rule {
+    action {
+      type          = "SetStorageClass"
+      storage_class = "NEARLINE"
+    }
+    condition {
+      created_before = "2019-01-01"
+      days_since_custom_time = 3
+    }
+  }
+  lifecycle_rule {
+    action {
+      type          = "SetStorageClass"
+      storage_class = "NEARLINE"
+    }
+    condition {
+      num_newer_versions = 10
+    }
+  }
+  lifecycle_rule {
+    action {
+      type          = "SetStorageClass"
+      storage_class = "ARCHIVE"
+    }
+    condition {
+      with_state = "ARCHIVED"
+    }
+  }
+}
+`, bucketName)
+}
+
+func testAccStorageBucket_lifecycleRulesMultiple_update(bucketName string) string {
+	return fmt.Sprintf(`
+resource "google_storage_bucket" "bucket" {
+  name          = "%s"
+  location      = "US"
+  force_destroy = true
+  lifecycle_rule {
+    action {
+      type          = "SetStorageClass"
+      storage_class = "NEARLINE"
+    }
+    condition {
+      matches_storage_class = ["COLDLINE"]
+      age                   = 2
+    }
+  }
+  lifecycle_rule {
+    action {
+      type = "Delete"
+    }
+    condition {
+      matches_storage_class = []
       age = 10
     }
   }
@@ -1347,8 +1421,8 @@ resource "google_storage_bucket" "bucket" {
       storage_class = "NEARLINE"
     }
     condition {
-	  created_before = "2019-01-01"
-	  days_since_custom_time = 3
+      created_before = "2019-01-01"
+      days_since_custom_time = 5
     }
   }
   lifecycle_rule {

diff --git a/website/docs/r/os_config_os_policy_assignment.html.markdown b/website/docs/r/os_config_os_policy_assignment.html.markdown
@@ -703,24 +703,6 @@ The `disruption_budget` block supports:
   (Optional)
   Specifies the relative value defined as a percentage, which will be multiplied by a reference value.
 
-The `source` block supports:
-
-* `allow_insecure` -
-  (Optional)
-  Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified.
-
-* `gcs` -
-  (Optional)
-  A Cloud Storage object.
-
-* `local_path` -
-  (Optional)
-  A local path within the VM to use.
-
-* `remote` -
-  (Optional)
-  A generic remote file.
-
 - - -
 
 * `description` -
@@ -970,6 +952,24 @@ The `zypper` block supports:
   (Required)
   Required. A one word, unique name for this repository. This is the `repo id` in the zypper config file and also the `display_name` if `display_name` is omitted. This id is also used as the unique identifier when checking for GuestPolicy conflicts.
 
+The `file` block supports:
+
+* `allow_insecure` -
+  (Optional)
+  Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified.
+
+* `gcs` -
+  (Optional)
+  A Cloud Storage object.
+
+* `local_path` -
+  (Optional)
+  A local path within the VM to use.
+
+* `remote` -
+  (Optional)
+  A generic remote file.
+
 The `gcs` block supports:
 
 * `bucket` -