From 861caccbf97c4f2cc48ea2be078b45f0ca7b8aeb Mon Sep 17 00:00:00 2001
From: Siddharth Dungarwal <sdungarwal@gitlab.com>
Date: Tue, 21 Nov 2023 20:23:41 +0000
Subject: [PATCH] Remove advanced_epic_search flag
Changelog: changed
---
.../feature_flags/ops/global_search_epics_tab.yml | 2 +-
ee/app/models/ee/epic.rb | 2 --
.../services/concerns/search/elasticsearchable.rb | 1 -
.../development/advanced_epic_search.yml | 8 --------
.../development/elastic_index_epics.yml | 8 --------
ee/spec/elastic_integration/epic_index_spec.rb | 1 -
ee/spec/models/epic_spec.rb | 10 ----------
.../concerns/search/elasticsearchable_spec.rb | 14 +++++---------
8 files changed, 6 insertions(+), 40 deletions(-)
delete mode 100644 ee/config/feature_flags/development/advanced_epic_search.yml
delete mode 100644 ee/config/feature_flags/development/elastic_index_epics.yml
diff --git a/config/feature_flags/ops/global_search_epics_tab.yml b/config/feature_flags/ops/global_search_epics_tab.yml
index 42067e9ad9301..965f77e313301 100644
--- a/config/feature_flags/ops/global_search_epics_tab.yml
+++ b/config/feature_flags/ops/global_search_epics_tab.yml
@@ -5,4 +5,4 @@ rollout_issue_url:
milestone: '16.5'
type: ops
group: group::global search
-default_enabled: false
+default_enabled: true
diff --git a/ee/app/models/ee/epic.rb b/ee/app/models/ee/epic.rb
index c9806e2031c76..f706b55143e8e 100644
--- a/ee/app/models/ee/epic.rb
+++ b/ee/app/models/ee/epic.rb
@@ -334,8 +334,6 @@ def search(query)
end
def elasticsearch_available?
- return false unless ::Feature.enabled?(:elastic_index_epics)
-
::Elastic::DataMigrationService.migration_has_finished?(:create_epic_index)
end
diff --git a/ee/app/services/concerns/search/elasticsearchable.rb b/ee/app/services/concerns/search/elasticsearchable.rb
index 87e00531e06e0..3fd721d9dfe48 100644
--- a/ee/app/services/concerns/search/elasticsearchable.rb
+++ b/ee/app/services/concerns/search/elasticsearchable.rb
@@ -21,7 +21,6 @@ def global_elasticsearchable_scope?
def advanced_epic_search?
return true unless params[:scope] == 'epics'
- return false unless ::Feature.enabled?(:advanced_epic_search, current_user)
::Elastic::DataMigrationService.migration_has_finished?(:create_epic_index) &&
::Elastic::DataMigrationService.migration_has_finished?(:backfill_epics)
diff --git a/ee/config/feature_flags/development/advanced_epic_search.yml b/ee/config/feature_flags/development/advanced_epic_search.yml
deleted file mode 100644
index 058f525d10289..0000000000000
--- a/ee/config/feature_flags/development/advanced_epic_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: advanced_epic_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124072
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415684
-milestone: '16.3'
-type: development
-group: group::global search
-default_enabled: false
diff --git a/ee/config/feature_flags/development/elastic_index_epics.yml b/ee/config/feature_flags/development/elastic_index_epics.yml
deleted file mode 100644
index 30bef60396df7..0000000000000
--- a/ee/config/feature_flags/development/elastic_index_epics.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: elastic_index_epics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121635
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/412108
-milestone: '16.2'
-type: development
-group: group::global search
-default_enabled: true
diff --git a/ee/spec/elastic_integration/epic_index_spec.rb b/ee/spec/elastic_integration/epic_index_spec.rb
index 705ffe1e17fcc..11dbe3c3ed6b4 100644
--- a/ee/spec/elastic_integration/epic_index_spec.rb
+++ b/ee/spec/elastic_integration/epic_index_spec.rb
@@ -15,7 +15,6 @@
let(:client) { helper.client }
before do
- stub_feature_flags(elastic_index_epics: true)
allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?)
.with(:migrate_wikis_to_separate_index).and_return(false)
allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?)
diff --git a/ee/spec/models/epic_spec.rb b/ee/spec/models/epic_spec.rb
index 9d87d196cc6c8..decde9938efd5 100644
--- a/ee/spec/models/epic_spec.rb
+++ b/ee/spec/models/epic_spec.rb
@@ -1254,16 +1254,6 @@ def as_item(item)
expect(epic).to be_use_elasticsearch
end
- context 'when feature flag is disabled' do
- before do
- stub_feature_flags(elastic_index_epics: false)
- end
-
- it 'use_elasticsearch? is false' do
- expect(epic).not_to be_use_elasticsearch
- end
- end
-
context 'with elasticsearch enabled' do
before do
allow(Gitlab::CurrentSettings.current_application_settings)
diff --git a/ee/spec/services/concerns/search/elasticsearchable_spec.rb b/ee/spec/services/concerns/search/elasticsearchable_spec.rb
index 974494f121a14..8e3ef678d453d 100644
--- a/ee/spec/services/concerns/search/elasticsearchable_spec.rb
+++ b/ee/spec/services/concerns/search/elasticsearchable_spec.rb
@@ -81,19 +81,15 @@ def elasticsearchable_scope
let(:params) { { scope: 'epics' } }
- where(:advanced_epic_search_enabled, :create_epic_index_finished, :backfill_epics_finished, :result) do
- true | true | true | true
- true | true | false | false
- true | false | true | false
- true | false | false | false
- false | true | true | false
- false | false | false | false
+ where(:create_epic_index_finished, :backfill_epics_finished, :result) do
+ true | true | true
+ true | false | false
+ false | true | false
+ false | false | false
end
with_them do
it 'returns the correct result' do
- stub_feature_flags(advanced_epic_search: advanced_epic_search_enabled)
-
allow(Elastic::DataMigrationService).to receive(:migration_has_finished?)
.with(:create_epic_index).and_return(create_epic_index_finished)
--
GitLab