Merge pull request #1126 from jfrog/GH-1122-fix-unable-to-set-last-downloaded-before-in-months-to-zero

Relax validations for search_criteria attributes for cleanup policy resource

Author: alexhung

CHANGELOG.md

@@ -1,8 +1,9 @@
-## 12.4.1 (November 11, 2024). Tested on Artifactory 7.98.8 with Terraform 1.9.8 and OpenTofu 1.8.5
+## 12.4.1 (November 12, 2024). Tested on Artifactory 7.98.8 with Terraform 1.9.8 and OpenTofu 1.8.5
 
 BUG FIXES:
 
 * resource/artifactory_build_webhook, resource/artifactory_release_bundle_webhook, resource/artifactory_release_bundle_v2_webhook, resource/artifactory_artifact_webhook, resource/artifactory_artifact_property_webhook, resource/artifactory_docker_webhook, resource/artifactory_build_custom_webhook, resource/artifactory_release_bundle_custom_webhook, resource/artifactory_release_bundle_v2_custom_webhook, resource/artifactory_artifact_custom_webhook, resource/artifactory_artifact_property_custom_webhook, resource/artifactory_docker_custom_webhook, resource/artifactory_ldap_group_setting_v2, resource/artifactory_repository_layout, resource/artifactory_release_bundle_v2, resource/artifactory_vault_configuration, resource/artifactory_user, resource/artifactory_managed_user, resource/artifactory_unmanaged_user: Fix attribute validation not working for unknown value (e.g. when resource is used in a module). Issue: [#1120](https://github.com/jfrog/terraform-provider-artifactory/issues/1120) PR: [#1123](https://github.com/jfrog/terraform-provider-artifactory/pull/1123)
+* resource/artifactory_package_cleanup_policy: Relax validations to allow 0 for `created_before_in_months` and `last_downloaded_before_in_months` attributes. Add validation run to ensure both can't be 0 at the same time. Issue: [#1122](https://github.com/jfrog/terraform-provider-artifactory/issues/1122) PR: [#1126](https://github.com/jfrog/terraform-provider-artifactory/pull/1126)
 
 ## 12.4.0 (November 4, 2024). Tested on Artifactory 7.98.7 with Terraform 1.9.8 and OpenTofu 1.8.5
 

pkg/artifactory/resource/configuration/resource_artifactory_package_cleanup_policy.go

@@ -450,7 +450,7 @@ var cleanupPolicySchemaV1 = lo.Assign(
 						int64validator.ConflictsWith(
 							path.MatchRelative().AtParent().AtName("keep_last_n_versions"),
 						),
-						int64validator.AtLeast(1),
+						int64validator.AtLeast(0),
 					},
 					MarkdownDescription: "Remove packages based on when they were created. For example, remove packages that were created more than a year ago. The default value is to remove packages created more than 2 years ago.",
 				},
@@ -463,7 +463,7 @@ var cleanupPolicySchemaV1 = lo.Assign(
 						int64validator.ConflictsWith(
 							path.MatchRelative().AtParent().AtName("keep_last_n_versions"),
 						),
-						int64validator.AtLeast(1),
+						int64validator.AtLeast(0),
 					},
 					MarkdownDescription: "Removes packages based on when they were last downloaded. For example, removes packages that were not downloaded in the past year. The default value is to remove packages that were downloaded more than 2 years ago.\n\n" +
 						"~>If a package was never downloaded, the policy will remove it based only on the age-condition (`created_before_in_months`).\n\n" +
@@ -487,6 +487,41 @@ var cleanupPolicySchemaV1 = lo.Assign(
 	},
 )
 
