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.

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

Bugfix for the creation of a Violation Report #933

Merged
merged 52 commits into from
May 9, 2024
Merged
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
a664ea4
Promote version to 1.28.1 (#733)
omerzi Apr 5, 2023
0b22cb3
Added the Frogbot badge to the README (#740)
eyalbe4 Apr 13, 2023
93d1ee0
Merge remote-tracking branch 'upstream/dev' into masterupstream
sverdlov93 Apr 19, 2023
60012f0
Merge remote-tracking branch 'origin/dev'
omerzi May 2, 2023
72340a7
Merge branch 'dev'
eyalbe4 May 16, 2023
3c0e410
Merge remote-tracking branch 'origin/dev'
talarian1 May 17, 2023
7dd161b
Merge remote-tracking branch 'origin/dev'
omerzi May 21, 2023
88f4c5c
Merge remote-tracking branch 'origin/dev'
talarian1 May 23, 2023
21b99ad
Merge branch 'master' into dev
yahavi May 23, 2023
b71c280
Promoted version to 1.29.1
yahavi May 23, 2023
8f7755c
Merge branch 'dev'
eyalbe4 Jun 10, 2023
e6ba583
Merge branch 'dev'
eyalbe4 Jun 25, 2023
b624428
Merge branch 'dev'
RobiNino Jun 29, 2023
da0c018
Merge branch 'master' into dev
omerzi Jul 12, 2023
f750025
Promoted version to 1.31.1
omerzi Jul 12, 2023
e1d57bd
Merge remote-tracking branch 'origin/dev'
omerzi Jul 18, 2023
886ff5f
Merge branch 'dev'
eyalbe4 Jul 31, 2023
b1ae836
Promoted version to 1.31.3
eyalbe4 Jul 31, 2023
df38e23
Merge branch 'dev'
eyalbe4 Jul 31, 2023
46b7fb9
Merge branch 'dev'
eyalbe4 Aug 3, 2023
5f58723
Resolve conflicts
eyalbe4 Aug 3, 2023
080ef1a
Merge branch 'dev'
eyalbe4 Aug 23, 2023
7c244c5
Merge branch 'dev'
attiasas Aug 28, 2023
6d1c9e7
Merge branch 'master' into dev
EyalDelarea Sep 11, 2023
b3d917f
Merge remote-tracking branch 'origin/dev'
EyalDelarea Sep 11, 2023
3be412b
Merge remote-tracking branch 'upstream/dev'
sverdlov93 Sep 13, 2023
fa697b5
Merge branch 'dev'
RobiNino Sep 14, 2023
7b2943f
Merge remote-tracking branch 'origin/dev'
eranturgeman Oct 3, 2023
15552e7
Merge remote-tracking branch 'jfrog-prod/dev'
eranturgeman Oct 3, 2023
9684938
Merge remote-tracking branch 'origin/dev'
yahavi Oct 4, 2023
9dd7283
Merge branch 'dev'
EyalDelarea Oct 5, 2023
21998b7
Merge remote-tracking branch 'origin/dev'
omerzi Oct 17, 2023
dc27aae
Merge remote-tracking branch 'origin/dev'
attiasas Nov 8, 2023
0abdd92
Merge remote-tracking branch 'origin/dev'
yahavi Nov 9, 2023
696df1a
Merge remote-tracking branch 'upstream/dev'
yahavi Nov 30, 2023
c09e8dd
Merge branch 'dev'
eyalbe4 Dec 15, 2023
3edc13f
Promote to v1.35.2
eyalbe4 Dec 18, 2023
ddfd377
Merge branch 'master' into dev
eyalbe4 Dec 18, 2023
36e989c
Resolved conflict
eyalbe4 Dec 21, 2023
cc27960
Merge branch 'dev'
eyalbe4 Dec 25, 2023
7f02060
Promote version to 1.35.5
omerzi Dec 27, 2023
5dd6e86
Promote version to 1.35.6
omerzi Jan 7, 2024
4f0f4b7
Merge branch 'dev'
eyalbe4 Jan 22, 2024
e249dfe
Promote version to '1.36.1' (#892)
attiasas Jan 29, 2024
8b005ae
Merge changes to master (#907)
yahavi Feb 20, 2024
18d4ebf
Merge remote-tracking branch 'origin/dev'
yahavi Feb 20, 2024
14a4407
Merge remote-tracking branch 'origin/dev'
yahavi Feb 21, 2024
1aca291
Merge remote-tracking branch 'origin/dev'
RobiNino Mar 18, 2024
109a52e
Merge remote-tracking branch 'upstream/dev'
sverdlov93 Mar 28, 2024
ebf5b85
watchNames and patterns as string slices
Felioh Apr 3, 2024
3bfe932
Merge branch 'dev' into fix/watch-field
attiasas May 6, 2024
5ac6aeb
Merge branch 'dev' into fix/watch-field
yahavi May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions xray/services/report.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ type LicensesFilter struct {

type ViolationsFilter struct {
Type string `json:"type,omitempty"`
WatchNames string `json:"watch_names,omitempty"`
WatchPatterns string `json:"watch_patterns,omitempty"`
WatchNames []string `json:"watch_names,omitempty"`
WatchPatterns []string `json:"watch_patterns,omitempty"`
Component string `json:"component,omitempty"`
Artifact string `json:"artifact,omitempty"`
PolicyNames []string `json:"policy_names,omitempty"`
Expand Down