From 324761643fcf9ed1d72baee330cdba8db649fe2e Mon Sep 17 00:00:00 2001
From: Michael Becker <11881043-wandering_person@users.noreply.gitlab.com>
Date: Thu, 30 Nov 2023 18:06:37 +0700
Subject: [PATCH] [Feature flag] Remove `group_vulnerabilities_optimized_query`
FF
A modified query was created for the group-level vulnerability report
export to resolve [time-out issues][0] for large exports
The new query resolves the timeout issues. However, for our larger
customers the export will still fail for other reasons related to a
large group
Further work will need to be done to completely unblock large
vulnerability report exports
resolves: https://gitlab.com/gitlab-org/gitlab/-/issues/426394
[0]:https://gitlab.com/gitlab-org/gitlab/-/issues/392885
[1]:https://gitlab.com/gitlab-org/gitlab/-/issues/432548
EE: true
Changelog: changed
---
.../services/vulnerability_exports/export_service.rb | 2 +-
.../group_vulnerabilities_optimized_query.yml | 8 --------
.../vulnerability_exports/export_service_spec.rb | 11 -----------
3 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml
diff --git a/ee/app/services/vulnerability_exports/export_service.rb b/ee/app/services/vulnerability_exports/export_service.rb
index b14113abfdc0..7a3c5ab3ce25 100644
--- a/ee/app/services/vulnerability_exports/export_service.rb
+++ b/ee/app/services/vulnerability_exports/export_service.rb
@@ -56,7 +56,7 @@ def exporter
end
def vulnerabilities
- if exportable.is_a?(Group) && ::Feature.enabled?(:group_vulnerabilities_optimized_query, exportable)
+ if exportable.is_a?(Group)
scope = ::Vulnerability.unscoped # rubocop:disable CodeReuse/ActiveRecord
opts = {
diff --git a/ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml b/ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml
deleted file mode 100644
index 55c1a13e2c45..000000000000
--- a/ee/config/feature_flags/development/group_vulnerabilities_optimized_query.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_vulnerabilities_optimized_query
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127180
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426394
-milestone: '16.5'
-type: development
-group: group::threat insights
-default_enabled: false
diff --git a/ee/spec/services/vulnerability_exports/export_service_spec.rb b/ee/spec/services/vulnerability_exports/export_service_spec.rb
index a6cb0adaf508..c521735beb27 100644
--- a/ee/spec/services/vulnerability_exports/export_service_spec.rb
+++ b/ee/spec/services/vulnerability_exports/export_service_spec.rb
@@ -137,17 +137,6 @@
expect(rows.count).to eq(group.vulnerabilities.without_archived_projects.count)
end
-
- context 'when group_vulnerabilities_optimized_query is disabled' do
- before do
- stub_feature_flags(group_vulnerabilities_optimized_query: false)
- end
-
- it 'delegates vulnerability lookup to the finder' do
- export
- expect(mock_vulnerability_finder_service_object).to have_received(:execute)
- end
- end
end
end
end
--
GitLab