Merge branch 'mark_obsolete-20240410193847--add-embedding-to-issues' into 'master'

Mark 20240410193847 as obsolete

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169314



Merged-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Reviewed-by: Changzheng Liu <cliu@gitlab.com>
Reviewed-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Co-authored-by: Changzheng Liu <cliu@gitlab.com>
Co-authored-by: Terri Chu <tchu@gitlab.com>

ee/elastic/docs/20240410193847_add_embedding_to_issues.yml

@@ -7,6 +7,6 @@ milestone: '17.0'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149209
 skippable: true
 skip_condition: Must be on Elasticsearch 8+
-obsolete: false
-marked_obsolete_by_url:
-marked_obsolete_in_milestone:
+obsolete: true
+marked_obsolete_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169314
+marked_obsolete_in_milestone: '17.6'

ee/elastic/migrate/20240410193847_add_embedding_to_issues.rb

@@ -23,3 +23,5 @@ def new_mappings
     }
   end
 end
+
+AddEmbeddingToIssues.prepend ::Elastic::MigrationObsolete

ee/lib/search/elastic/issue_query_builder.rb

@@ -64,7 +64,6 @@ def hybrid_issue_search?
         return false unless Feature.enabled?(:search_issues_hybrid_search)
         return false unless Feature.enabled?(:ai_global_switch, type: :ops)
         return false unless Gitlab::Saas.feature_available?(:ai_vertex_embeddings)
-        return false unless ::Elastic::DataMigrationService.migration_has_finished?(:add_embedding_to_issues)
 
         project = Project.id_in(options[:project_ids])&.first
         user = options[:current_user]

ee/spec/elastic/migrate/20240410193847_add_embedding_to_issues_spec.rb

@@ -4,65 +4,5 @@
 require File.expand_path('ee/elastic/migrate/20240410193847_add_embedding_to_issues.rb')
 
 RSpec.describe AddEmbeddingToIssues, feature_category: :global_search do
-  let(:version) { 20240410193847 }
-  let(:migration) { described_class.new(version) }
-  let(:helper) { Gitlab::Elastic::Helper.default }
-
-  before do
-    allow(Gitlab::Elastic::Helper).to receive(:default).and_return(helper)
-    allow(migration).to receive(:helper).and_return(helper)
-  end
-
-  describe 'migration', :elastic, :sidekiq_inline do
-    before do
-      skip 'migration is skipped' if migration.skip_migration?
-    end
-
-    describe '.migrate' do
-      describe 'migration process' do
-        before do
-          allow(helper).to receive(:get_mapping).and_return({})
-        end
-
-        it 'updates the issues index mappings' do
-          expect(helper).to receive(:update_mapping)
-
-          migration.migrate
-        end
-      end
-    end
-
-    describe '.completed?' do
-      context 'when mapping has not been updated' do
-        before do
-          allow(helper).to receive(:get_mapping).and_return({})
-        end
-
-        specify { expect(migration).not_to be_completed }
-      end
-    end
-  end
-
-  describe 'skip_migration?' do
-    before do
-      allow(helper).to receive(:vectors_supported?).and_return(vectors_supported)
-      described_class.skip_if -> { !helper.vectors_supported?(:elasticsearch) }
-    end
-
-    context 'if vectors are supported' do
-      let(:vectors_supported) { true }
-
-      it 'returns false' do
-        expect(migration.skip_migration?).to be_falsey
-      end
-    end
-
-    context 'if vectors are not supported' do
-      let(:vectors_supported) { false }
-
-      it 'returns true' do
-        expect(migration.skip_migration?).to be_truthy
-      end
-    end
-  end
+  it_behaves_like 'a deprecated Advanced Search migration', 20240410193847
 end

ee/spec/elastic_integration/ingestion_pipeline_spec.rb

 # frozen_string_literal: true
 
 require 'spec_helper'
-require File.expand_path('ee/elastic/migrate/20240410193847_add_embedding_to_issues.rb')
 
 RSpec.describe 'Elastic Ingestion Pipeline', :sidekiq_inline, feature_category: :global_search do
   let_it_be(:user) { create(:user) }

ee/spec/lib/search/elastic/issue_query_builder_spec.rb

@@ -95,8 +95,6 @@
         allow(user).to receive(:any_group_with_ai_available?).and_return(true)
         allow(Gitlab::Llm::VertexAi::Embeddings::Text).to receive(:new).and_return(embedding_service)
         allow(embedding_service).to receive(:execute).and_return(mock_embedding)
-        allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?)
-          .with(:add_embedding_to_issues).and_return(true)
       end
 
       shared_examples 'without hybrid search query' do
@@ -158,8 +156,6 @@
             stub_feature_flags(ai_global_switch: ai_global_switch)
             stub_feature_flags(elasticsearch_issue_embedding: issue_embedding)
             allow(Gitlab::Saas).to receive(:feature_available?).and_return(ai_available)
-            allow(::Elastic::DataMigrationService).to receive(:migration_has_finished?)
-              .with(:add_embedding_to_issues).and_return(migration_done)
           end
 
           it_behaves_like 'without hybrid search query'