Merge branch 'gitaly-repository-message' into 'master'

Send more Gitaly::Repository fields

See merge request !10499

7 files changed, 41 insertions, 38 deletions

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 56c597dffcb..70d0d57204d 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -142,7 +142,7 @@ module API
         project = Project.find_by_full_path(relative_path.sub(/\.(git|wiki)\z/, ''))
 
         begin
-          Gitlab::GitalyClient::Notifications.new(project.repository_storage, relative_path).post_receive
+          Gitlab::GitalyClient::Notifications.new(project.repository).post_receive
         rescue GRPC::Unavailable => e
           render_api_error(e, 500)
         end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 9e338282e96..fc473b2c21e 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -968,6 +968,14 @@ module Gitlab
         @attributes.attributes(path)
       end
 
+      def gitaly_repository
+        Gitlab::GitalyClient::Util.repository(@repository_storage, @relative_path)
+      end
+
+      def gitaly_channel
+        Gitlab::GitalyClient.get_channel(@repository_storage)
+      end
+
       private
 
       # Get the content of a blob for a given commit.  If the blob is a commit
@@ -1247,7 +1255,7 @@ module Gitlab
       end
 
       def gitaly_ref_client
-        @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(@repository_storage, @relative_path)
+        @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(self)
       end
     end
   end
diff --git a/lib/gitlab/gitaly_client/commit.rb b/lib/gitlab/gitaly_client/commit.rb
index f15faebe27e..b7f39f3ef0b 100644
--- a/lib/gitlab/gitaly_client/commit.rb
+++ b/lib/gitlab/gitaly_client/commit.rb
@@ -7,14 +7,13 @@ module Gitlab
 
       class << self
         def diff_from_parent(commit, options = {})
-          project   = commit.project
-          channel   = GitalyClient.get_channel(project.repository_storage)
-          stub      = Gitaly::Diff::Stub.new(nil, nil, channel_override: channel)
-          repo      = Gitaly::Repository.new(path: project.repository.path_to_repo)
-          parent    = commit.parents[0]
+          repository = commit.project.repository
+          gitaly_repo = repository.gitaly_repository
+          stub = Gitaly::Diff::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
+          parent = commit.parents[0]
           parent_id = parent ? parent.id : EMPTY_TREE_ID
