Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove 'component' conflict validations #147

Merged
merged 4 commits into from
Nov 16, 2023
Merged

Remove 'component' conflict validations #147

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c47f3a
Remove 'component' conflict validations
alexhung Nov 16, 2023
ba72194
Update CHANGELOG
alexhung Nov 16, 2023
5315b08
JFrog Pipelines - Add Artifactory and Xray versions to CHANGELOG.md
jfrogsolutioncicd Nov 16, 2023
d6c520a
Update version in CHANGELOG
alexhung Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.0.2 (November 17, 2023). Tested on Artifactory 7.71.4 and Xray 3.85.5
alexhung marked this conversation as resolved.
Show resolved Hide resolved

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:
Expand Down
9 changes: 4 additions & 5 deletions pkg/xray/resource_xray_ignore_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading