Merge branch 'ee-fix-gitlab-keys-changes' into 'master'

Fix broken EE master

Closes gitlab-ce#59170

See merge request gitlab-org/gitlab-ee!10287

ee/lib/gitlab/background_migration/update_authorized_keys_file_since.rb

@@ -32,10 +32,8 @@ module Gitlab
       def batch_add_keys_in_db_starting_from(start_id)
         Rails.logger.info("Adding all keys starting from ID: #{start_id}")
 
-        gitlab_shell.batch_add_keys do |adder|
-          Key.find_each(start: start_id, batch_size: 1000) do |key|
-            adder.add_key(key.shell_id, key.key)
-          end
+        ::Key.find_in_batches(start: start_id, batch_size: 1000) do |keys|
+          gitlab_shell.batch_add_keys(keys)
         end
       end
     end

ee/spec/lib/gitlab/background_migration/update_authorized_keys_file_since_spec.rb

@@ -80,15 +80,19 @@ describe Gitlab::BackgroundMigration::UpdateAuthorizedKeysFileSince do
 
         background_migration.batch_add_keys_in_db_starting_from(@keys[3].id)
 
-        file = File.read(Rails.root.join('tmp/tests/.ssh/authorized_keys'))
+        file = File.read(Rails.root.join(Gitlab.config.gitlab_shell.authorized_keys_file))
         expect(file.scan(/ssh-rsa/).count).to eq(7)
 
-        expect(file).not_to include(Gitlab::Shell.strip_key(@keys[0].key))
-        expect(file).not_to include(Gitlab::Shell.strip_key(@keys[2].key))
-        expect(file).to include(Gitlab::Shell.strip_key(@keys[3].key))
-        expect(file).to include(Gitlab::Shell.strip_key(@keys[9].key))
+        expect(file).not_to include(strip_key(@keys[0].key))
+        expect(file).not_to include(strip_key(@keys[2].key))
+        expect(file).to include(strip_key(@keys[3].key))
+        expect(file).to include(strip_key(@keys[9].key))
       end
     end
+
+    def strip_key(key)
+      key.split(/[ ]+/)[0, 2].join(' ')
+    end
   end
 end
 # rubocop:enable RSpec/FactoriesInMigrationSpecs

ee/spec/migrations/update_authorized_keys_file_spec.rb

@@ -3,6 +3,7 @@ require Rails.root.join('ee', 'db', 'migrate', '20170626202753_update_authorized
 
 describe UpdateAuthorizedKeysFile, :migration do
   let(:migration) { described_class.new }
+  let(:authorized_keys_file) { Rails.root.join(Gitlab.config.gitlab_shell.authorized_keys_file) }
 
   describe '#up' do
     context 'when authorized_keys_enabled is nil' do
@@ -15,6 +16,8 @@ describe UpdateAuthorizedKeysFile, :migration do
       end
 
       it 'sets authorized_keys_enabled to true' do
+        FileUtils.touch(authorized_keys_file)
+
         migration.up
 
         expect(described_class::ApplicationSetting.last.authorized_keys_enabled).to be_truthy
@@ -39,13 +42,14 @@ describe UpdateAuthorizedKeysFile, :migration do
 
           migration.up
 
-          file = File.read(Rails.root.join('tmp/tests/.ssh/authorized_keys'))
+          file = File.read(authorized_keys_file)
+
           expect(file.scan(/ssh-rsa/).count).to eq(2)
 
-          expect(file).not_to include(Gitlab::Shell.strip_key(@keys[0].key))
-          expect(file).not_to include(Gitlab::Shell.strip_key(@keys[1].key))
-          expect(file).to include(Gitlab::Shell.strip_key(@keys[2].key))
-          expect(file).to include(Gitlab::Shell.strip_key(@keys[3].key))
+          expect(file).not_to include(strip_key(@keys[0].key))
+          expect(file).not_to include(strip_key(@keys[1].key))
+          expect(file).to include(strip_key(@keys[2].key))
+          expect(file).to include(strip_key(@keys[3].key))
         end
       end
 
@@ -57,18 +61,24 @@ describe UpdateAuthorizedKeysFile, :migration do
         end
 
         it 'deletes the SSH key from authorized_keys' do
-          file = File.read(Rails.root.join('tmp/tests/.ssh/authorized_keys'))
-          expect(file).to include(Gitlab::Shell.strip_key(@key_to_stay.key))
-          expect(file).to include(Gitlab::Shell.strip_key(@key_to_delete.key))
+          file = File.read(authorized_keys_file)
+
+          expect(file).to include(strip_key(@key_to_stay.key))
+          expect(file).to include(strip_key(@key_to_delete.key))
 
           migration.up
 
-          file = File.read(Rails.root.join('tmp/tests/.ssh/authorized_keys'))
-          expect(file).to include(Gitlab::Shell.strip_key(@key_to_stay.key))
-          expect(file).not_to include(Gitlab::Shell.strip_key(@key_to_delete.key))
+          file = File.read(authorized_keys_file)
+
+          expect(file).to include(strip_key(@key_to_stay.key))
+          expect(file).not_to include(strip_key(@key_to_delete.key))
         end
       end
     end
+
+    def strip_key(key)
+      key.split(/[ ]+/)[0, 2].join(' ')
+    end
   end
 
   describe '#authorized_keys_file_in_use_and_stale?' do