artifactregistry: fix invalid cleanup policy in plan (#14451) (#10324)

[upstream:c1e59dd6e81fb80731eb644ab96314da1ad6aa55]

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

Author: modular-magician

.changelog/14451.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+artifactregistry: fixed an issue where changes to `cleanup_policies` were not being applied correctly in `google_artifact_registry_repository` resource
+```

google-beta/services/artifactregistry/resource_artifact_registry_repository.go

@@ -94,39 +94,71 @@ func parseDurationAsSeconds(v string) (int, bool) {
 
 // Like tpgresource.DurationDiffSuppress, but supports 'd'
 func durationDiffSuppress(k, oldr, newr string, d *schema.ResourceData) bool {
-	o, n := d.GetChange(k)
-	old, ok := o.(string)
+	oldSeconds, ok := parseDurationAsSeconds(oldr)
 	if !ok {
 		return false
 	}
-	new, ok := n.(string)
-	if !ok {
-		return false
-	}
-	if old == new {
-		return true
-	}
-	oldSeconds, ok := parseDurationAsSeconds(old)
-	if !ok {
-		return false
-	}
-	newSeconds, ok := parseDurationAsSeconds(new)
+	newSeconds, ok := parseDurationAsSeconds(newr)
 	if !ok {
 		return false
 	}
 	return oldSeconds == newSeconds
 }
 
 func mapHashID(v any) int {
-	obj, ok := v.(map[string]any)
+	replaceNestedValue(v, []string{"condition", "older_than"}, expandDuration)
+	replaceNestedValue(v, []string{"condition", "newer_than"}, expandDuration)
+	return schema.HashString(fmt.Sprintf("%v", v))
+}
+
+func expandDuration(v any) (any, bool) {
+	if val, ok := v.(string); ok {
+		if secs, ok := parseDurationAsSeconds(val); ok {
+			return fmt.Sprintf("%ds", secs), true
+		}
+	}
+	return nil, false
+
+}
+
+// Replace a value in a schema object, if it exists.
+// Nested maps follow the pattern map[string]any -> [1]any -> map[string]any
+func replaceNestedValue(obj any, keys []string, replaceFunc func(any) (any, bool)) {
+	if len(keys) == 0 {
+		return
+	}
+	next := obj
+	for _, key := range keys[:len(keys)-1] {
+		nextMap, ok := next.(map[string]any)
+		if !ok {
+			return
+		}
+		arrObj, ok := nextMap[key]
+		if !ok {
+			return
+		}
+		arr, ok := arrObj.([]any)
+		if !ok {
+			return
+		}
+		if len(arr) != 1 {
+			return
+		}
+		next = arr[0]
+	}
+	lastMap, ok := next.(map[string]any)
 	if !ok {
-		return 0
+		return
 	}
-	s, ok := obj["id"].(string)
+	lastKey := keys[len(keys)-1]
+	last, ok := lastMap[lastKey]
 	if !ok {
-		return 0
+		return
+	}
+	result, ok := replaceFunc(last)
+	if ok {
+		lastMap[lastKey] = result
 	}
-	return schema.HashString(s)
 }
 
 func isDefaultEnum(val any) bool {

google-beta/services/artifactregistry/resource_artifact_registry_repository_test.go

@@ -154,6 +154,74 @@ func TestAccArtifactRegistryRepository_kfp(t *testing.T) {
 	})
 }
 
+func TestAccArtifactRegistryRepository_cleanup(t *testing.T) {
+	t.Parallel()
+
+	repositoryID := fmt.Sprintf("tf-test-%d", acctest.RandInt(t))
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckArtifactRegistryRepositoryDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccArtifactRegistryRepository_cleanup(repositoryID),
+			},
+			{
+				ResourceName:      "google_artifact_registry_repository.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config:             testAccArtifactRegistryRepository_cleanup2(repositoryID),
+				PlanOnly:           true,
+				ExpectNonEmptyPlan: true,
+			},
+			{
+				Config: testAccArtifactRegistryRepository_cleanup2(repositoryID),
+			},
+		},
+	})
+}
+
+func testAccArtifactRegistryRepository_cleanup(repositoryID string) string {
+	return fmt.Sprintf(`
+resource "google_artifact_registry_repository" "test" {
+  repository_id = "%s"
+  location = "us-central1"
+  description = "cleanup with non-second time"
+  format = "DOCKER"
+
+  cleanup_policies {
+    id = "delete"
+    action = "DELETE"
+    condition {
+      older_than = "7d"
+    }
+  }
+}
+`, repositoryID)
+}
+
+func testAccArtifactRegistryRepository_cleanup2(repositoryID string) string {
+	return fmt.Sprintf(`
+resource "google_artifact_registry_repository" "test" {
+  repository_id = "%s"
+  location = "us-central1"
+  description = "cleanup with non-second time"
+  format = "DOCKER"
+
+  cleanup_policies {
+    id = "delete"
+    action = "DELETE"
+    condition {
+      older_than = "10d"
+    }
+  }
+}
+`, repositoryID)
+}
+
 func testAccArtifactRegistryRepository_update(repositoryID string) string {
 	return fmt.Sprintf(`
 resource "google_artifact_registry_repository" "test" {