Merge branch '296608_remove_target_name' into 'master'

Remove target_name parameter from Elasticsearch rake tasks

See merge request gitlab-org/gitlab!52958

ee/changelogs/unreleased/296608_remove_target_name.yml

+---
+title: Remove target_name parameter from Elasticsearch rake tasks
+merge_request: 52958
+author:
+type: changed

ee/lib/tasks/gitlab/elastic.rake

@@ -60,14 +60,11 @@ namespace :gitlab do
     end
 
     desc "GitLab | Elasticsearch | Create empty indexes and assigns an alias for each"
-    task :create_empty_index, [:target_name] => [:environment] do |t, args|
+    task create_empty_index: [:environment] do |t, args|
       with_alias = ENV["SKIP_ALIAS"].nil?
       options = {}
 
-      # only create an index at the specified name
-      options[:index_name] = args[:target_name] unless with_alias
-
-      helper = Gitlab::Elastic::Helper.new(target_name: args[:target_name])
+      helper = Gitlab::Elastic::Helper.default
       index_name = helper.create_empty_index(with_alias: with_alias, options: options)
 
       # with_alias is used to support interacting with a specific index (such as when reclaiming the production index
@@ -89,8 +86,8 @@ namespace :gitlab do
     end
 
     desc "GitLab | Elasticsearch | Delete all indexes"
-    task :delete_index, [:target_name] => [:environment] do |t, args|
-      helper = Gitlab::Elastic::Helper.new(target_name: args[:target_name])
+    task delete_index: [:environment] do |t, args|
+      helper = Gitlab::Elastic::Helper.default
 
       if helper.delete_index
         puts "Index/alias '#{helper.target_name}' has been deleted".color(:green)
@@ -115,7 +112,7 @@ namespace :gitlab do
     end
 
     desc "GitLab | Elasticsearch | Recreate indexes"
-    task :recreate_index, [:target_name] => [:environment] do |t, args|
+    task recreate_index: [:environment] do |t, args|
       Rake::Task["gitlab:elastic:delete_index"].invoke(*args)
       Rake::Task["gitlab:elastic:create_empty_index"].invoke(*args)
     end

ee/spec/tasks/gitlab/elastic_rake_spec.rb

@@ -21,18 +21,14 @@ RSpec.describe 'gitlab:elastic namespace rake tasks', :elastic do
     end
 
     context 'when SKIP_ALIAS environment variable is set' do
-      let(:secondary_index_name) { "gitlab-test-#{Time.now.strftime("%Y%m%d-%H%M")}"}
-
       before do
         stub_env('SKIP_ALIAS', '1')
       end
 
       after do
-        es_helper.delete_index(index_name: secondary_index_name)
+        es_helper.client.indices.delete(index: "#{es_helper.target_name}*")
       end
 
-      subject { run_rake_task('gitlab:elastic:create_empty_index', secondary_index_name) }
-
       it 'does not alias the new index' do
         expect { subject }.not_to change { es_helper.alias_exists?(name: es_helper.target_name) }
       end
@@ -44,10 +40,6 @@ RSpec.describe 'gitlab:elastic namespace rake tasks', :elastic do
         expect { subject }.not_to change { es_helper.index_exists?(index_name: migration_index_name) }
       end
 
-      it 'creates an index at the specified name' do
-        expect { subject }.to change { es_helper.index_exists?(index_name: secondary_index_name) }.from(false).to(true)
-      end
-
       Gitlab::Elastic::Helper::ES_SEPARATE_CLASSES.each do |class_name|
         describe "#{class_name}" do
           it "does not create a standalone index" do