From 4b9ca24dd90abfc2473e22b1c6439dbf2853c845 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Tue, 10 Sep 2024 15:02:35 -0700 Subject: [PATCH 1/3] Update attribute description and doc --- docs/resources/ignore_rule.md | 2 +- pkg/xray/resource/resource_xray_ignore_rule.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/resources/ignore_rule.md b/docs/resources/ignore_rule.md index 7bdc1c1d..bb2a8794 100644 --- a/docs/resources/ignore_rule.md +++ b/docs/resources/ignore_rule.md @@ -68,7 +68,7 @@ resource "xray_ignore_rule" "ignore-111" { - `component` (Block Set) List of specific components to ignore. Omit to apply to all. (see [below for nested schema](#nestedblock--component)) - `cves` (Set of String) List of specific CVEs to ignore. Omit to apply to all. Should set to 'any' when 'vulnerabilities' is set to 'any'. - `docker_layers` (Set of String) List of Docker layer SHA256 hashes to ignore. Omit to apply to all. -- `expiration_date` (String) The Ignore Rule will be active until the expiration date. At that date it will automatically get deleted. The rule with the expiration date less than current day, will error out. Ensure client and server time zones match. +- `expiration_date` (String) The Ignore Rule will be active until the expiration date. At that date it will automatically get deleted. The rule with the expiration date less than current day, will error out. Vaule assumes to be in local timezone. Ensure client and server time zones match. - `licenses` (Set of String) List of specific licenses to ignore. Omit to apply to all. - `operational_risk` (Set of String) Operational risk to ignore. Only accept 'any' - `policies` (Set of String) List of specific policies to ignore. Omit to apply to all. diff --git a/pkg/xray/resource/resource_xray_ignore_rule.go b/pkg/xray/resource/resource_xray_ignore_rule.go index 889f61be..b556cbd8 100644 --- a/pkg/xray/resource/resource_xray_ignore_rule.go +++ b/pkg/xray/resource/resource_xray_ignore_rule.go @@ -497,7 +497,7 @@ func (r *IgnoreRuleResource) Schema(ctx context.Context, req resource.SchemaRequ PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, - Description: "The Ignore Rule will be active until the expiration date. At that date it will automatically get deleted. The rule with the expiration date less than current day, will error out.", + Description: "The Ignore Rule will be active until the expiration date. At that date it will automatically get deleted. The rule with the expiration date less than current day, will error out. Vaule assumes to be in local timezone. Ensure client and server time zones match.", }, "author": schema.StringAttribute{ Computed: true, From 78c92537e515718126eb36ab280f513184566575 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Tue, 10 Sep 2024 15:02:44 -0700 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfb06baf..14b26a55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ IMPROVEMENTS: * resource/xray_license_policy, resource/xray_operational_risk_policy, resource/xray_security_policy: Migrate from SDKv2 to Plugin Framework. PR: [#239](https://github.com/jfrog/terraform-provider-xray/pull/239) * resource/xray_licenses_report, resource/xray_operational_risks_report, resource/xray_violations_report, resource/xray_vulnerabilities_report: Migrate from SDKv2 to Plugin Framework. PR: [#240](https://github.com/jfrog/terraform-provider-xray/pull/240) +* resource/xray_ignore_rule: Fix date parsing issue with timezone for `expiration_date` attribute. PR: [#238](https://github.com/jfrog/terraform-provider-xray/pull/238), [#240](https://github.com/jfrog/terraform-provider-xray/pull/240) ## 2.11.0 (August 27, 2024). Tested on Artifactory 7.90.8 and Xray 3.102.5 with Terraform 1.9.5 and OpenTofu 1.8.1 From cb8fd2fea3b4e323625d7dabd23f91212f4cfd6d Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Mon, 16 Sep 2024 16:31:08 -0700 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b26a55..53164b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ IMPROVEMENTS: * resource/xray_license_policy, resource/xray_operational_risk_policy, resource/xray_security_policy: Migrate from SDKv2 to Plugin Framework. PR: [#239](https://github.com/jfrog/terraform-provider-xray/pull/239) * resource/xray_licenses_report, resource/xray_operational_risks_report, resource/xray_violations_report, resource/xray_vulnerabilities_report: Migrate from SDKv2 to Plugin Framework. PR: [#240](https://github.com/jfrog/terraform-provider-xray/pull/240) -* resource/xray_ignore_rule: Fix date parsing issue with timezone for `expiration_date` attribute. PR: [#238](https://github.com/jfrog/terraform-provider-xray/pull/238), [#240](https://github.com/jfrog/terraform-provider-xray/pull/240) +* resource/xray_ignore_rule: Fix date parsing issue with timezone for `expiration_date` attribute. PR: [#238](https://github.com/jfrog/terraform-provider-xray/pull/238), [#244](https://github.com/jfrog/terraform-provider-xray/pull/244) ## 2.11.0 (August 27, 2024). Tested on Artifactory 7.90.8 and Xray 3.102.5 with Terraform 1.9.5 and OpenTofu 1.8.1