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
8046d377
Commit
8046d377
authored
Oct 22, 2021
by
Mehul Sharma
Committed by
Jacques Erasmus
Oct 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated fullPath arguments from frontend DAST mutations
parent
b5eb8b81
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
23 deletions
+9
-23
ee/app/assets/javascripts/on_demand_scans_form/components/on_demand_scans_form.vue
.../on_demand_scans_form/components/on_demand_scans_form.vue
+1
-2
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue
..._configuration/dast_profiles/components/dast_profiles.vue
+0
-2
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_saved_scans_list.vue
...ration/dast_profiles/components/dast_saved_scans_list.vue
+0
-6
ee/app/assets/javascripts/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue
...scanner_profiles/components/dast_scanner_profile_form.vue
+1
-2
ee/app/assets/javascripts/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_profile_form.vue
.../dast_site_profiles/components/dast_site_profile_form.vue
+1
-2
ee/spec/frontend/on_demand_scans_form/components/on_demand_scans_form_spec.js
...demand_scans_form/components/on_demand_scans_form_spec.js
+0
-1
ee/spec/frontend/security_configuration/dast_profiles/dast_scanner_profiles_form/components/dast_scanner_profiles_form_spec.js
...ofiles_form/components/dast_scanner_profiles_form_spec.js
+3
-4
ee/spec/frontend/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_profile_form_spec.js
...t_site_profiles/components/dast_site_profile_form_spec.js
+3
-4
No files found.
ee/app/assets/javascripts/on_demand_scans_form/components/on_demand_scans_form.vue
View file @
8046d377
...
...
@@ -247,14 +247,13 @@ export default {
const
mutation
=
this
.
isEdit
?
dastProfileUpdateMutation
:
dastProfileCreateMutation
;
const
responseType
=
this
.
isEdit
?
'
dastProfileUpdate
'
:
'
dastProfileCreate
'
;
const
input
=
{
fullPath
:
this
.
projectPath
,
dastScannerProfileId
:
this
.
selectedScannerProfile
.
id
,
dastSiteProfileId
:
this
.
selectedSiteProfile
.
id
,
branchName
:
this
.
selectedBranch
,
...(
this
.
glFeatures
.
dastOnDemandScansScheduler
?
{
dastProfileSchedule
:
this
.
profileSchedule
}
:
{}),
...(
this
.
isEdit
?
{
id
:
this
.
dastScan
.
id
}
:
{}),
...(
this
.
isEdit
?
{
id
:
this
.
dastScan
.
id
}
:
{
fullPath
:
this
.
projectPath
}),
...
serializeFormObject
(
this
.
form
.
fields
),
[
this
.
isEdit
?
'
runAfterUpdate
'
:
'
runAfterCreate
'
]:
runAfter
,
};
...
...
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue
View file @
8046d377
...
...
@@ -152,7 +152,6 @@ export default {
},
deleteProfile
(
profileType
,
profileId
)
{
const
{
projectFullPath
,
handleError
,
profileSettings
:
{
[
profileType
]:
{
...
...
@@ -174,7 +173,6 @@ export default {
mutation
:
deletion
.
mutation
,
variables
:
{
input
:
{
...(
profileType
!==
'
dastProfiles
'
?
{
fullPath
:
projectFullPath
}
:
{}),
id
:
profileId
,
},
},
...
...
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_saved_scans_list.vue
View file @
8046d377
...
...
@@ -20,10 +20,6 @@ export default {
},
mixins
:
[
glFeatureFlagsMixin
()],
props
:
{
fullPath
:
{
type
:
String
,
required
:
true
,
},
errorMessage
:
{
type
:
String
,
required
:
false
,
...
...
@@ -72,7 +68,6 @@ export default {
mutation
:
dastProfileRunMutation
,
variables
:
{
input
:
{
fullPath
:
this
.
fullPath
,
id
,
},
},
...
...
@@ -101,7 +96,6 @@ export default {
<
template
>
<profiles-list
:full-path=
"fullPath"
:error-message=
"error.errorMessage"
:error-details=
"error.errorDetails"
v-bind=
"$attrs"
...
...
ee/app/assets/javascripts/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue
View file @
8046d377
...
...
@@ -118,8 +118,7 @@ export default {
},
mutationVariables
()
{
return
{
fullPath
:
this
.
projectFullPath
,
...(
this
.
isEdit
?
{
id
:
this
.
profile
.
id
}
:
{}),
...(
this
.
isEdit
?
{
id
:
this
.
profile
.
id
}
:
{
fullPath
:
this
.
projectFullPath
}),
...
serializeFormObject
(
this
.
form
.
fields
),
};
},
...
...
ee/app/assets/javascripts/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_profile_form.vue
View file @
8046d377
...
...
@@ -141,8 +141,7 @@ export default {
}
=
serializeFormObject
(
this
.
form
.
fields
);
return
{
fullPath
:
this
.
projectFullPath
,
...(
this
.
isEdit
?
{
id
:
this
.
profile
.
id
}
:
{}),
...(
this
.
isEdit
?
{
id
:
this
.
profile
.
id
}
:
{
fullPath
:
this
.
projectFullPath
}),
profileName
,
targetUrl
,
targetType
,
...
...
ee/spec/frontend/on_demand_scans_form/components/on_demand_scans_form_spec.js
View file @
8046d377
...
...
@@ -428,7 +428,6 @@ describe('OnDemandScansForm', () => {
description
:
'
Tests for SQL injections
'
,
dastScannerProfileId
:
passiveScannerProfile
.
id
,
dastSiteProfileId
:
nonValidatedSiteProfile
.
id
,
fullPath
:
projectPath
,
runAfterUpdate
:
runAfter
,
},
},
...
...
ee/spec/frontend/security_configuration/dast_profiles/dast_scanner_profiles_form/components/dast_scanner_profiles_form_spec.js
View file @
8046d377
...
...
@@ -120,9 +120,9 @@ describe('DastScannerProfileForm', () => {
});
describe
.
each
`
title | profile | mutation | mutationVars | mutationKind
${
'
New scanner profile
'
}
|
${{}}
|
$
{
dastScannerProfileCreateMutation
}
|
${{
}}
|
$
{
'
dastScannerProfileCreate
'
}
${
'
Edit scanner profile
'
}
|
${
defaultProfile
}
|
${
dastScannerProfileUpdateMutation
}
|
${{
id
:
defaultProfile
.
id
}
} |
${
'
dastScannerProfileUpdate
'
}
title | profile | mutation | mutationVars
| mutationKind
${
'
New scanner profile
'
}
|
${{}}
|
$
{
dastScannerProfileCreateMutation
}
|
${{
fullPath
:
projectFullPath
}
}
|
${
'
dastScannerProfileCreate
'
}
${
'
Edit scanner profile
'
}
|
${
defaultProfile
}
|
${
dastScannerProfileUpdateMutation
}
|
${{
id
:
defaultProfile
.
id
}
}
|
${
'
dastScannerProfileUpdate
'
}
`
(
'
$title
'
,
({
profile
,
title
,
mutation
,
mutationVars
,
mutationKind
})
=>
{
beforeEach
(()
=>
{
createComponent
({
...
...
@@ -155,7 +155,6 @@ describe('DastScannerProfileForm', () => {
profileName
,
spiderTimeout
,
targetTimeout
,
fullPath
:
projectFullPath
,
scanType
,
useAjaxSpider
,
showDebugMessages
,
...
...
ee/spec/frontend/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_profile_form_spec.js
View file @
8046d377
...
...
@@ -186,9 +186,9 @@ describe('DastSiteProfileForm', () => {
});
describe
.
each
`
title | profile | mutationVars | mutation | mutationKind
${
'
New site profile
'
}
|
${{}}
|
$
{{
}}
|
$
{
dastSiteProfileCreateMutation
}
|
${
'
dastSiteProfileCreate
'
}
${
'
Edit site profile
'
}
|
${
siteProfileOne
}
|
${{
id
:
siteProfileOne
.
id
}
} |
${
dastSiteProfileUpdateMutation
}
|
${
'
dastSiteProfileUpdate
'
}
title | profile | mutationVars
| mutation | mutationKind
${
'
New site profile
'
}
|
${{}}
|
$
{{
fullPath
:
projectFullPath
}
}
|
${
dastSiteProfileCreateMutation
}
|
${
'
dastSiteProfileCreate
'
}
${
'
Edit site profile
'
}
|
${
siteProfileOne
}
|
${{
id
:
siteProfileOne
.
id
}
}
|
${
dastSiteProfileUpdateMutation
}
|
${
'
dastSiteProfileUpdate
'
}
`
(
'
$title
'
,
({
profile
,
mutationVars
,
mutation
,
mutationKind
})
=>
{
beforeEach
(()
=>
{
createComponent
({
...
...
@@ -208,7 +208,6 @@ describe('DastSiteProfileForm', () => {
expect
(
baseDastProfileForm
.
props
(
'
mutationVariables
'
)).
toEqual
({
profileName
,
targetUrl
,
fullPath
:
projectFullPath
,
excludedUrls
:
siteProfileOne
.
excludedUrls
,
requestHeaders
,
targetType
:
'
API
'
,
...
...
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