From 6d8e5035de62062db6997f76f3425863277b17bf Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 22 Oct 2024 12:29:25 +0800 Subject: [PATCH 1/2] feat(tcr): [111111111] adjust modify logic --- .../services/tcr/resource_tc_tcr_tag_retention_rule.go | 5 ++--- .../services/tcr/resource_tc_tcr_tag_retention_rule.md | 3 +-- website/docs/r/tcr_tag_retention_rule.html.markdown | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.go b/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.go index 8376055973..a44353f51a 100644 --- a/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.go +++ b/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.go @@ -66,6 +66,7 @@ func ResourceTencentCloudTcrTagRetentionRule() *schema.Resource { "cron_setting": { Required: true, + ForceNew: true, Type: schema.TypeString, Description: "Execution cycle, currently only available selections are: manual; daily; weekly; monthly.", }, @@ -267,7 +268,7 @@ func resourceTencentCloudTcrTagRetentionRuleUpdate(d *schema.ResourceData, meta } } - if d.HasChange("retention_rule") { + if d.HasChange("retention_rule") || d.HasChange("disabled") { if dMap, ok := helper.InterfacesHeadMap(d, "retention_rule"); ok { retentionRule := tcr.RetentionRule{} if v, ok := dMap["key"]; ok { @@ -278,9 +279,7 @@ func resourceTencentCloudTcrTagRetentionRuleUpdate(d *schema.ResourceData, meta } request.RetentionRule = &retentionRule } - } - if d.HasChange("disabled") { if v, ok := d.GetOkExists("disabled"); ok { request.Disabled = helper.Bool(v.(bool)) } diff --git a/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.md b/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.md index 8baf4debd9..d9da6dc872 100644 --- a/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.md +++ b/tencentcloud/services/tcr/resource_tc_tcr_tag_retention_rule.md @@ -2,7 +2,7 @@ Provides a resource to create a tcr tag retention rule. Example Usage -Create a tcr tag retention rule instance +Create and enable a tcr tag retention rule instance ```hcl resource "tencentcloud_tcr_instance" "example" { @@ -34,6 +34,5 @@ resource "tencentcloud_tcr_tag_retention_rule" "my_rule" { value = 2 } cron_setting = "daily" - disabled = true } ``` \ No newline at end of file diff --git a/website/docs/r/tcr_tag_retention_rule.html.markdown b/website/docs/r/tcr_tag_retention_rule.html.markdown index 0306e0b836..715757e5c1 100644 --- a/website/docs/r/tcr_tag_retention_rule.html.markdown +++ b/website/docs/r/tcr_tag_retention_rule.html.markdown @@ -13,7 +13,7 @@ Provides a resource to create a tcr tag retention rule. ## Example Usage -### Create a tcr tag retention rule instance +### Create and enable a tcr tag retention rule instance ```hcl resource "tencentcloud_tcr_instance" "example" { @@ -45,7 +45,6 @@ resource "tencentcloud_tcr_tag_retention_rule" "my_rule" { value = 2 } cron_setting = "daily" - disabled = true } ``` @@ -53,7 +52,7 @@ resource "tencentcloud_tcr_tag_retention_rule" "my_rule" { The following arguments are supported: -* `cron_setting` - (Required, String) Execution cycle, currently only available selections are: manual; daily; weekly; monthly. +* `cron_setting` - (Required, String, ForceNew) Execution cycle, currently only available selections are: manual; daily; weekly; monthly. * `namespace_name` - (Required, String) The Name of the namespace. * `registry_id` - (Required, String) The main instance ID. * `retention_rule` - (Required, List) Retention Policy. From b5e4aacaa9d195117467b36346ddc70b637657d1 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 22 Oct 2024 12:31:03 +0800 Subject: [PATCH 2/2] add changelog --- .changelog/2905.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2905.txt diff --git a/.changelog/2905.txt b/.changelog/2905.txt new file mode 100644 index 0000000000..50260dc5bc --- /dev/null +++ b/.changelog/2905.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_tcr_tag_retention_rule: adjust modify logic +``` \ No newline at end of file