diff --git a/ee/elastic/docs/20230719144243_add_archived_to_main_index.yml b/ee/elastic/docs/20230719144243_add_archived_to_main_index.yml new file mode 100644 index 0000000000000000000000000000000000000000..be53a9418ac63b5bef1e43fc03f203d26cd4682f --- /dev/null +++ b/ee/elastic/docs/20230719144243_add_archived_to_main_index.yml @@ -0,0 +1,11 @@ +--- +name: AddArchivedToMainIndex +version: '20230719144243' +description: Add archived column in main index +group: group::global search +milestone: 16.3 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127008 +obsolete: false +marked_obsolete_by_url: +marked_obsolete_in_milestone: + diff --git a/ee/elastic/migrate/20230719144243_add_archived_to_main_index.rb b/ee/elastic/migrate/20230719144243_add_archived_to_main_index.rb new file mode 100644 index 0000000000000000000000000000000000000000..ce8004d21fe2661fc4f19a0e0b3cb5b38dabb188 --- /dev/null +++ b/ee/elastic/migrate/20230719144243_add_archived_to_main_index.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddArchivedToMainIndex < Elastic::Migration + include Elastic::MigrationUpdateMappingsHelper + + private + + def index_name + ::Elastic::Latest::Config.index_name + end + + def new_mappings + { + archived: { + type: 'boolean' + } + } + end +end diff --git a/ee/lib/elastic/latest/config.rb b/ee/lib/elastic/latest/config.rb index fa20c2c9a2142d5825d572a6ba4a04d674c6e571..762b9a7832f6c07fd623e518ed4bc03ce551d14c 100644 --- a/ee/lib/elastic/latest/config.rb +++ b/ee/lib/elastic/latest/config.rb @@ -179,6 +179,7 @@ module Config indexes :id, type: :keyword, index_options: 'docs', normalizer: :sha_normalizer indexes :rid, type: :keyword + indexes :archived, type: :boolean indexes :oid, type: :keyword, index_options: 'docs', normalizer: :sha_normalizer indexes :commit_sha, type: :keyword, index_options: 'docs', normalizer: :sha_normalizer indexes :path, type: :text, analyzer: :path_analyzer diff --git a/ee/spec/elastic/migrate/20230719144243_add_archived_to_main_index_spec.rb b/ee/spec/elastic/migrate/20230719144243_add_archived_to_main_index_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..658eebc367fdd28af090b15ecf36d67878c1466a --- /dev/null +++ b/ee/spec/elastic/migrate/20230719144243_add_archived_to_main_index_spec.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +require 'spec_helper' +require_relative 'migration_shared_examples' +require File.expand_path('ee/elastic/migrate/20230719144243_add_archived_to_main_index.rb') + +RSpec.describe AddArchivedToMainIndex, :elastic, :sidekiq_inline, feature_category: :global_search do + let(:version) { 20230719144243 } + + include_examples 'migration adds mapping' +end