summaryrefslogtreecommitdiff
path: root/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-12 16:26:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-12 16:26:10 +0000
commit6653ccc011dec86e5140a5d09ea3b2357eab6714 (patch)
tree897193f37bcd98152a0ac214f80a3c4cfe1047c5 /lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb
parentbff35a05aed6a31380a73c39113808fd262c2c37 (diff)
downloadgitlab-ce-6653ccc011dec86e5140a5d09ea3b2357eab6714.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc41
Diffstat (limited to 'lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb')
-rw-r--r--lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb16
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb b/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb
index 52b09e07fd5..dc31f995ae0 100644
--- a/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb
+++ b/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback.rb
@@ -61,16 +61,12 @@ module Gitlab
private
def calculated_uuid
- Gitlab::UUID.v5(uuid_components)
- end
-
- def uuid_components
- [
- category,
- vulnerability_finding.primary_identifier.fingerprint,
- vulnerability_finding.location_fingerprint,
- project_id
- ].join('-')
+ ::Security::VulnerabilityUUID.generate(
+ report_type: category,
+ primary_identifier_fingerprint: vulnerability_finding.primary_identifier.fingerprint,
+ location_fingerprint: vulnerability_finding.location_fingerprint,
+ project_id: project_id
+ )
end
def finding_key