Merge pull request #147 from jfrog/GH-146-fix-ignore-rule-attribute-c…

…onflict Remove 'component' conflict validations
jfrog · Nov 16, 2023 · 51ff55b · 51ff55b
2 parents 2e0be6b + d6c520a
commit 51ff55b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -51,4 +51,4 @@ release:
   # If you want to manually examine the release before its live, uncomment this line:
   # draft: true
 changelog:
-  skip: true
+  use: github-native
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.0.3 (November 17, 2023). Tested on Artifactory 7.71.4 and Xray 3.85.5
+
+BUG FIXES:
+
+* resource/xray_ignore_rule: remove validation against setting attributes `build` and `component` at the same time. PR: [#147](https://github.com/jfrog/terraform-provider-xray/pull/147) Issue: [#146](https://github.com/jfrog/terraform-provider-xray/issues/146)
+
 ## 2.0.2 (November 1, 2023). Tested on Artifactory 7.71.3 and Xray 3.83.10
 
 BUG FIXES:

diff --git a/pkg/xray/resource_xray_ignore_rule.go b/pkg/xray/resource_xray_ignore_rule.go
@@ -195,11 +195,10 @@ func resourceXrayIgnoreRule() *schema.Resource {
 				},
 			},
 			"component": {
-				Type:          schema.TypeSet,
-				Optional:      true,
-				ForceNew:      true,
-				ConflictsWith: []string{"build", "release_bundle"},
-				Description:   "List of specific components to ignore. Omit to apply to all.",
+				Type:        schema.TypeSet,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "List of specific components to ignore. Omit to apply to all.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"name": {