Commit 6209f402 authored by David O'Regan's avatar David O'Regan

Merge branch 'jnnkl-add-dast-profiles-static-sec-conf-page' into 'master'

Add DAST Profiles to Security Config Page

See merge request gitlab-org/gitlab!54246
parents 2139d2e3 8938dfae
...@@ -4,6 +4,7 @@ import { s__, sprintf } from '~/locale'; ...@@ -4,6 +4,7 @@ import { s__, sprintf } from '~/locale';
import { import {
REPORT_TYPE_SAST, REPORT_TYPE_SAST,
REPORT_TYPE_DAST, REPORT_TYPE_DAST,
REPORT_TYPE_DAST_PROFILES,
REPORT_TYPE_DEPENDENCY_SCANNING, REPORT_TYPE_DEPENDENCY_SCANNING,
REPORT_TYPE_CONTAINER_SCANNING, REPORT_TYPE_CONTAINER_SCANNING,
REPORT_TYPE_COVERAGE_FUZZING, REPORT_TYPE_COVERAGE_FUZZING,
...@@ -40,6 +41,7 @@ export default { ...@@ -40,6 +41,7 @@ export default {
const COMPONENTS = { const COMPONENTS = {
[REPORT_TYPE_SAST]: ManageSast, [REPORT_TYPE_SAST]: ManageSast,
[REPORT_TYPE_DAST]: Upgrade, [REPORT_TYPE_DAST]: Upgrade,
[REPORT_TYPE_DAST_PROFILES]: Upgrade,
[REPORT_TYPE_DEPENDENCY_SCANNING]: Upgrade, [REPORT_TYPE_DEPENDENCY_SCANNING]: Upgrade,
[REPORT_TYPE_CONTAINER_SCANNING]: Upgrade, [REPORT_TYPE_CONTAINER_SCANNING]: Upgrade,
[REPORT_TYPE_COVERAGE_FUZZING]: Upgrade, [REPORT_TYPE_COVERAGE_FUZZING]: Upgrade,
......
...@@ -4,6 +4,7 @@ import { s__ } from '~/locale'; ...@@ -4,6 +4,7 @@ import { s__ } from '~/locale';
import { import {
REPORT_TYPE_SAST, REPORT_TYPE_SAST,
REPORT_TYPE_DAST, REPORT_TYPE_DAST,
REPORT_TYPE_DAST_PROFILES,
REPORT_TYPE_SECRET_DETECTION, REPORT_TYPE_SECRET_DETECTION,
REPORT_TYPE_DEPENDENCY_SCANNING, REPORT_TYPE_DEPENDENCY_SCANNING,
REPORT_TYPE_CONTAINER_SCANNING, REPORT_TYPE_CONTAINER_SCANNING,
...@@ -22,6 +23,10 @@ export const DAST_NAME = s__('Dynamic Application Security Testing (DAST)'); ...@@ -22,6 +23,10 @@ export const DAST_NAME = s__('Dynamic Application Security Testing (DAST)');
export const DAST_DESCRIPTION = s__('Analyze a review version of your web application.'); export const DAST_DESCRIPTION = s__('Analyze a review version of your web application.');
export const DAST_HELP_PATH = helpPagePath('user/application_security/dast/index'); export const DAST_HELP_PATH = helpPagePath('user/application_security/dast/index');
export const DAST_PROFILES_NAME = s__('DAST Scans');
export const DAST_PROFILES_DESCRIPTION = s__('Analyze a review version of your web application.');
export const DAST_PROFILES_HELP_PATH = helpPagePath('user/application_security/dast/index');
export const SECRET_DETECTION_NAME = s__('Secret Detection'); export const SECRET_DETECTION_NAME = s__('Secret Detection');
export const SECRET_DETECTION_DESCRIPTION = s__( export const SECRET_DETECTION_DESCRIPTION = s__(
'Analyze your source code and git history for secrets.', 'Analyze your source code and git history for secrets.',
...@@ -79,6 +84,12 @@ export const features = [ ...@@ -79,6 +84,12 @@ export const features = [
helpPath: DAST_HELP_PATH, helpPath: DAST_HELP_PATH,
type: REPORT_TYPE_DAST, type: REPORT_TYPE_DAST,
}, },
{
name: DAST_PROFILES_NAME,
description: DAST_PROFILES_DESCRIPTION,
helpPath: DAST_PROFILES_HELP_PATH,
type: REPORT_TYPE_DAST_PROFILES,
},
{ {
name: SECRET_DETECTION_NAME, name: SECRET_DETECTION_NAME,
description: SECRET_DETECTION_DESCRIPTION, description: SECRET_DETECTION_DESCRIPTION,
......
...@@ -18,6 +18,7 @@ export const REPORT_FILE_TYPES = { ...@@ -18,6 +18,7 @@ export const REPORT_FILE_TYPES = {
*/ */
export const REPORT_TYPE_SAST = 'sast'; export const REPORT_TYPE_SAST = 'sast';
export const REPORT_TYPE_DAST = 'dast'; export const REPORT_TYPE_DAST = 'dast';
export const REPORT_TYPE_DAST_PROFILES = 'dast_profiles';
export const REPORT_TYPE_SECRET_DETECTION = 'secret_detection'; export const REPORT_TYPE_SECRET_DETECTION = 'secret_detection';
export const REPORT_TYPE_DEPENDENCY_SCANNING = 'dependency_scanning'; export const REPORT_TYPE_DEPENDENCY_SCANNING = 'dependency_scanning';
export const REPORT_TYPE_CONTAINER_SCANNING = 'container_scanning'; export const REPORT_TYPE_CONTAINER_SCANNING = 'container_scanning';
......
...@@ -6,6 +6,7 @@ import { features, UPGRADE_CTA } from '~/security_configuration/components/featu ...@@ -6,6 +6,7 @@ import { features, UPGRADE_CTA } from '~/security_configuration/components/featu
import { import {
REPORT_TYPE_SAST, REPORT_TYPE_SAST,
REPORT_TYPE_DAST, REPORT_TYPE_DAST,
REPORT_TYPE_DAST_PROFILES,
REPORT_TYPE_DEPENDENCY_SCANNING, REPORT_TYPE_DEPENDENCY_SCANNING,
REPORT_TYPE_CONTAINER_SCANNING, REPORT_TYPE_CONTAINER_SCANNING,
REPORT_TYPE_COVERAGE_FUZZING, REPORT_TYPE_COVERAGE_FUZZING,
...@@ -36,6 +37,7 @@ describe('Configuration Table Component', () => { ...@@ -36,6 +37,7 @@ describe('Configuration Table Component', () => {
} else if ( } else if (
[ [
REPORT_TYPE_DAST, REPORT_TYPE_DAST,
REPORT_TYPE_DAST_PROFILES,
REPORT_TYPE_DEPENDENCY_SCANNING, REPORT_TYPE_DEPENDENCY_SCANNING,
REPORT_TYPE_CONTAINER_SCANNING, REPORT_TYPE_CONTAINER_SCANNING,
REPORT_TYPE_COVERAGE_FUZZING, REPORT_TYPE_COVERAGE_FUZZING,
......
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