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

Jump to bottom

Xray Ignore rules support #967

Merged
merged 69 commits into from
Jul 22, 2024
Merged

Xray Ignore rules support #967

merged 69 commits into from
Jul 22, 2024

Conversation

dortam888
Copy link
Contributor

@dortam888 dortam888 commented Jun 29, 2024 •
edited
Loading

  • All tests passed. If this feature is not already covered by the tests, I added new tests.
  • All static analysis checks passed.
  • This pull request is on the dev branch.
  • I used gofmt for formatting the code before submitting the pull request.

Adding Support For Xray Ignore rules for testing

omerzi and others added 30 commits April 5, 2023 09:49
@omerzi
Promote version to 1.28.1 (jfrog#733)
a664ea4
@eyalbe4
Added the Frogbot badge to the README (jfrog#740)
0b22cb3
@sverdlov93
Merge remote-tracking branch 'upstream/dev' into masterupstream
93d1ee0 
# Conflicts:
#	.github/workflows/analysis.yml
#	go.mod
#	go.sum
#	utils/utils.go
#	xray/services/scan.go
#	xray/services/scan_test.go
@omerzi
Merge remote-tracking branch 'origin/dev'
60012f0
@eyalbe4
Merge branch 'dev'
72340a7
@talarian1
Merge remote-tracking branch 'origin/dev'
3c0e410
@omerzi
Merge remote-tracking branch 'origin/dev'
7dd161b
@talarian1
Merge remote-tracking branch 'origin/dev'
88f4c5c
@yahavi
Merge branch 'master' into dev
21b99ad
@yahavi
Promoted version to 1.29.1
b71c280
@eyalbe4
Merge branch 'dev'
8f7755c
@eyalbe4
Merge branch 'dev'
e6ba583
@RobiNino
Merge branch 'dev'
b624428
@omerzi
Merge branch 'master' into dev
da0c018
@omerzi
Promoted version to 1.31.1
f750025
@omerzi
Merge remote-tracking branch 'origin/dev'
e1d57bd 
# Conflicts:
#	utils/utils.go
@eyalbe4
Merge branch 'dev'
886ff5f
@eyalbe4
Promoted version to 1.31.3
b1ae836
@eyalbe4
Merge branch 'dev'
df38e23
@eyalbe4
Merge branch 'dev'
46b7fb9
@eyalbe4
Resolve conflicts
5f58723
@eyalbe4
Merge branch 'dev'
080ef1a
@attiasas
Merge branch 'dev'
7c244c5
@EyalDelarea
Merge branch 'master' into dev
6d1c9e7
@EyalDelarea
Merge remote-tracking branch 'origin/dev'
b3d917f
@sverdlov93
Merge remote-tracking branch 'upstream/dev'
3be412b
@RobiNino
Merge branch 'dev'
fa697b5
@eranturgeman
Merge remote-tracking branch 'origin/dev'
7b2943f
@eranturgeman
Merge remote-tracking branch 'jfrog-prod/dev'
15552e7
@yahavi
Merge remote-tracking branch 'origin/dev'
9684938
@attiasas attiasas added the safe to test Approve running integration tests on a pull request label Jul 1, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Jul 1, 2024
@3choBoomer
Copy link

duplicate of #960 ?

@yahavi yahavi added the safe to test Approve running integration tests on a pull request label Jul 15, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Jul 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

👍 Frogbot scanned this pull request and did not find any new security issues.

eyalbe4
eyalbe4 requested changes Jul 17, 2024
View reviewed changes
tests/xrayignorerule_test.go Show resolved Hide resolved
tests/xrayignorerule_test.go Outdated Show resolved Hide resolved
tests/xrayignorerule_test.go Outdated Show resolved Hide resolved
xray/services/ignorerule.go Outdated Show resolved Hide resolved
xray/services/ignorerule.go Outdated Show resolved Hide resolved
xray/services/ignorerule.go Outdated Show resolved Hide resolved
@eyalbe4 eyalbe4 self-requested a review July 17, 2024 09:49
@eyalbe4 eyalbe4 added the safe to test Approve running integration tests on a pull request label Jul 22, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Jul 22, 2024
@dortam888
Copy link
Contributor Author

@3choBoomer Apologies, I didn't notice #960 when creating this PR.
My PR is a bit more updated to the current API with exposures feature addition and some small fixes compared to yours (For example docker-layers and release-bundles).
We will soon add more features to ignore rules regarding SAST, our team will support it as well as soon as the changes are released.
Again, apologies for overriding your PR there was no intention to do it and we happily accept all contributions.

eyalbe4
eyalbe4 requested changes Jul 22, 2024
View reviewed changes
xray/services/ignorerule.go Outdated Show resolved Hide resolved
@eyalbe4 eyalbe4 added the safe to test Approve running integration tests on a pull request label Jul 22, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Jul 22, 2024
@eyalbe4 eyalbe4 added the safe to test Approve running integration tests on a pull request label Jul 22, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Jul 22, 2024
@eyalbe4 eyalbe4 merged commit a1fbe49 into jfrog:dev Jul 22, 2024
23 of 25 checks passed
@3choBoomer 3choBoomer mentioned this pull request Jul 22, 2024
Open
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@attiasas attiasas attiasas requested changes

@eyalbe4 eyalbe4 eyalbe4 requested changes

@yahavi yahavi Awaiting requested review from yahavi

@RobiNino RobiNino Awaiting requested review from RobiNino

Assignees
No one assigned
Labels
new feature Automatically generated release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.