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
7d8ac5e2
Commit
7d8ac5e2
authored
Dec 02, 2021
by
Thiago Figueiró
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag `create_vulnerabilities_via_api`
Changelog: changed
parent
cd84971d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
172 additions
and
257 deletions
+172
-257
config/feature_flags/development/create_vulnerabilities_via_api.yml
...ture_flags/development/create_vulnerabilities_via_api.yml
+0
-8
ee/app/graphql/mutations/vulnerabilities/create.rb
ee/app/graphql/mutations/vulnerabilities/create.rb
+0
-2
ee/app/services/vulnerabilities/manually_create_service.rb
ee/app/services/vulnerabilities/manually_create_service.rb
+0
-4
ee/spec/graphql/mutations/vulnerabilities/create_spec.rb
ee/spec/graphql/mutations/vulnerabilities/create_spec.rb
+48
-64
ee/spec/services/vulnerabilities/manually_create_service_spec.rb
.../services/vulnerabilities/manually_create_service_spec.rb
+124
-179
No files found.
config/feature_flags/development/create_vulnerabilities_via_api.yml
deleted
100644 → 0
View file @
cd84971d
---
name
:
create_vulnerabilities_via_api
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68158
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/338694
milestone
:
'
14.3'
type
:
development
group
:
group::threat insights
default_enabled
:
true
ee/app/graphql/mutations/vulnerabilities/create.rb
View file @
7d8ac5e2
...
@@ -73,8 +73,6 @@ module Mutations
...
@@ -73,8 +73,6 @@ module Mutations
def
resolve
(
**
attributes
)
def
resolve
(
**
attributes
)
project
=
authorized_find!
(
id:
attributes
.
fetch
(
:project
))
project
=
authorized_find!
(
id:
attributes
.
fetch
(
:project
))
raise
Gitlab
::
Graphql
::
Errors
::
ResourceNotAvailable
,
'Feature disabled'
unless
Feature
.
enabled?
(
:create_vulnerabilities_via_api
,
project
,
default_enabled: :yaml
)
params
=
build_vulnerability_params
(
attributes
)
params
=
build_vulnerability_params
(
attributes
)
result
=
::
Vulnerabilities
::
ManuallyCreateService
.
new
(
result
=
::
Vulnerabilities
::
ManuallyCreateService
.
new
(
...
...
ee/app/services/vulnerabilities/manually_create_service.rb
View file @
7d8ac5e2
...
@@ -17,10 +17,6 @@ module Vulnerabilities
...
@@ -17,10 +17,6 @@ module Vulnerabilities
end
end
def
execute
def
execute
unless
Feature
.
enabled?
(
:create_vulnerabilities_via_api
,
@project
,
default_enabled: :yaml
)
return
ServiceResponse
.
error
(
message:
"create_vulnerabilities_via_api feature flag is not enabled for this project"
)
end
raise
Gitlab
::
Access
::
AccessDeniedError
unless
authorized?
raise
Gitlab
::
Access
::
AccessDeniedError
unless
authorized?
timestamps_dont_match_state_message
=
match_state_fields_with_state
timestamps_dont_match_state_message
=
match_state_fields_with_state
...
...
ee/spec/graphql/mutations/vulnerabilities/create_spec.rb
View file @
7d8ac5e2
...
@@ -77,21 +77,6 @@ RSpec.describe Mutations::Vulnerabilities::Create do
...
@@ -77,21 +77,6 @@ RSpec.describe Mutations::Vulnerabilities::Create do
let
(
:project_gid
)
{
GitlabSchema
.
id_from_object
(
project
)
}
let
(
:project_gid
)
{
GitlabSchema
.
id_from_object
(
project
)
}
context
'when feature flag is disabled'
do
before
do
stub_feature_flags
(
create_vulnerabilities_via_api:
false
)
end
it
'raises an error'
do
expect
{
subject
}.
to
raise_error
(
Gitlab
::
Graphql
::
Errors
::
ResourceNotAvailable
)
end
end
context
'when feature flag is enabled'
do
before
do
stub_feature_flags
(
create_vulnerabilities_via_api:
project
)
end
it
'returns the created vulnerability'
do
it
'returns the created vulnerability'
do
expect
(
mutated_vulnerability
).
to
be_detected
expect
(
mutated_vulnerability
).
to
be_detected
expect
(
mutated_vulnerability
.
description
).
to
eq
(
attributes
.
dig
(
:description
))
expect
(
mutated_vulnerability
.
description
).
to
eq
(
attributes
.
dig
(
:description
))
...
@@ -152,5 +137,4 @@ RSpec.describe Mutations::Vulnerabilities::Create do
...
@@ -152,5 +137,4 @@ RSpec.describe Mutations::Vulnerabilities::Create do
end
end
end
end
end
end
end
end
end
ee/spec/services/vulnerabilities/manually_create_service_spec.rb
View file @
7d8ac5e2
...
@@ -18,60 +18,6 @@ RSpec.describe Vulnerabilities::ManuallyCreateService do
...
@@ -18,60 +18,6 @@ RSpec.describe Vulnerabilities::ManuallyCreateService do
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
end
end
context
'when feature flag is disabled'
do
before
do
stub_feature_flags
(
create_vulnerabilities_via_api:
false
)
end
let
(
:scanner_attributes
)
do
{
id:
"my-custom-scanner"
,
name:
"My Custom Scanner"
,
url:
"https://superscanner.com"
,
vendor:
vendor_attributes
,
version:
"21.37.00"
}
end
let
(
:vendor_attributes
)
do
{
name:
"Custom Scanner Vendor"
}
end
let
(
:identifier_attributes
)
do
{
name:
"Test identifier 1"
,
url:
"https://test.com"
}
end
let
(
:params
)
do
{
vulnerability:
{
name:
"Test vulnerability"
,
state:
"detected"
,
severity:
"unknown"
,
confidence:
"unknown"
,
identifiers:
[
identifier_attributes
],
scanner:
scanner_attributes
,
solution:
"rm -rf --no-preserve-root /"
}
}
end
it
'returns an error'
do
result
=
subject
expect
(
result
.
success?
).
to
be_falsey
expect
(
subject
.
message
).
to
match
(
/create_vulnerabilities_via_api feature flag is not enabled for this project/
)
end
end
context
'when feature flag is enabled'
do
before
do
stub_feature_flags
(
create_vulnerabilities_via_api:
project
)
end
context
'with valid parameters'
do
context
'with valid parameters'
do
let
(
:scanner_attributes
)
do
let
(
:scanner_attributes
)
do
{
{
...
@@ -274,7 +220,6 @@ RSpec.describe Vulnerabilities::ManuallyCreateService do
...
@@ -274,7 +220,6 @@ RSpec.describe Vulnerabilities::ManuallyCreateService do
end
end
end
end
end
end
end
context
'when user does not have rights to dismiss a vulnerability'
do
context
'when user does not have rights to dismiss a vulnerability'
do
let
(
:params
)
{
{}
}
let
(
:params
)
{
{}
}
...
...
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