From bcfd69de2f763838f3d243098ea8adc398efe89e Mon Sep 17 00:00:00 2001 From: Daniel Miakotkin Date: Thu, 12 Jan 2023 14:51:47 -0800 Subject: [PATCH 1/3] GH-96, fix the documentation, examples and verification for Xray Policies --- CHANGELOG.md | 8 ++++++++ docs/index.md | 4 ++-- docs/resources/operational_risk_policy.md | 4 ++-- .../resources/xray_operational_risk_policy/resource.tf | 4 ++-- examples/sample.tf | 4 ++-- pkg/xray/policies.go | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34710bca..06e0b627 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.9.6 (January 12, 2023) + +BUG FIX: + +* resource/resource_xray_operational_risk_policy: documentation updated to match Xray behavior, all policy types are lowercase now. + Issue: [#96](https://github.com/jfrog/terraform-provider-xray/issues/96) + PR [#]() + ## 1.9.5 (December 22, 2022). Tested on Artifactory 7.47.14 and Xray 3.62.4 BUG FIXES: diff --git a/docs/index.md b/docs/index.md index 75a796b0..af9f1aea 100644 --- a/docs/index.md +++ b/docs/index.md @@ -128,7 +128,7 @@ resource "xray_license_policy" "license_policy" { resource "xray_operational_risk_policy" "min_risk" { name = "test-operational-risk-policy-min-risk" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" rule { name = "op_risk_custom_rule" @@ -159,7 +159,7 @@ resource "xray_operational_risk_policy" "min_risk" { resource "xray_operational_risk_policy" "custom_criteria" { name = "test-operational-risk-policy-custom-criteria" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" rule { name = "op_risk_custom_rule" diff --git a/docs/resources/operational_risk_policy.md b/docs/resources/operational_risk_policy.md index 72c488d1..7cad8135 100644 --- a/docs/resources/operational_risk_policy.md +++ b/docs/resources/operational_risk_policy.md @@ -16,7 +16,7 @@ Creates an Xray policy using V2 of the underlying APIs. Please note: It's only c resource "xray_operational_risk_policy" "min_risk" { name = "test-operational-risk-policy-min-risk" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" project_key = "testproj" rule { @@ -48,7 +48,7 @@ resource "xray_operational_risk_policy" "min_risk" { resource "xray_operational_risk_policy" "custom_criteria" { name = "test-operational-risk-policy-custom-criteria" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" project_key = "testproj" rule { diff --git a/examples/resources/xray_operational_risk_policy/resource.tf b/examples/resources/xray_operational_risk_policy/resource.tf index 7cefb595..de6daaab 100644 --- a/examples/resources/xray_operational_risk_policy/resource.tf +++ b/examples/resources/xray_operational_risk_policy/resource.tf @@ -1,7 +1,7 @@ resource "xray_operational_risk_policy" "min_risk" { name = "test-operational-risk-policy-min-risk" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" project_key = "testproj" rule { @@ -33,7 +33,7 @@ resource "xray_operational_risk_policy" "min_risk" { resource "xray_operational_risk_policy" "custom_criteria" { name = "test-operational-risk-policy-custom-criteria" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" project_key = "testproj" rule { diff --git a/examples/sample.tf b/examples/sample.tf index 1e59426a..e12772c1 100644 --- a/examples/sample.tf +++ b/examples/sample.tf @@ -89,7 +89,7 @@ resource "xray_license_policy" "license_policy" { resource "xray_operational_risk_policy" "min_risk" { name = "test-operational-risk-policy-min-risk" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" rule { name = "op_risk_custom_rule" @@ -120,7 +120,7 @@ resource "xray_operational_risk_policy" "min_risk" { resource "xray_operational_risk_policy" "custom_criteria" { name = "test-operational-risk-policy-custom-criteria" description = "Operational Risk policy with a custom risk rule" - type = "Operational_Risk" + type = "operational_risk" rule { name = "op_risk_custom_rule" diff --git a/pkg/xray/policies.go b/pkg/xray/policies.go index 2b704221..ff8e5c3c 100644 --- a/pkg/xray/policies.go +++ b/pkg/xray/policies.go @@ -109,7 +109,7 @@ var getPolicySchema = func(criteriaSchema map[string]*schema.Schema, actionsSche Type: schema.TypeString, Required: true, Description: "Type of the policy", - ValidateDiagFunc: validator.StringInSlice(true, "Security", "License", "Operational_Risk"), + ValidateDiagFunc: validator.StringInSlice(false, "security", "license", "operational_risk"), }, "author": { Type: schema.TypeString, From 59d3af13083803ebd70d89604d2c0937cb5ca5ff Mon Sep 17 00:00:00 2001 From: Daniel Miakotkin Date: Thu, 12 Jan 2023 14:52:29 -0800 Subject: [PATCH 2/3] GH-96, update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e0b627..c9741e6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ BUG FIX: * resource/resource_xray_operational_risk_policy: documentation updated to match Xray behavior, all policy types are lowercase now. Issue: [#96](https://github.com/jfrog/terraform-provider-xray/issues/96) - PR [#]() + PR [#98](https://github.com/jfrog/terraform-provider-xray/pull/98) ## 1.9.5 (December 22, 2022). Tested on Artifactory 7.47.14 and Xray 3.62.4 From 42cb094dee079302c8d6f53a7328b957b90ec00e Mon Sep 17 00:00:00 2001 From: JFrog CI Date: Thu, 12 Jan 2023 23:20:26 +0000 Subject: [PATCH 3/3] JFrog Pipelines - Add Artifactory and Xray versions to CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9741e6e..1ec3bd8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.9.6 (January 12, 2023) +## 1.9.6 (January 12, 2023). Tested on Artifactory 7.49.5 and Xray 3.64.4 BUG FIX: