diff --git a/ee/app/controllers/groups/dependencies_controller.rb b/ee/app/controllers/groups/dependencies_controller.rb index 24f65a0cc5f302287bb94da3e789f21064b533ae..74d4740caaa1f3f1f304215f9e0fe6c59e4cf26d 100644 --- a/ee/app/controllers/groups/dependencies_controller.rb +++ b/ee/app/controllers/groups/dependencies_controller.rb @@ -6,7 +6,6 @@ class DependenciesController < Groups::ApplicationController before_action only: :index do push_frontend_feature_flag(:group_level_dependencies_filtering_by_packager, group) - push_frontend_feature_flag(:group_level_dependencies_filtering_by_component, group) end before_action :authorize_read_dependency_list! diff --git a/ee/app/finders/sbom/aggregations_finder.rb b/ee/app/finders/sbom/aggregations_finder.rb index 6be7e63a7d6d91b559e5b53004cc89ee23e9cfd3..2b4c72e1e53a7df5f6595f525caee486f4c0e91d 100644 --- a/ee/app/finders/sbom/aggregations_finder.rb +++ b/ee/app/finders/sbom/aggregations_finder.rb @@ -103,14 +103,12 @@ def filter_by_licences(relation) end def filter_by_component_ids(relation) - return relation if Feature.disabled?(:group_level_dependencies_filtering_by_component, namespace) return relation unless params[:component_ids].present? relation.filter_by_component_ids(params[:component_ids]) end def filter_by_component_names(relation) - return relation if Feature.disabled?(:group_level_dependencies_filtering_by_component, namespace) return relation unless params[:component_names].present? relation.filter_by_component_names(params[:component_names]) diff --git a/ee/config/feature_flags/wip/group_level_dependencies_filtering_by_component.yml b/ee/config/feature_flags/wip/group_level_dependencies_filtering_by_component.yml deleted file mode 100644 index 37a3a037cde2803cf443f392b3b1a63242ea3b73..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/wip/group_level_dependencies_filtering_by_component.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: group_level_dependencies_filtering_by_component -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/454305 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161932 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/454589 -milestone: '16.4' -group: group::threat insights -type: wip -default_enabled: false diff --git a/ee/spec/finders/sbom/aggregations_finder_spec.rb b/ee/spec/finders/sbom/aggregations_finder_spec.rb index 1a663248f92136402e72878a14ea87e261e533de..2b4c3ad85b07c6aeba91d468fc711f91b26ee89a 100644 --- a/ee/spec/finders/sbom/aggregations_finder_spec.rb +++ b/ee/spec/finders/sbom/aggregations_finder_spec.rb @@ -202,20 +202,8 @@ def occurrence(name:, severity:, traits: []) let(:params) { { component_ids: [component_1.id, component_2.id] } } - context 'when feature flag is enabled' do - it 'returns only matching Sbom::Occurrences' do - expect(execute.to_a).to match_array([occurrence_1, occurrence_2]) - end - end - - context 'when feature flag is disabled' do - before do - stub_feature_flags(group_level_dependencies_filtering_by_component: false) - end - - it 'returns the original relation' do - expect(execute.to_a).to match_array(target_occurrences + [occurrence_1, occurrence_2]) - end + it 'returns only matching Sbom::Occurrences' do + expect(execute.to_a).to match_array([occurrence_1, occurrence_2]) end end @@ -238,20 +226,8 @@ def occurrence(name:, severity:, traits: []) let(:params) { { component_names: [component_1.name] } } - context 'when feature flag is enabled' do - it 'returns only matching Sbom::Occurrences' do - expect(execute.to_a).to match_array([occurrence_1]) - end - end - - context 'when feature flag is disabled' do - before do - stub_feature_flags(group_level_dependencies_filtering_by_component: false) - end - - it 'returns the original relation' do - expect(execute.to_a).to match_array(target_occurrences + [occurrence_1, occurrence_2]) - end + it 'returns only matching Sbom::Occurrences' do + expect(execute.to_a).to match_array([occurrence_1]) end end