+func (r PackageCleanupPolicyResource) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
+	var data PackageCleanupPolicyResourceModelV1
+
+	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
+
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	// If search_criteria is not configured, return without warning.
+	if data.SearchCriteria.IsNull() || data.SearchCriteria.IsUnknown() {
+		return
+	}
+
+	searchCriteriaAttrs := data.SearchCriteria.Attributes()
+	createdBeforeInMonths := searchCriteriaAttrs["created_before_in_months"].(types.Int64)
+	lastDownloadedBeforeInMonths := searchCriteriaAttrs["last_downloaded_before_in_months"].(types.Int64)
+
+	if createdBeforeInMonths.IsNull() || createdBeforeInMonths.IsUnknown() {
+		return
+	}
+
+	if lastDownloadedBeforeInMonths.IsNull() || lastDownloadedBeforeInMonths.IsUnknown() {
+		return
+	}
+
+	if createdBeforeInMonths.ValueInt64() == 0 && lastDownloadedBeforeInMonths.ValueInt64() == 0 {
+		resp.Diagnostics.AddAttributeError(
+			path.Root("search_criteria").AtName("created_before_in_months"),
+			"Invalid Attribute Configuration",
+			"Both created_before_in_months and last_downloaded_before_in_months cannot be zero at the same time.",
+		)
+	}
+}
+
 func (r *PackageCleanupPolicyResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
 		Attributes: cleanupPolicySchemaV1,

pkg/artifactory/resource/configuration/resource_artifactory_package_cleanup_policy_test.go

@@ -162,7 +162,7 @@ func TestAccPackageCleanupPolicy_invalid_key(t *testing.T) {
 				skip_trashcan = false
 				
 				search_criteria = {
-					repos = []
+					repos = ["**"]
 					package_types = ["docker"]
 					include_all_projects = true
 					included_packages = ["**"]
@@ -195,6 +195,62 @@ func TestAccPackageCleanupPolicy_invalid_key(t *testing.T) {
 	}
 }
 
+func TestAccPackageCleanupPolicy_invalid_conditions(t *testing.T) {
+	client := acctest.GetTestResty(t)
+	version, err := util.GetArtifactoryVersion(client)
+	if err != nil {
+		t.Fatal(err)
+	}
+	valid, err := util.CheckVersion(version, "7.90.1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !valid {
+		t.Skipf("Artifactory version %s is earlier than 7.90.1", version)
+	}
+
+	_, _, policyName := testutil.MkNames("test-package-cleanup-policy", "artifactory_package_cleanup_policy")
+
+	temp := `
+	resource "artifactory_package_cleanup_policy" "{{ .policyName }}" {
+		key = "{{ .policyName }}"
+		description = "Test policy"
+		cron_expression = "0 0 2 ? * MON-SAT *"
+		duration_in_minutes = 60
+		enabled = true
+		skip_trashcan = false
+		
+		search_criteria = {
+			repos = ["**"]
+			package_types = ["docker"]
+			include_all_projects = true
+			included_packages = ["**"]
+			excluded_packages = ["com/jfrog/latest"]
+			created_before_in_months = 0
+			last_downloaded_before_in_months = 0
+		}
+	}`
+
+	config := util.ExecuteTemplate(
+		policyName,
+		temp,
+		map[string]string{
+			"policyName": policyName,
+		},
+	)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config:      config,
+				ExpectError: regexp.MustCompile(".*Both created_before_in_months and last_downloaded_before_in_months cannot be\n.*zero at the same time.*"),
+			},
+		},
+	})
+}
+
 func TestAccPackageCleanupPolicy_full(t *testing.T) {
 	client := acctest.GetTestResty(t)
 	version, err := util.GetArtifactoryVersion(client)
@@ -247,7 +303,7 @@ func TestAccPackageCleanupPolicy_full(t *testing.T) {
 			included_projects = [project.myproject.key]
 			included_packages = ["**"]
 			excluded_packages = ["com/jfrog/latest"]
-			created_before_in_months = 1
+			created_before_in_months = 0
 			last_downloaded_before_in_months = 6
 		}
 	}`
@@ -274,7 +330,7 @@ func TestAccPackageCleanupPolicy_full(t *testing.T) {
 			excluded_packages = ["com/jfrog/latest"]
 			include_all_projects = true
 			created_before_in_months = 12
-			last_downloaded_before_in_months = 24
+			last_downloaded_before_in_months = 0
 		}
 	}`
 
@@ -323,7 +379,7 @@ func TestAccPackageCleanupPolicy_full(t *testing.T) {
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.included_packages.0", "**"),
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.excluded_packages.#", "1"),
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.excluded_packages.0", "com/jfrog/latest"),
-					resource.TestCheckResourceAttr(fqrn, "search_criteria.created_before_in_months", "1"),
+					resource.TestCheckResourceAttr(fqrn, "search_criteria.created_before_in_months", "0"),
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.last_downloaded_before_in_months", "6"),
 				),
 			},
@@ -349,7 +405,7 @@ func TestAccPackageCleanupPolicy_full(t *testing.T) {
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.excluded_packages.#", "1"),
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.excluded_packages.0", "com/jfrog/latest"),
 					resource.TestCheckResourceAttr(fqrn, "search_criteria.created_before_in_months", "12"),
-					resource.TestCheckResourceAttr(fqrn, "search_criteria.last_downloaded_before_in_months", "24"),
+					resource.TestCheckResourceAttr(fqrn, "search_criteria.last_downloaded_before_in_months", "0"),
 				),
 			},
 			{