Merge pull request #98 from jfrog/GH-96-doc-fix

GH-96, fix policies types
jfrog · Jan 13, 2023 · b3b5dbc · b3b5dbc
2 parents 2c61450 + 42cb094
commit b3b5dbc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.9.6 (January 12, 2023). Tested on Artifactory 7.49.5 and Xray 3.64.4
+
+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 [#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
 
 BUG FIXES:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,