Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 18 deletions

diff --git a/lib/gitlab/ci/parsers/security/common.rb b/lib/gitlab/ci/parsers/security/common.rb
index 7baae2f53d7..2d8a182e808 100644
--- a/lib/gitlab/ci/parsers/security/common.rb
+++ b/lib/gitlab/ci/parsers/security/common.rb
@@ -43,26 +43,25 @@ module Gitlab
           attr_reader :json_data, :report, :validate
 
           def valid?
-            if Feature.enabled?(:show_report_validation_warnings, default_enabled: :yaml)
-              # We want validation to happen regardless of VALIDATE_SCHEMA CI variable
-              schema_validation_passed = schema_validator.valid?
-
-              if validate
-                schema_validator.errors.each { |error| report.add_error('Schema', error) } unless schema_validation_passed
-
-                schema_validation_passed
-              else
-                # We treat all schema validation errors as warnings
-                schema_validator.errors.each { |error| report.add_warning('Schema', error) }
-
-                true
-              end
+            # We want validation to happen regardless of VALIDATE_SCHEMA
+            # 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?
+
+            if validate
+              schema_validator.errors.each { |error| report.add_error('Schema', error) } unless schema_validation_passed
+
+              schema_validation_passed
             else
-              return true if !validate || schema_validator.valid?
-
-              schema_validator.errors.each { |error| report.add_error('Schema', error) }
+              # We treat all schema validation errors as warnings
+              schema_validator.errors.each { |error| report.add_warning('Schema', error) }
 
-              false
+              true
             end
           end