Commit e1b14ee9 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'show_secret_on_dashboard' into 'master'

Add secret_detection as a new report_type

See merge request gitlab-org/gitlab!33682
parents 1e25d605 4eca74ec
...@@ -14,6 +14,7 @@ export const REPORT_TYPES = { ...@@ -14,6 +14,7 @@ export const REPORT_TYPES = {
dast: s__('ciReport|DAST'), dast: s__('ciReport|DAST'),
dependency_scanning: s__('ciReport|Dependency Scanning'), dependency_scanning: s__('ciReport|Dependency Scanning'),
sast: s__('ciReport|SAST'), sast: s__('ciReport|SAST'),
secret_detection: s__('ciReport|Secret Detection'),
}; };
export const DASHBOARD_TYPES = { export const DASHBOARD_TYPES = {
......
---
title: Show secret_detection in report types
merge_request: 33682
author:
type: added
...@@ -12,7 +12,7 @@ module Gitlab ...@@ -12,7 +12,7 @@ module Gitlab
include ::Gitlab::Config::Entry::Attributable include ::Gitlab::Config::Entry::Attributable
ALLOWED_KEYS = ALLOWED_KEYS =
%i[junit codequality sast dependency_scanning container_scanning %i[junit codequality sast secret_detection dependency_scanning container_scanning
dast performance license_management license_scanning metrics lsif dast performance license_management license_scanning metrics lsif
dotenv cobertura terraform accessibility cluster_applications].freeze dotenv cobertura terraform accessibility cluster_applications].freeze
...@@ -26,6 +26,7 @@ module Gitlab ...@@ -26,6 +26,7 @@ module Gitlab
validates :junit, array_of_strings_or_string: true validates :junit, array_of_strings_or_string: true
validates :codequality, array_of_strings_or_string: true validates :codequality, array_of_strings_or_string: true
validates :sast, array_of_strings_or_string: true validates :sast, array_of_strings_or_string: true
validates :secret_detection, array_of_strings_or_string: true
validates :dependency_scanning, array_of_strings_or_string: true validates :dependency_scanning, array_of_strings_or_string: true
validates :container_scanning, array_of_strings_or_string: true validates :container_scanning, array_of_strings_or_string: true
validates :dast, array_of_strings_or_string: true validates :dast, array_of_strings_or_string: true
......
...@@ -26164,6 +26164,9 @@ msgstr "" ...@@ -26164,6 +26164,9 @@ msgstr ""
msgid "ciReport|SAST" msgid "ciReport|SAST"
msgstr "" msgstr ""
msgid "ciReport|Secret Detection"
msgstr ""
msgid "ciReport|Secret scanning" msgid "ciReport|Secret scanning"
msgstr "" msgstr ""
......
...@@ -37,6 +37,7 @@ describe Gitlab::Ci::Config::Entry::Reports do ...@@ -37,6 +37,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
:junit | 'junit.xml' :junit | 'junit.xml'
:codequality | 'gl-code-quality-report.json' :codequality | 'gl-code-quality-report.json'
:sast | 'gl-sast-report.json' :sast | 'gl-sast-report.json'
:secret_detection | 'gl-secret-detection-report.json'
:dependency_scanning | 'gl-dependency-scanning-report.json' :dependency_scanning | 'gl-dependency-scanning-report.json'
:container_scanning | 'gl-container-scanning-report.json' :container_scanning | 'gl-container-scanning-report.json'
:dast | 'gl-dast-report.json' :dast | 'gl-dast-report.json'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment