From 70e1970ecd310b76332fa028a349bdeb510dc54e Mon Sep 17 00:00:00 2001
From: Siddharth Dungarwal <sd5869@gmail.com>
Date: Wed, 19 Jul 2023 19:30:07 +0530
Subject: [PATCH] Add archived col in commits index
Changelog: added
MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127004
EE: true
---
...20230719094243_add_archived_to_commits.yml | 11 +++++++++++
.../20230719094243_add_archived_to_commits.rb | 19 +++++++++++++++++++
ee/lib/elastic/latest/commit_config.rb | 1 +
...0719094243_add_archived_to_commits_spec.rb | 11 +++++++++++
4 files changed, 42 insertions(+)
create mode 100644 ee/elastic/docs/20230719094243_add_archived_to_commits.yml
create mode 100644 ee/elastic/migrate/20230719094243_add_archived_to_commits.rb
create mode 100644 ee/spec/elastic/migrate/20230719094243_add_archived_to_commits_spec.rb
diff --git a/ee/elastic/docs/20230719094243_add_archived_to_commits.yml b/ee/elastic/docs/20230719094243_add_archived_to_commits.yml
new file mode 100644
index 000000000000..b2f40c0c91f2
--- /dev/null
+++ b/ee/elastic/docs/20230719094243_add_archived_to_commits.yml
@@ -0,0 +1,11 @@
+---
+name: AddArchivedToCommits
+version: '20230719094243'
+description: Add archived column in commit index
+group: group::global search
+milestone: 16.3
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127004
+obsolete: false
+marked_obsolete_by_url:
+marked_obsolete_in_milestone:
+
diff --git a/ee/elastic/migrate/20230719094243_add_archived_to_commits.rb b/ee/elastic/migrate/20230719094243_add_archived_to_commits.rb
new file mode 100644
index 000000000000..7e1bfdad941c
--- /dev/null
+++ b/ee/elastic/migrate/20230719094243_add_archived_to_commits.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddArchivedToCommits < Elastic::Migration
+ include Elastic::MigrationUpdateMappingsHelper
+
+ private
+
+ def index_name
+ ::Elastic::Latest::CommitConfig.index_name
+ end
+
+ def new_mappings
+ {
+ archived: {
+ type: 'boolean'
+ }
+ }
+ end
+end
diff --git a/ee/lib/elastic/latest/commit_config.rb b/ee/lib/elastic/latest/commit_config.rb
index a2314f15b5b8..8eb2773e51ef 100644
--- a/ee/lib/elastic/latest/commit_config.rb
+++ b/ee/lib/elastic/latest/commit_config.rb
@@ -43,6 +43,7 @@ module CommitConfig
indexes :repository_access_level, type: :integer
indexes :hashed_root_namespace_id, type: :integer
indexes :schema_version, type: :integer
+ indexes :archived, type: :boolean
end
end
end
diff --git a/ee/spec/elastic/migrate/20230719094243_add_archived_to_commits_spec.rb b/ee/spec/elastic/migrate/20230719094243_add_archived_to_commits_spec.rb
new file mode 100644
index 000000000000..8aa8bbd70e89
--- /dev/null
+++ b/ee/spec/elastic/migrate/20230719094243_add_archived_to_commits_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/20230719094243_add_archived_to_commits.rb')
+
+RSpec.describe AddArchivedToCommits, :elastic, :sidekiq_inline, feature_category: :global_search do
+ let(:version) { 20230719094243 }
+
+ include_examples 'migration adds mapping'
+end
--
GitLab