Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
91e7e999
Commit
91e7e999
authored
Feb 16, 2021
by
Michał Zając
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Perform the finding lookup twice on conflict
parent
3018dbc4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
ee/app/services/security/store_report_service.rb
ee/app/services/security/store_report_service.rb
+9
-2
No files found.
ee/app/services/security/store_report_service.rb
View file @
91e7e999
...
@@ -96,9 +96,16 @@ module Security
...
@@ -96,9 +96,16 @@ module Security
vulnerability_finding
.
save!
vulnerability_finding
.
save!
vulnerability_finding
vulnerability_finding
rescue
ActiveRecord
::
RecordNotUnique
=>
e
rescue
ActiveRecord
::
RecordNotUnique
=>
e
Gitlab
::
ErrorTracking
.
track_and_raise_exception
(
e
,
find_params:
find_params
,
uuid:
finding
.
uuid
)
# This might happen if we're processing another report in parallel and it finds the same Finding
# faster. In that case we need to perform the lookup again
vulnerability_finding
by_uuid
=
project
.
vulnerability_findings
.
reset
.
find_by
(
uuid:
finding
.
uuid
)
return
by_uuid
if
by_uuid
by_find_params
=
project
.
vulnerability_findings
.
reset
.
find_by
(
find_params
)
return
by_find_params
if
by_find_params
Gitlab
::
ErrorTracking
.
track_and_raise_exception
(
e
,
find_params:
find_params
,
uuid:
finding
.
uuid
)
rescue
ActiveRecord
::
RecordInvalid
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
Gitlab
::
ErrorTracking
.
track_and_raise_exception
(
e
,
create_params:
create_params
&
.
dig
(
:raw_metadata
))
Gitlab
::
ErrorTracking
.
track_and_raise_exception
(
e
,
create_params:
create_params
&
.
dig
(
:raw_metadata
))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment