diff options
Diffstat (limited to 'lib/gitlab/ci/parsers/security')
-rw-r--r-- | lib/gitlab/ci/parsers/security/common.rb | 5 | ||||
-rw-r--r-- | lib/gitlab/ci/parsers/security/validators/schema_validator.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/parsers/security/validators/schemas/sast-report-format.json (renamed from lib/gitlab/ci/parsers/security/validators/schemas/sast.json) | 0 | ||||
-rw-r--r-- | lib/gitlab/ci/parsers/security/validators/schemas/secret-detection-report-format.json (renamed from lib/gitlab/ci/parsers/security/validators/schemas/secret_detection.json) | 0 |
4 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/ci/parsers/security/common.rb b/lib/gitlab/ci/parsers/security/common.rb index 1cf4f252ab9..0c969daf7fd 100644 --- a/lib/gitlab/ci/parsers/security/common.rb +++ b/lib/gitlab/ci/parsers/security/common.rb @@ -33,8 +33,7 @@ module Gitlab report_data rescue JSON::ParserError raise SecurityReportParserError, 'JSON parsing failed' - rescue StandardError => e - Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e) + rescue StandardError raise SecurityReportParserError, "#{report.type} security report parsing failed" end @@ -115,7 +114,7 @@ module Gitlab flags: flags, links: links, remediations: remediations, - raw_metadata: data.to_json, + original_data: data, metadata_version: report_version, details: data['details'] || {}, signatures: signatures, diff --git a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb index 143b930c669..73cfa02ce4b 100644 --- a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb +++ b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb @@ -34,7 +34,7 @@ module Gitlab end def file_name - "#{report_type}.json" + "#{report_type.to_s.dasherize}-report-format.json" end end diff --git a/lib/gitlab/ci/parsers/security/validators/schemas/sast.json b/lib/gitlab/ci/parsers/security/validators/schemas/sast-report-format.json index a7159be0190..a7159be0190 100644 --- a/lib/gitlab/ci/parsers/security/validators/schemas/sast.json +++ b/lib/gitlab/ci/parsers/security/validators/schemas/sast-report-format.json diff --git a/lib/gitlab/ci/parsers/security/validators/schemas/secret_detection.json b/lib/gitlab/ci/parsers/security/validators/schemas/secret-detection-report-format.json index 462e23a151c..462e23a151c 100644 --- a/lib/gitlab/ci/parsers/security/validators/schemas/secret_detection.json +++ b/lib/gitlab/ci/parsers/security/validators/schemas/secret-detection-report-format.json |