diff --git a/ee/elastic/docs/20230823154049_add_schema_version_to_merge_request.yml b/ee/elastic/docs/20230823154049_add_schema_version_to_merge_request.yml index d1e9a6e25c26769d2dfc10505699bf4bd6e49209..0326514bbd3255aa5655101075c025ede45ecf5f 100644 --- a/ee/elastic/docs/20230823154049_add_schema_version_to_merge_request.yml +++ b/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' diff --git a/ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb b/ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb index 0d54655b70fef9803e5a54a307da65c228ced408..48a151c5b4727848b4549eb054751253c39ac44f 100644 --- a/ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb +++ b/ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb @@ -15,3 +15,5 @@ def new_mappings } end end + +AddSchemaVersionToMergeRequest.prepend ::Elastic::MigrationObsolete diff --git a/ee/lib/elastic/latest/merge_request_instance_proxy.rb b/ee/lib/elastic/latest/merge_request_instance_proxy.rb index 5e46ec9ee385e4cf5fc030e0c90ac75d33d2c23c..00608c3b560f183d3a4ec77cdb73a314372002fe 100644 --- a/ee/lib/elastic/latest/merge_request_instance_proxy.rb +++ b/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) diff --git a/ee/spec/elastic/migrate/20230823154049_add_schema_version_to_merge_request_spec.rb b/ee/spec/elastic/migrate/20230823154049_add_schema_version_to_merge_request_spec.rb index 3d8994d87999b6a43a26e55839105671003646d9..b46bd93c4af6e2591bb2474fe7f22f5d0cd2ff10 100644 --- a/ee/spec/elastic/migrate/20230823154049_add_schema_version_to_merge_request_spec.rb +++ b/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 diff --git a/ee/spec/models/concerns/elastic/merge_request_spec.rb b/ee/spec/models/concerns/elastic/merge_request_spec.rb index 6ab6a7bbb239901f1a307e7ef5e35f74a1476e1b..f50c2f3b6b36db21134341bee036baeb74e16e8d 100644 --- a/ee/spec/models/concerns/elastic/merge_request_spec.rb +++ b/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'))