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
a3158aa5
Commit
a3158aa5
authored
Jun 16, 2021
by
Cameron Swords
Committed by
Stan Hu
Jun 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove stages definitions from the DAST CI template
parent
49e51d0c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
121 additions
and
86 deletions
+121
-86
ee/spec/lib/ee/gitlab/ci/templates/templates_spec.rb
ee/spec/lib/ee/gitlab/ci/templates/templates_spec.rb
+6
-4
ee/spec/lib/gitlab/ci/templates/dast_gitlab_ci_yaml_spec.rb
ee/spec/lib/gitlab/ci/templates/dast_gitlab_ci_yaml_spec.rb
+97
-72
lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
+13
-6
spec/lib/gitlab/ci/templates/templates_spec.rb
spec/lib/gitlab/ci/templates/templates_spec.rb
+5
-4
No files found.
ee/spec/lib/ee/gitlab/ci/templates/templates_spec.rb
View file @
a3158aa5
...
@@ -23,13 +23,15 @@ RSpec.describe "CI YML Templates" do
...
@@ -23,13 +23,15 @@ RSpec.describe "CI YML Templates" do
end
end
context
'that support autodevops'
do
context
'that support autodevops'
do
non_autodevops_templates
=
[
exceptions
=
[
'Security/DAST-API.gitlab-ci.yml'
,
'Security/DAST.gitlab-ci.yml'
,
# DAST stage is defined inside AutoDevops yml
'Security/API-Fuzzing.gitlab-ci.yml'
'Security/DAST-API.gitlab-ci.yml'
,
# no auto-devops
'Security/API-Fuzzing.gitlab-ci.yml'
,
# no auto-devops
'Terraform.gitlab-ci.yml'
]
]
where
(
:template_name
)
do
where
(
:template_name
)
do
all_templates
-
non_autodevops_templates
-
[
"Terraform.gitlab-ci.yml"
]
all_templates
-
exceptions
end
end
with_them
do
with_them
do
...
...
ee/spec/lib/gitlab/ci/templates/dast_gitlab_ci_yaml_spec.rb
View file @
a3158aa5
...
@@ -13,12 +13,36 @@ RSpec.describe 'DAST.gitlab-ci.yml' do
...
@@ -13,12 +13,36 @@ RSpec.describe 'DAST.gitlab-ci.yml' do
let
(
:service
)
{
Ci
::
CreatePipelineService
.
new
(
project
,
user
,
ref:
pipeline_branch
)
}
let
(
:service
)
{
Ci
::
CreatePipelineService
.
new
(
project
,
user
,
ref:
pipeline_branch
)
}
let
(
:pipeline
)
{
service
.
execute!
(
:push
)
}
let
(
:pipeline
)
{
service
.
execute!
(
:push
)
}
let
(
:build_names
)
{
pipeline
.
builds
.
pluck
(
:name
)
}
let
(
:build_names
)
{
pipeline
.
builds
.
pluck
(
:name
)
}
let
(
:ci_pipeline_yaml
)
{
"stages: [
\"
dast
\"
]
\n
"
}
specify
{
expect
(
template
).
not_to
be_nil
}
context
'when ci yaml is just template'
do
before
do
before
do
stub_ci_pipeline_yaml_file
(
template
.
content
)
stub_ci_pipeline_yaml_file
(
template
.
content
)
allow_next_instance_of
(
Ci
::
BuildScheduleWorker
)
do
|
worker
|
allow_next_instance_of
(
Ci
::
BuildScheduleWorker
)
do
|
worker
|
allow
(
worker
).
to
receive
(
:perform
).
and_return
(
true
)
allow
(
worker
).
to
receive
(
:perform
).
and_return
(
true
)
end
end
allow
(
project
).
to
receive
(
:default_branch
).
and_return
(
default_branch
)
end
context
'when project has no license'
do
it
'includes no jobs'
do
expect
(
build_names
).
to
be_empty
end
end
end
context
'when stages includes dast'
do
before
do
stub_ci_pipeline_yaml_file
(
ci_pipeline_yaml
+
template
.
content
)
allow_next_instance_of
(
Ci
::
BuildScheduleWorker
)
do
|
worker
|
allow
(
worker
).
to
receive
(
:perform
).
and_return
(
true
)
end
allow
(
project
).
to
receive
(
:default_branch
).
and_return
(
default_branch
)
allow
(
project
).
to
receive
(
:default_branch
).
and_return
(
default_branch
)
end
end
...
@@ -139,4 +163,5 @@ RSpec.describe 'DAST.gitlab-ci.yml' do
...
@@ -139,4 +163,5 @@ RSpec.describe 'DAST.gitlab-ci.yml' do
end
end
end
end
end
end
end
end
end
lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
View file @
a3158aa5
# To use this template, add the following to your .gitlab-ci.yml file:
#
# include:
# template: DAST.gitlab-ci.yml
#
# You also need to add a `dast` stage to your `stages:` configuration. A sample configuration for DAST:
#
# stages:
# - build
# - test
# - deploy
# - dast
# Read more about this feature here: https://docs.gitlab.com/ee/user/application_security/dast/
# Read more about this feature here: https://docs.gitlab.com/ee/user/application_security/dast/
# Configure DAST with CI/CD variables (https://docs.gitlab.com/ee/ci/variables/README.html).
# Configure DAST with CI/CD variables (https://docs.gitlab.com/ee/ci/variables/README.html).
# List of available variables: https://docs.gitlab.com/ee/user/application_security/dast/#available-variables
# List of available variables: https://docs.gitlab.com/ee/user/application_security/dast/#available-variables
stages
:
-
build
-
test
-
deploy
-
dast
variables
:
variables
:
DAST_VERSION
:
2
DAST_VERSION
:
2
# Setting this variable will affect all Security templates
# Setting this variable will affect all Security templates
...
...
spec/lib/gitlab/ci/templates/templates_spec.rb
View file @
a3158aa5
...
@@ -27,16 +27,17 @@ RSpec.describe 'CI YML Templates' do
...
@@ -27,16 +27,17 @@ RSpec.describe 'CI YML Templates' do
end
end
context
'that support autodevops'
do
context
'that support autodevops'
do
non_autodevops_templates
=
[
exceptions
=
[
'Security/DAST-API.gitlab-ci.yml'
,
'Security/DAST.gitlab-ci.yml'
,
# DAST stage is defined inside AutoDevops yml
'Security/API-Fuzzing.gitlab-ci.yml'
'Security/DAST-API.gitlab-ci.yml'
,
# no auto-devops
'Security/API-Fuzzing.gitlab-ci.yml'
# no auto-devops
]
]
context
'when including available templates in a CI YAML configuration'
do
context
'when including available templates in a CI YAML configuration'
do
using
RSpec
::
Parameterized
::
TableSyntax
using
RSpec
::
Parameterized
::
TableSyntax
where
(
:template_name
)
do
where
(
:template_name
)
do
all_templates
-
excluded_templates
-
non_autodevops_template
s
all_templates
-
excluded_templates
-
exception
s
end
end
with_them
do
with_them
do
...
...
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