Merge pull request #1414 from jfrog/JTFPR-1406

Preserve null package cleanup cron expression(#1408)

Author: srinivasgowda097

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 12.11.7 (Jun 11, 2026). Tested on Artifactory 7.146.17 with Terraform 1.15.6 and OpenTofu 1.12.2
+
+BUG FIXES:
+
+* resource/artifactory_package_cleanup_policy: Preserve omitted `cron_expression` as null when Artifactory returns an empty string, avoiding an inconsistent result after apply. Issue: [#1406](https://github.com/jfrog/terraform-provider-artifactory/issues/1406)
+
 ### 12.11.6 (Jun 9, 2026). Tested on Artifactory 7.146.15 with Terraform 1.15.5 and OpenTofu 1.12.1
 
 IMPROVEMENTS:

pkg/artifactory/resource/configuration/resource_artifactory_package_cleanup_policy.go

@@ -390,7 +390,7 @@ func (r *PackageCleanupPolicyResourceModelV1) fromAPIModel(ctx context.Context,
 
 	r.Key = types.StringValue(apiModel.Key)
 	r.Description = types.StringValue(apiModel.Description)
-	r.CronExpression = types.StringValue(apiModel.CronExpression)
+	r.CronExpression = normalizeEmptyAPIString(apiModel.CronExpression, r.CronExpression)
 	r.DurationInMinutes = types.Int64Value(apiModel.DurationInMinutes)
 	r.Enabled = types.BoolValue(apiModel.Enabled)
 	r.SkipTrashcan = types.BoolValue(apiModel.SkipTrashcan)
@@ -529,6 +529,14 @@ func (r *PackageCleanupPolicyResourceModelV1) fromAPIModel(ctx context.Context,
 	return diags
 }
 
+func normalizeEmptyAPIString(apiValue string, priorValue types.String) types.String {
+	if apiValue == "" && priorValue.IsNull() {
+		return types.StringNull()
+	}
+
+	return types.StringValue(apiValue)
+}
+
 type PackageCleanupPolicyAPIModel struct {
 	Key               string                                     `json:"key"`
 	Description       string                                     `json:"description,omitempty"`

pkg/artifactory/resource/configuration/resource_artifactory_package_cleanup_policy_model_test.go

@@ -0,0 +1,96 @@
+// Copyright (c) JFrog Ltd. (2026)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package configuration
+
+import (
+	"context"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+func TestPackageCleanupPolicyFromAPIModelPreservesNullCronExpression(t *testing.T) {
+	model := PackageCleanupPolicyResourceModelV1{
+		PackageCleanupPolicyResourceModelV0: PackageCleanupPolicyResourceModelV0{
+			CronExpression: types.StringNull(),
+		},
+	}
+
+	diags := model.fromAPIModel(context.Background(), PackageCleanupPolicyAPIModel{
+		CronExpression: "",
+		SearchCriteria: packageCleanupPolicyTestSearchCriteria(),
+	})
+
+	if diags.HasError() {
+		t.Fatalf("unexpected diagnostics: %s", diags.Errors())
+	}
+
+	if !model.CronExpression.IsNull() {
+		t.Fatalf("expected null cron_expression, got %q", model.CronExpression.ValueString())
+	}
+}
+
+func TestPackageCleanupPolicyFromAPIModelKeepsConfiguredEmptyCronExpression(t *testing.T) {
+	model := PackageCleanupPolicyResourceModelV1{
+		PackageCleanupPolicyResourceModelV0: PackageCleanupPolicyResourceModelV0{
+			CronExpression: types.StringValue(""),
+		},
+	}
+
+	diags := model.fromAPIModel(context.Background(), PackageCleanupPolicyAPIModel{
+		CronExpression: "",
+		SearchCriteria: packageCleanupPolicyTestSearchCriteria(),
+	})
+
+	if diags.HasError() {
+		t.Fatalf("unexpected diagnostics: %s", diags.Errors())
+	}
+
+	if model.CronExpression.IsNull() {
+		t.Fatal("expected configured empty cron_expression to stay as an empty string")
+	}
+
+	if model.CronExpression.ValueString() != "" {
+		t.Fatalf("expected empty cron_expression, got %q", model.CronExpression.ValueString())
+	}
+}
+
+func TestPackageCleanupPolicyFromAPIModelSetsNonEmptyCronExpression(t *testing.T) {
+	model := PackageCleanupPolicyResourceModelV1{
+		PackageCleanupPolicyResourceModelV0: PackageCleanupPolicyResourceModelV0{
+			CronExpression: types.StringNull(),
+		},
+	}
+
+	diags := model.fromAPIModel(context.Background(), PackageCleanupPolicyAPIModel{
+		CronExpression: "0 0 2 ? * MON-SAT *",
+		SearchCriteria: packageCleanupPolicyTestSearchCriteria(),
+	})
+
+	if diags.HasError() {
+		t.Fatalf("unexpected diagnostics: %s", diags.Errors())
+	}
+
+	if model.CronExpression.ValueString() != "0 0 2 ? * MON-SAT *" {
+		t.Fatalf("expected non-empty cron_expression, got %q", model.CronExpression.ValueString())
+	}
+}
+
+func packageCleanupPolicyTestSearchCriteria() PackageCleanupPolicySearchCriteriaAPIModel {
+	return PackageCleanupPolicySearchCriteriaAPIModel{
+		PackageTypes: []string{"docker"},
+		Repos:        []string{"example-repo"},
+	}
+}