From acae7503da176e5c61e6824c4ea4bafd0c6f0856 Mon Sep 17 00:00:00 2001
From: Tetiana Chupryna <tchupryna@gitlab.com>
Date: Tue, 14 Dec 2021 20:47:33 +0200
Subject: [PATCH] Address review comments
---
.../ee/projects/security/configuration_presenter.rb | 5 +++++
ee/lib/ee/gitlab/security/scan_configuration.rb | 9 +++++----
.../lib/ee/gitlab/security/scan_configuration_spec.rb | 4 +++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ee/app/presenters/ee/projects/security/configuration_presenter.rb b/ee/app/presenters/ee/projects/security/configuration_presenter.rb
index 5d03e71d879d9..611a51a676fbe 100644
--- a/ee/app/presenters/ee/projects/security/configuration_presenter.rb
+++ b/ee/app/presenters/ee/projects/security/configuration_presenter.rb
@@ -4,12 +4,16 @@ module EE
module Projects
module Security
module ConfigurationPresenter
+ extend ::Gitlab::Utils::Override
+
private
+ override :can_toggle_autofix
def can_toggle_autofix
try(:auto_fix_permission)
end
+ override :autofix_enabled
def autofix_enabled
{
dependency_scanning: project_settings&.auto_fix_dependency_scanning,
@@ -17,6 +21,7 @@ def autofix_enabled
}
end
+ override :auto_fix_user_path
def auto_fix_user_path
'/' # TODO: real link will be updated with https://gitlab.com/gitlab-org/gitlab/-/issues/348463
end
diff --git a/ee/lib/ee/gitlab/security/scan_configuration.rb b/ee/lib/ee/gitlab/security/scan_configuration.rb
index 181755bda3271..0c1ff711c4543 100644
--- a/ee/lib/ee/gitlab/security/scan_configuration.rb
+++ b/ee/lib/ee/gitlab/security/scan_configuration.rb
@@ -4,20 +4,21 @@ module EE
module Gitlab
module Security
module ScanConfiguration
+ extend ::Gitlab::Utils::Override
+
+ override :available?
def available?
super || project.licensed_feature_available?(type)
end
- def configured?
- configured
- end
-
+ override :configuration_path
def configuration_path
configurable_scans[type] if available? || always_available?
end
private
+ override :configurable_scans
def configurable_scans
strong_memoize(:configurable_scans) do
{
diff --git a/ee/spec/lib/ee/gitlab/security/scan_configuration_spec.rb b/ee/spec/lib/ee/gitlab/security/scan_configuration_spec.rb
index e8300ab92e45f..4c585d4832d99 100644
--- a/ee/spec/lib/ee/gitlab/security/scan_configuration_spec.rb
+++ b/ee/spec/lib/ee/gitlab/security/scan_configuration_spec.rb
@@ -19,7 +19,9 @@
stub_licensed_features(sast: false)
end
- it { is_expected.to be_truthy }
+ it 'core scanners (SAST, Secret Detection) are always available' do
+ is_expected.to be_truthy
+ end
end
context 'with licensed scanner that is available' do
--
GitLab