-          request   = Gitaly::CommitDiffRequest.new(
-            repository: repo,
+          request = Gitaly::CommitDiffRequest.new(
+            repository: gitaly_repo,
             left_commit_id: parent_id,
             right_commit_id: commit.id
           )
@@ -23,12 +22,10 @@ module Gitlab
         end
 
         def is_ancestor(repository, ancestor_id, child_id)
-          project = Project.find_by_path(repository.path)
-          channel = GitalyClient.get_channel(project.repository_storage)
-          stub = Gitaly::Commit::Stub.new(nil, nil, channel_override: channel)
-          repo = Gitaly::Repository.new(path: repository.path_to_repo)
+          gitaly_repo = repository.gitaly_repository
+          stub = Gitaly::Commit::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
           request = Gitaly::CommitIsAncestorRequest.new(
-            repository: repo,
+            repository: gitaly_repo,
             ancestor_id: ancestor_id,
             child_id: child_id
           )
diff --git a/lib/gitlab/gitaly_client/notifications.rb b/lib/gitlab/gitaly_client/notifications.rb
index f0d93ded91b..a94a54883db 100644
--- a/lib/gitlab/gitaly_client/notifications.rb
+++ b/lib/gitlab/gitaly_client/notifications.rb
@@ -3,13 +3,14 @@ module Gitlab
     class Notifications
       attr_accessor :stub
 
-      def initialize(repository_storage, relative_path)
-        @channel, @repository = Util.process_path(repository_storage, relative_path)
-        @stub = Gitaly::Notifications::Stub.new(nil, nil, channel_override: @channel)
+      # 'repository' is a Gitlab::Git::Repository
+      def initialize(repository)
+        @gitaly_repo = repository.gitaly_repository
+        @stub = Gitaly::Notifications::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
       end
 
       def post_receive
-        request = Gitaly::PostReceiveRequest.new(repository: @repository)
+        request = Gitaly::PostReceiveRequest.new(repository: @gitaly_repo)
         @stub.post_receive(request)
       end
     end
diff --git a/lib/gitlab/gitaly_client/ref.rb b/lib/gitlab/gitaly_client/ref.rb
index fcdf452d567..d3c0743db4e 100644
--- a/lib/gitlab/gitaly_client/ref.rb
+++ b/lib/gitlab/gitaly_client/ref.rb
@@ -3,23 +3,24 @@ module Gitlab
     class Ref
       attr_accessor :stub
 
-      def initialize(repository_storage, relative_path)
-        @channel, @repository = Util.process_path(repository_storage, relative_path)
-        @stub = Gitaly::Ref::Stub.new(nil, nil, channel_override: @channel)
+      # 'repository' is a Gitlab::Git::Repository
+      def initialize(repository)
+        @gitaly_repo = repository.gitaly_repository
+        @stub = Gitaly::Ref::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
       end
 
       def default_branch_name
-        request = Gitaly::FindDefaultBranchNameRequest.new(repository: @repository)
+        request = Gitaly::FindDefaultBranchNameRequest.new(repository: @gitaly_repo)
         stub.find_default_branch_name(request).name.gsub(/^refs\/heads\//, '')
       end
 
       def branch_names
-        request = Gitaly::FindAllBranchNamesRequest.new(repository: @repository)
+        request = Gitaly::FindAllBranchNamesRequest.new(repository: @gitaly_repo)
         consume_refs_response(stub.find_all_branch_names(request), prefix: 'refs/heads/')
       end
 
       def tag_names
-        request = Gitaly::FindAllTagNamesRequest.new(repository: @repository)
+        request = Gitaly::FindAllTagNamesRequest.new(repository: @gitaly_repo)
         consume_refs_response(stub.find_all_tag_names(request), prefix: 'refs/tags/')
       end
 
diff --git a/lib/gitlab/gitaly_client/util.rb b/lib/gitlab/gitaly_client/util.rb
index d272c25d1f9..4acd297f5cb 100644
--- a/lib/gitlab/gitaly_client/util.rb
+++ b/lib/gitlab/gitaly_client/util.rb
@@ -1,12 +1,14 @@
 module Gitlab
   module GitalyClient
     module Util
-      def self.process_path(repository_storage, relative_path)
-        channel = GitalyClient.get_channel(repository_storage)
-        storage_path = Gitlab.config.repositories.storages[repository_storage]['path']
-        repository = Gitaly::Repository.new(path: File.join(storage_path, relative_path))
-
-        [channel, repository]
+      class << self
+        def repository(repository_storage, relative_path)
+          Gitaly::Repository.new(
+            path: File.join(Gitlab.config.repositories.storages[repository_storage]['path'], relative_path),
+            storage_name: repository_storage,
+            relative_path: relative_path,
+          )
+        end
       end
     end
   end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index a8a7bf9bc12..e6e40f6945d 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -24,14 +24,8 @@ module Gitlab
         }
 
         if Gitlab.config.gitaly.enabled
-          storage = repository.project.repository_storage
-          address = Gitlab::GitalyClient.get_address(storage)
-          # TODO: use GitalyClient code to assemble the Repository message
-          params[:Repository] = Gitaly::Repository.new(
-            path: repo_path,
-            storage_name: storage,
-            relative_path: Gitlab::RepoPath.strip_storage_path(repo_path),
-          ).to_h
+          address = Gitlab::GitalyClient.get_address(repository.project.repository_storage)
+          params[:Repository] = repository.gitaly_repository.to_h
 
           feature_enabled = case action.to_s
                             when 'git_receive_pack'