Merge branch 'deprecate-gitaly-path' into 'master'

Stop using deprecated `path` field on Gitaly messages

See merge request !12112

6 files changed, 34 insertions, 12 deletions

diff --git a/spec/lib/gitlab/gitaly_client/notifications_spec.rb b/spec/lib/gitlab/gitaly_client/notifications_spec.rb
index b87dacb175b..e5c9e06a15e 100644
--- a/spec/lib/gitlab/gitaly_client/notifications_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/notifications_spec.rb
@@ -3,12 +3,13 @@ require 'spec_helper'
 describe Gitlab::GitalyClient::Notifications do
   describe '#post_receive' do
     let(:project) { create(:empty_project) }
-    let(:repo_path) { project.repository.path_to_repo }
+    let(:storage_name) { project.repository_storage }
+    let(:relative_path) { project.path_with_namespace + '.git' }
     subject { described_class.new(project.repository) }
 
     it 'sends a post_receive message' do
       expect_any_instance_of(Gitaly::Notifications::Stub).
-        to receive(:post_receive).with(gitaly_request_with_repo_path(repo_path))
+        to receive(:post_receive).with(gitaly_request_with_path(storage_name, relative_path))
 
       subject.post_receive
     end
diff --git a/spec/lib/gitlab/gitaly_client/ref_spec.rb b/spec/lib/gitlab/gitaly_client/ref_spec.rb
index d8cd2dcbd2a..2ea44ef74b0 100644
--- a/spec/lib/gitlab/gitaly_client/ref_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_spec.rb
@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Gitlab::GitalyClient::Ref do
   let(:project) { create(:empty_project) }
-  let(:repo_path) { project.repository.path_to_repo }
+  let(:storage_name) { project.repository_storage }
+  let(:relative_path) { project.path_with_namespace + '.git' }
   let(:client) { described_class.new(project.repository) }
 
   before do
@@ -19,7 +20,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#branch_names' do
     it 'sends a find_all_branch_names message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_all_branch_names).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_all_branch_names).
+          with(gitaly_request_with_path(storage_name, relative_path)).
           and_return([])
 
       client.branch_names
@@ -29,7 +31,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#tag_names' do
     it 'sends a find_all_tag_names message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_all_tag_names).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_all_tag_names).
+          with(gitaly_request_with_path(storage_name, relative_path)).
           and_return([])
 
       client.tag_names
@@ -39,7 +42,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#default_branch_name' do
     it 'sends a find_default_branch_name message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_default_branch_name).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_default_branch_name).
+          with(gitaly_request_with_path(storage_name, relative_path)).
         and_return(double(name: 'foo'))
 
       client.default_branch_name
@@ -49,7 +53,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#local_branches' do
     it 'sends a find_local_branches message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_local_branches).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_local_branches).
+          with(gitaly_request_with_path(storage_name, relative_path)).
           and_return([])
 
       client.local_branches
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index b1999409170..ad19998dff4 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -212,7 +212,7 @@ describe Gitlab::Workhorse, lib: true do
 
       it 'includes a Repository param' do
         repo_param = { Repository: {
-          path: repo_path,
+          path: '', # deprecated field; grpc automatically creates it anyway
           storage_name: 'default',
           relative_path: project.full_path + '.git'
         } }
diff --git a/spec/support/matchers/gitaly_matchers.rb b/spec/support/matchers/gitaly_matchers.rb
index ed14bcec9f2..ebfabcd8f24 100644
--- a/spec/support/matchers/gitaly_matchers.rb
+++ b/spec/support/matchers/gitaly_matchers.rb
@@ -1,5 +1,10 @@
-RSpec::Matchers.define :gitaly_request_with_repo_path do |path|
-  match { |actual| actual.repository.path == path }
+RSpec::Matchers.define :gitaly_request_with_path do |storage_name, relative_path|
+  match do |actual|
+    repository = actual.repository
+
+    repository.storage_name == storage_name &&
+      repository.relative_path == relative_path
+  end
 end
 
 RSpec::Matchers.define :gitaly_request_with_params do |params|
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 0ff1a988a9e..1e5f55a738a 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -241,6 +241,10 @@ describe 'gitlab:app namespace rake task' do
         project_a
         project_b
 
+        # Avoid asking gitaly about the root ref (which will fail beacuse of the
+        # mocked storages)
+        allow_any_instance_of(Repository).to receive(:empty_repo?).and_return(false)
+
         # We only need a backup of the repositories for this test
         ENV["SKIP"] = "db,uploads,builds,artifacts,lfs,registry"
         create_backup
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index 4a636decafd..cfa6c9ca8ce 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -79,8 +79,14 @@ describe 'gitlab:gitaly namespace rake task' do
   describe 'storage_config' do
     it 'prints storage configuration in a TOML format' do
       config = {
-        'default' => { 'path' => '/path/to/default' },
-        'nfs_01' => { 'path' => '/path/to/nfs_01' }
+        'default' => {
+          'path' => '/path/to/default',
+          'gitaly_address' => 'unix:/path/to/my.socket'
+        },
+        'nfs_01' => {
+          'path' => '/path/to/nfs_01',
+          'gitaly_address' => 'unix:/path/to/my.socket'
+        }
       }
       allow(Gitlab.config.repositories).to receive(:storages).and_return(config)
 
@@ -89,6 +95,7 @@ describe 'gitlab:gitaly namespace rake task' do
         expected_output = <<~TOML
           # Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}
           # This is in TOML format suitable for use in Gitaly's config.toml file.
+          socket_path = "/path/to/my.socket"
           [[storage]]
           name = "default"
           path = "/path/to/default"