GH-130 allow to create ignore rules for both watches and policies

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.14.1 (July 18, 2023)
+
+BUG FIXES:
+
+* resource/xray_ignore_rule: removed restriction, so the ignore rule can be created for both a policy and a watch.
+
+PR: [#]()
+Issue: [#130](https://github.com/jfrog/terraform-provider-xray/issues/130)
+
 ## 1.14.0 (June 1, 2023). Tested on Artifactory 7.59.9 and Xray 3.74.8
 
 IMPROVEMENTS:

pkg/xray/resource_xray_ignore_rule.go

@@ -125,21 +125,19 @@ func resourceXrayIgnoreRule() *schema.Resource {
 				},
 			},
 			"policies": {
-				Type:          schema.TypeSet,
-				Optional:      true,
-				ForceNew:      true,
-				Description:   "List of specific policies to ignore. Omit to apply to all.",
-				ConflictsWith: []string{"watches"},
+				Type:        schema.TypeSet,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "List of specific policies to ignore. Omit to apply to all.",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
 			"watches": {
-				Type:          schema.TypeSet,
-				Optional:      true,
-				ForceNew:      true,
-				Description:   "List of specific watches to ignore. Omit to apply to all.",
-				ConflictsWith: []string{"policies"},
+				Type:        schema.TypeSet,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "List of specific watches to ignore. Omit to apply to all.",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},

pkg/xray/resource_xray_ignore_rule_test.go

@@ -206,7 +206,7 @@ func TestAccIgnoreRule_scopes_policies(t *testing.T) {
 	})
 }
 
-func TestAccIgnoreRule_scopes_watches(t *testing.T) {
+func TestAccIgnoreRule_scopes_watches_policies(t *testing.T) {
 	_, fqrn, name := test.MkNames("ignore-rule-", "xray_ignore_rule")
 	expirationDate := time.Now().Add(time.Hour * 48)
 
@@ -259,6 +259,7 @@ func TestAccIgnoreRule_scopes_watches(t *testing.T) {
 			expiration_date  = "{{ .expirationDate }}"
 			cves             = ["fake-cve"]
 		 	watches          = [xray_watch.fake_watch.name]
+			policies         = [xray_security_policy.security.name]
 		}
 	`, map[string]interface{}{
 		"name":           name,
@@ -279,6 +280,8 @@ func TestAccIgnoreRule_scopes_watches(t *testing.T) {
 					resource.TestCheckResourceAttr(fqrn, "is_expired", "false"),
 					resource.TestCheckResourceAttr(fqrn, "watches.#", "1"),
 					resource.TestCheckTypeSetElemAttr(fqrn, "watches.*", "fake-watch"),
+					resource.TestCheckResourceAttr(fqrn, "policies.#", "1"),
+					resource.TestCheckTypeSetElemAttr(fqrn, "policies.*", "fake-policy"),
 				),
 			},
 			{