Removed remove_ssh_keys step and improved specs

files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary.rb

@@ -13,8 +13,6 @@ module Geo
       promote_postgresql_to_primary
-      remove_ssh_keys
-
       reconfigure
       promote_to_primary
@@ -51,21 +49,6 @@ module Geo
       run_command("/opt/gitlab/embedded/bin/gitlab-pg-ctl promote")
     end
-    def remove_ssh_keys
-      return nil unless File.exist?(key_path) || File.exist?(public_key_path)
-
-      unless @options[:confirm_removing_keys]
-        puts
-        puts 'SSH keys detected! Remove? See https://docs.gitlab.com/ee/gitlab-geo/disaster-recovery.html#promoting-a-secondary-node for more information [Y/n]'.color(:yellow)
-
-        return true if STDIN.gets.chomp.casecmp('n').zero?
-      end
-
-      [key_path, public_key_path].each do |path|
-        File.delete(path) if File.exist?(path)
-      end
-    end
-
     def reconfigure
       puts
       puts 'Reconfiguring...'.color(:yellow)
@@ -85,13 +68,5 @@ module Geo
     def run_command(cmd, live: false)
       GitlabCtl::Util.run_command(cmd, live: live)
     end
-
-    def key_path
-      @key_path ||= File.join(git_user_home, '.ssh/id_rsa')
-    end
-
-    def public_key_path
-      @public_key_path ||= File.join(git_user_home, '.ssh/id_rsa.pub')
-    end
   end
 end

spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_spec.rb

@@ -10,13 +10,9 @@ describe Geo::PromoteToPrimary, '#execute' do
   subject(:command) { described_class.new(nil, {}) }
   let(:temp_directory) { Dir.mktmpdir }
-  let(:postgres_trigger_file_path) { File.join(temp_directory, 'test_trigger') }
   let(:gitlab_config_path) { File.join(temp_directory, 'gitlab.rb') }
-  let(:key_path) { File.join(temp_directory, 'id_rsa') }
-  let(:public_key_path) { File.join(temp_directory, 'id_rsa.pub') }
   before do
-    allow(STDIN).to receive(:gets).and_return('y')
     allow(command).to receive(:puts)
     allow(command).to receive(:print)
   end
@@ -25,50 +21,29 @@ describe Geo::PromoteToPrimary, '#execute' do
     FileUtils.rm_rf(temp_directory)
   end
-  it 'calls all the subcommands' do
-    stub_env
-
-    is_expected.to receive(:run_command).with('gitlab-ctl reconfigure', live: true).once
-    is_expected.to receive(:run_command).with('gitlab-rake geo:set_secondary_as_primary', live: true).once
-    is_expected.to receive(:run_command).with("touch #{postgres_trigger_file_path}").once
-
-    command.execute
-  end
-
-  it 'applies all the changes' do
-    stub_env
-
-    allow(command).to receive(:run_command) do |cmd|
-      fake_run_command(cmd)
+  context 'when confirmation is accepted' do
+    before do
+      allow(STDIN).to receive(:gets).and_return('y')
     end
-    command.execute
-    expect(@reconfigure_has_been_run).to be_truthy
-    expect(@rake_task_has_been_run).to be_truthy
-    expect(File.exist?(postgres_trigger_file_path)).to be_truthy
-    expect(File.exist?(key_path)).to be_falsey
-    expect(File.exist?(public_key_path)).to be_falsey
-  end
-
-  def stub_env
-    FileUtils.rm_f(postgres_trigger_file_path)
-    stub_const("Geo::PromoteToPrimary::TRIGGER_FILE_PATH", postgres_trigger_file_path)
-    allow(subject).to receive(:key_path).and_return(key_path)
-    allow(subject).to receive(:public_key_path).and_return(public_key_path)
+    it 'calls all the subcommands' do
+      is_expected.to receive(:run_command).with('gitlab-ctl reconfigure', live: true).once
+      is_expected.to receive(:run_command).with('gitlab-rake geo:set_secondary_as_primary', live: true).once
+      is_expected.to receive(:run_command).with("/opt/gitlab/embedded/bin/gitlab-pg-ctl promote").once
+      command.execute
+    end
   end
-  def fake_run_command(cmd)
-    if cmd == 'gitlab-ctl reconfigure'
-      @reconfigure_has_been_run = true
-      return
+  context 'when confirmation is refused' do
+    before do
+      allow(STDIN).to receive(:gets).and_return('n')
     end
-    if cmd == 'gitlab-rake geo:set_secondary_as_primary'
-      @rake_task_has_been_run = true
-      return
-    end
-    GitlabCtl::Util.run_command(cmd)
+    it 'calls all the subcommands' do
+      is_expected.not_to receive(:run_command)
+      expect { command.execute }.to raise_error RuntimeError, 'Exited because primary node must be down'
+    end
   end
 end