Merge branch 'mark_obsolete-20230823154049--add-schema-version-to-merge-request' into 'master'

Mark 20230823154049 as obsolete

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



Merged-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Co-authored-by: Terri Chu <tchu@gitlab.com>

ee/elastic/docs/20230823154049_add_schema_version_to_merge_request.yml

@@ -5,6 +5,6 @@ description: Add a schema_version field in the merge_requests Elastic mapping
 group: group::global search
 milestone: '16.4'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130068
-obsolete: false
-marked_obsolete_by_url:
-marked_obsolete_in_milestone:
+obsolete: true
+marked_obsolete_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159913
+marked_obsolete_in_milestone: '17.3'

ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb

@@ -15,3 +15,5 @@ def new_mappings
     }
   end
 end
+
+AddSchemaVersionToMergeRequest.prepend ::Elastic::MigrationObsolete

ee/lib/elastic/latest/merge_request_instance_proxy.rb

@@ -39,9 +39,7 @@ def as_indexed_json(_options = {})
 
         # Schema version. The format is Date.today.strftime('%y_%m')
         # Please update if you're changing the schema of the document
-        if ::Elastic::DataMigrationService.migration_has_finished?(:add_schema_version_to_merge_request)
-          data['schema_version'] = SCHEMA_VERSION
-        end
+        data['schema_version'] = SCHEMA_VERSION
 
         if ::Elastic::DataMigrationService.migration_has_finished?(:add_label_ids_to_merge_request)
           data['label_ids'] = target.label_ids.map(&:to_s)

ee/spec/elastic/migrate/20230823154049_add_schema_version_to_merge_request_spec.rb

@@ -3,8 +3,6 @@
 require 'spec_helper'
 require File.expand_path('ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb')
 
-RSpec.describe AddSchemaVersionToMergeRequest, :elastic, feature_category: :global_search do
-  let(:version) { 20230823154049 }
-
-  include_examples 'migration adds mapping'
+RSpec.describe AddSchemaVersionToMergeRequest, feature_category: :global_search do
+  it_behaves_like 'a deprecated Advanced Search migration', 20230823154049
 end

ee/spec/models/concerns/elastic/merge_request_spec.rb

@@ -77,11 +77,6 @@
       merge_request.project.update!(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
     end
 
-    it 'does not include schema_version if add_schema_version_to_merge_request is not finished' do
-      set_elasticsearch_migration_to :add_schema_version_to_merge_request, including: false
-      expect(merge_request.__elasticsearch__.as_indexed_json).to eq(expected_hash.except('schema_version', 'label_ids'))
-    end
-
     it 'does not include label_ids if add_label_ids_to_merge_request is not finished' do
       set_elasticsearch_migration_to :add_label_ids_to_merge_request, including: false
       expect(merge_request.__elasticsearch__.as_indexed_json).to eq(expected_hash.except('label_ids'))