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
f2ced743
Commit
f2ced743
authored
Mar 14, 2022
by
Michał Zając
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup show_report_validation_warnings flag
Changelog: other
parent
964c59c0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
76 additions
and
155 deletions
+76
-155
config/feature_flags/development/show_report_validation_warnings.yml
...ure_flags/development/show_report_validation_warnings.yml
+0
-8
lib/gitlab/ci/parsers/security/common.rb
lib/gitlab/ci/parsers/security/common.rb
+17
-18
spec/lib/gitlab/ci/parsers/security/common_spec.rb
spec/lib/gitlab/ci/parsers/security/common_spec.rb
+59
-129
No files found.
config/feature_flags/development/show_report_validation_warnings.yml
deleted
100644 → 0
View file @
964c59c0
---
name
:
show_report_validation_warnings
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80930
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/353125
milestone
:
'
14.9'
type
:
development
group
:
group::threat insights
default_enabled
:
true
lib/gitlab/ci/parsers/security/common.rb
View file @
f2ced743
...
@@ -43,8 +43,14 @@ module Gitlab
...
@@ -43,8 +43,14 @@ module Gitlab
attr_reader
:json_data
,
:report
,
:validate
attr_reader
:json_data
,
:report
,
:validate
def
valid?
def
valid?
if
Feature
.
enabled?
(
:show_report_validation_warnings
,
default_enabled: :yaml
)
# We want validation to happen regardless of VALIDATE_SCHEMA
# We want validation to happen regardless of VALIDATE_SCHEMA CI variable
# CI variable.
#
# Previously it controlled BOTH validation and enforcement of
# schema validation result.
#
# After 15.0 we will enforce schema validation by default
# See: https://gitlab.com/groups/gitlab-org/-/epics/6968
schema_validation_passed
=
schema_validator
.
valid?
schema_validation_passed
=
schema_validator
.
valid?
if
validate
if
validate
...
@@ -57,13 +63,6 @@ module Gitlab
...
@@ -57,13 +63,6 @@ module Gitlab
true
true
end
end
else
return
true
if
!
validate
||
schema_validator
.
valid?
schema_validator
.
errors
.
each
{
|
error
|
report
.
add_error
(
'Schema'
,
error
)
}
false
end
end
end
def
schema_validator
def
schema_validator
...
...
spec/lib/gitlab/ci/parsers/security/common_spec.rb
View file @
f2ced743
...
@@ -38,11 +38,6 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
...
@@ -38,11 +38,6 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
allow
(
validator_class
).
to
receive
(
:new
).
and_call_original
allow
(
validator_class
).
to
receive
(
:new
).
and_call_original
end
end
context
'when show_report_validation_warnings is enabled'
do
before
do
stub_feature_flags
(
show_report_validation_warnings:
true
)
end
context
'when the validate flag is set to `false`'
do
context
'when the validate flag is set to `false`'
do
let
(
:validate
)
{
false
}
let
(
:validate
)
{
false
}
let
(
:valid?
)
{
false
}
let
(
:valid?
)
{
false
}
...
@@ -144,71 +139,6 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
...
@@ -144,71 +139,6 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
end
end
end
end
context
'when show_report_validation_warnings is disabled'
do
before
do
stub_feature_flags
(
show_report_validation_warnings:
false
)
end
context
'when the validate flag is set as `false`'
do
let
(
:validate
)
{
false
}
it
'does not run the validation logic'
do
parse_report
expect
(
validator_class
).
not_to
have_received
(
:new
)
end
end
context
'when the validate flag is set as `true`'
do
let
(
:validate
)
{
true
}
let
(
:valid?
)
{
false
}
before
do
allow_next_instance_of
(
validator_class
)
do
|
instance
|
allow
(
instance
).
to
receive
(
:valid?
).
and_return
(
valid?
)
allow
(
instance
).
to
receive
(
:errors
).
and_return
([
'foo'
])
end
allow
(
parser
).
to
receive_messages
(
create_scanner:
true
,
create_scan:
true
)
end
it
'instantiates the validator with correct params'
do
parse_report
expect
(
validator_class
).
to
have_received
(
:new
).
with
(
report
.
type
,
{},
report
.
version
)
end
context
'when the report data is not valid according to the schema'
do
it
'adds errors to the report'
do
expect
{
parse_report
}.
to
change
{
report
.
errors
}.
from
([]).
to
([{
message:
'foo'
,
type:
'Schema'
}])
end
it
'does not try to create report entities'
do
parse_report
expect
(
parser
).
not_to
have_received
(
:create_scanner
)
expect
(
parser
).
not_to
have_received
(
:create_scan
)
end
end
context
'when the report data is valid according to the schema'
do
let
(
:valid?
)
{
true
}
it
'does not add errors to the report'
do
expect
{
parse_report
}.
not_to
change
{
report
.
errors
}.
from
([])
end
it
'keeps the execution flow as normal'
do
parse_report
expect
(
parser
).
to
have_received
(
:create_scanner
)
expect
(
parser
).
to
have_received
(
:create_scan
)
end
end
end
end
end
context
'report parsing'
do
context
'report parsing'
do
before
do
before
do
artifact
.
each_blob
{
|
blob
|
described_class
.
parse!
(
blob
,
report
,
vulnerability_finding_signatures_enabled
)
}
artifact
.
each_blob
{
|
blob
|
described_class
.
parse!
(
blob
,
report
,
vulnerability_finding_signatures_enabled
)
}
...
...
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