From f0a19caa06bcc6d7c9179aca577f6c6a62b3b531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zaj=C4=85c?= <mzajac@gitlab.com>
Date: Tue, 19 Apr 2022 15:03:21 +0200
Subject: [PATCH] Globally enable enforce_security_report_validation
Changelog: changed
EE: true
---
.../development/enforce_security_report_validation.yml | 2 +-
ee/app/models/ee/ci/build.rb | 2 +-
lib/gitlab/ci/parsers/security/validators/schema_validator.rb | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/feature_flags/development/enforce_security_report_validation.yml b/config/feature_flags/development/enforce_security_report_validation.yml
index 0478033c55b05c..2a8d3e32ec4252 100644
--- a/config/feature_flags/development/enforce_security_report_validation.yml
+++ b/config/feature_flags/development/enforce_security_report_validation.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351000
milestone: '14.9'
type: development
group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/ee/app/models/ee/ci/build.rb b/ee/app/models/ee/ci/build.rb
index 0649e8c4d47b84..047aae01d219f4 100644
--- a/ee/app/models/ee/ci/build.rb
+++ b/ee/app/models/ee/ci/build.rb
@@ -196,7 +196,7 @@ def variable_value(key, default = nil)
end
def validate_schema?
- if ::Feature.enabled?(:enforce_security_report_validation, project)
+ if ::Feature.enabled?(:enforce_security_report_validation, project, default_enabled: :yaml)
true
else
variables[VALIDATE_SCHEMA_VARIABLE_NAME]&.value&.casecmp?('true')
diff --git a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
index cef029bd749ca9..0accf1be970f28 100644
--- a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
+++ b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
@@ -110,7 +110,7 @@ def populate_errors
log_warnings(problem_type: 'schema_validation_fails') unless schema_validation_errors.empty?
- if Feature.enabled?(:enforce_security_report_validation, @project)
+ if Feature.enabled?(:enforce_security_report_validation, @project, default_enabled: :yaml)
@errors += schema_validation_errors
else
@warnings += schema_validation_errors
@@ -147,7 +147,7 @@ def log_warnings(problem_type:)
def add_unsupported_report_version_message
log_warnings(problem_type: 'using_unsupported_schema_version')
- if Feature.enabled?(:enforce_security_report_validation, @project)
+ if Feature.enabled?(:enforce_security_report_validation, @project, default_enabled: :yaml)
handle_unsupported_report_version(treat_as: :error)
else
handle_unsupported_report_version(treat_as: :warning)
--
GitLab