Merge branch 'zj-commits-by-oid' into 'master'

ListCommitsByOid endpoint

See merge request gitlab-org/gitaly!438

9 files changed, 246 insertions, 75 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8a45de03..8d08269a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ UNRELEASED
   https://gitlab.com/gitlab-org/gitaly/merge_requests/460
 - Implement CommitService::FilterShasWithSignatures
   https://gitlab.com/gitlab-org/gitaly/merge_requests/461
+- Implement CommitService::ListCommitsByOid
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/438
 
 v0.55.0
 
diff --git a/internal/service/commit/list_commits_by_oid.go b/internal/service/commit/list_commits_by_oid.go
index a2c0a2521..9be6eb96f 100644
--- a/internal/service/commit/list_commits_by_oid.go
+++ b/internal/service/commit/list_commits_by_oid.go
@@ -1,10 +1,36 @@
 package commit
 
 import (
+	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
+
 	pb "gitlab.com/gitlab-org/gitaly-proto/go"
-	"gitlab.com/gitlab-org/gitaly/internal/helper"
 )
 
 func (s *server) ListCommitsByOid(in *pb.ListCommitsByOidRequest, stream pb.CommitService_ListCommitsByOidServer) error {
-	return helper.Unimplemented
+	ctx := stream.Context()
+
+	client, err := s.CommitServiceClient(ctx)
+	if err != nil {
+		return err
+	}
+
+	clientCtx, err := rubyserver.SetHeaders(ctx, in.GetRepository())
+	if err != nil {
+		return err
+	}
+
+	rubyStream, err := client.ListCommitsByOid(clientCtx, in)
+	if err != nil {
+		return err
+	}
+
+	return rubyserver.Proxy(func() error {
+		resp, err := rubyStream.Recv()
+		if err != nil {
+			md := rubyStream.Trailer()
+			stream.SetTrailer(md)
+			return err
+		}
+		return stream.Send(resp)
+	})
 }
diff --git a/internal/service/commit/list_commits_by_oid_test.go b/internal/service/commit/list_commits_by_oid_test.go
new file mode 100644
index 000000000..70cb3e2a9
--- /dev/null
+++ b/internal/service/commit/list_commits_by_oid_test.go
@@ -0,0 +1,120 @@
+package commit
+
+import (
+	"io"
+	"testing"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
+)
+
+func TestSuccessfulListCommitsByOidRequest(t *testing.T) {
+	server, serverSocketPath := startTestServices(t)
+	defer server.Stop()
+
+	client, conn := newCommitServiceClient(t, serverSocketPath)
+	defer conn.Close()
+
+	commits := []*pb.GitCommit{
+		{
+			Id:        "bf6e164cac2dc32b1f391ca4290badcbe4ffc5fb",
+			Subject:   []byte("Commit #10"),
+			Body:      []byte("Commit #10\n"),
+			Author:    dummyCommitAuthor(1500320272),
+			Committer: dummyCommitAuthor(1500320272),
+			ParentIds: []string{"9d526f87b82e2b2fd231ca44c95508e5e85624ca"},
+		},
+		{
+			Id:        "79b06233d3dc769921576771a4e8bee4b439595d",
+			Subject:   []byte("Commit #1"),
+			Body:      []byte("Commit #1\n"),
+			Author:    dummyCommitAuthor(1500320254),
+			Committer: dummyCommitAuthor(1500320254),
+			ParentIds: []string{"1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"},
+		},
+	}
+
+	testCases := []struct {
+		desc            string
+		request         *pb.ListCommitsByOidRequest
+		expectedCommits []*pb.GitCommit
+	}{
+		{
+			desc: "find one commit",
+			request: &pb.ListCommitsByOidRequest{
+				Oid: []string{commits[0].Id},
+			},
+			expectedCommits: commits[0:1],
+		},
+		{
+			desc: "find multiple commits",
+			request: &pb.ListCommitsByOidRequest{
+				Oid: []string{commits[0].Id, commits[1].Id},
+			},
+			expectedCommits: commits,
+		},
+		{
+			desc: "no query",
+			request: &pb.ListCommitsByOidRequest{
+				Oid: []string{},
+			},
+			expectedCommits: []*pb.GitCommit{},
+		},
+		{
+			desc: "empty query",
+			request: &pb.ListCommitsByOidRequest{
+				Oid: []string{""},
+			},
+			expectedCommits: []*pb.GitCommit{},
+		},
+		{
+			desc: "partial oids",
+			request: &pb.ListCommitsByOidRequest{
+				Oid: []string{commits[0].Id[0:10], commits[1].Id[0:8]},
+			},
+			expectedCommits: commits,
+		},
+		{
+			desc: "unknown oids",
+			request: &pb.ListCommitsByOidRequest{
+				Oid: []string{"deadbeef", "987654321"},
+			},
+			expectedCommits: []*pb.GitCommit{},
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+
+			request := testCase.request
+			request.Repository = testRepo
+
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+			c, err := client.ListCommitsByOid(ctx, request)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			receivedCommits := []*pb.GitCommit{}
+			for {
+				resp, err := c.Recv()
+				if err == io.EOF {
+					break
+				} else if err != nil {
+					t.Fatal(err)
+				}
+
+				receivedCommits = append(receivedCommits, resp.GetCommits()...)
+			}
+
+			require.Equal(t, len(testCase.expectedCommits), len(receivedCommits), "number of commits received")
+
+			for i, receivedCommit := range receivedCommits {
+				require.Equal(t, testCase.expectedCommits[i], receivedCommit, "mismatched commit")
+			}
+		})
+	}
+}
diff --git a/ruby/Gemfile b/ruby/Gemfile
index ad2df9d01..0ce42d5b9 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.57.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.58.0', require: 'gitaly'
 gem 'activesupport'
 gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index c60b43e2d..6849257b6 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -17,7 +17,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.57.0)
+    gitaly-proto (0.58.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -119,7 +119,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  gitaly-proto (~> 0.57.0)
+  gitaly-proto (~> 0.58.0)
   github-linguist (~> 4.7.0)
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
diff --git a/ruby/lib/gitaly_server/commit_service.rb b/ruby/lib/gitaly_server/commit_service.rb
index a04c74726..20e49e177 100644
--- a/ruby/lib/gitaly_server/commit_service.rb
+++ b/ruby/lib/gitaly_server/commit_service.rb
@@ -20,6 +20,29 @@ module GitalyServer
       end
     end
 
+    def list_commits_by_oid(request, call)
+      bridge_exceptions do
+        repository = Gitlab::Git::Repository.from_gitaly(request.repository, call)
+
+        Enumerator.new do |y|
+          request.oid.each_slice(20) do |oids|
+            commits = oids.map do |oid|
+              commit =
+                begin
+                  repository.rev_parse_target(oid)
+                rescue Rugged::ReferenceError, Rugged::InvalidError
+                  nil
+                end
+
+              commit.is_a?(Rugged::Commit) ? gitaly_commit_from_rugged(commit) : nil
+            end.compact
+
+            y.yield  Gitaly::ListCommitsByOidResponse.new(commits: commits)
+          end
+        end
+      end
+    end
+
     def find_commits(request, call)
       bridge_exceptions do
         repository = Gitlab::Git::Repository.from_gitaly(request.repository, call)
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index 46448c71b..a60476bfe 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.57.0
+0.58.0
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
index d890da83d..d62364a4f 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
@@ -633,7 +633,7 @@ func (m *ListCommitsByOidRequest) GetOid() []string {
 }
 
 type ListCommitsByOidResponse struct {
-	Commit []*GitCommit `protobuf:"bytes,1,rep,name=commit" json:"commit,omitempty"`
+	Commits []*GitCommit `protobuf:"bytes,1,rep,name=commits" json:"commits,omitempty"`
 }
 
 func (m *ListCommitsByOidResponse) Reset()                    { *m = ListCommitsByOidResponse{} }
@@ -641,9 +641,9 @@ func (m *ListCommitsByOidResponse) String() string            { return proto.Com
 func (*ListCommitsByOidResponse) ProtoMessage()               {}
 func (*ListCommitsByOidResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
 
-func (m *ListCommitsByOidResponse) GetCommit() []*GitCommit {
+func (m *ListCommitsByOidResponse) GetCommits() []*GitCommit {
 	if m != nil {
-		return m.Commit
+		return m.Commits
 	}
 	return nil
 }
@@ -1995,13 +1995,13 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("commit.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 1479 bytes of a gzipped FileDescriptorProto
+	// 1475 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6e, 0x1a, 0x47,
 	0x14, 0xf6, 0x82, 0xc1, 0x70, 0xa0, 0x0e, 0x9e, 0xfc, 0xe1, 0x75, 0x12, 0x3b, 0xdb, 0x3f, 0xa2,
 	0x54, 0xc4, 0xa2, 0x6a, 0xd5, 0x5e, 0x55, 0x76, 0x82, 0x5d, 0xa7, 0x76, 0x88, 0xd6, 0x48, 0x51,
 	0x7a, 0x83, 0xd6, 0xec, 0x00, 0xd3, 0x2c, 0x0c, 0xd9, 0x1d, 0xe2, 0xd0, 0x4a, 0xbd, 0xaf, 0xd4,
 	0x57, 0xe9, 0x23, 0xf4, 0xa2, 0xaf, 0xd0, 0x17, 0xe8, 0x7d, 0x1f, 0x21, 0x57, 0xd5, 0xfc, 0xec,
-	0xce, 0xc2, 0x2e, 0x4e, 0x13, 0x8b, 0xdc, 0xa0, 0x39, 0x67, 0xce, 0xce, 0xf9, 0xce, 0x99, 0xf3,
+	0xce, 0xc2, 0x2e, 0x49, 0x63, 0x8b, 0xdc, 0xa0, 0x39, 0x67, 0xce, 0xce, 0xf9, 0xce, 0x99, 0xf3,
 	0x37, 0x40, 0xb9, 0x4b, 0x87, 0x43, 0xc2, 0xea, 0x63, 0x9f, 0x32, 0x8a, 0xf2, 0x7d, 0xc2, 0x1c,
 	0x6f, 0x6a, 0x96, 0x83, 0x81, 0xe3, 0x63, 0x57, 0x72, 0xcd, 0xed, 0x3e, 0xa5, 0x7d, 0x0f, 0x3f,
 	0x10, 0xd4, 0xd9, 0xa4, 0xf7, 0x80, 0x91, 0x21, 0x0e, 0x98, 0x33, 0x1c, 0x4b, 0x01, 0xcb, 0x05,
@@ -2030,63 +2030,63 @@ var fileDescriptor1 = []byte{
 	0xc9, 0xd6, 0x4a, 0x8d, 0x8d, 0x50, 0xdd, 0x21, 0x61, 0xf2, 0x1b, 0x3b, 0x94, 0xb0, 0xfe, 0x31,
 	0x78, 0xfe, 0x4c, 0x46, 0x6a, 0x63, 0x59, 0x69, 0x8a, 0x76, 0x21, 0xe7, 0xf4, 0x18, 0xf6, 0x85,
 	0x05, 0xa5, 0x86, 0x59, 0x97, 0xd5, 0xa3, 0x1e, 0x56, 0x8f, 0x7a, 0x3b, 0xac, 0x1e, 0xb6, 0x14,
-	0x44, 0x0d, 0xc8, 0x9f, 0xe1, 0x1e, 0xf5, 0xe5, 0x95, 0x5d, 0xfc, 0x89, 0x92, 0x8c, 0x82, 0x30,
-	0xa7, 0x83, 0xd0, 0xfa, 0x02, 0xae, 0xcd, 0x1a, 0xa8, 0x73, 0xa5, 0xcb, 0xf9, 0xc2, 0xb8, 0x9c,
-	0x2d, 0x09, 0xeb, 0x8d, 0x01, 0xc5, 0x28, 0xe6, 0x52, 0xaa, 0xc8, 0x26, 0x14, 0x7c, 0x4a, 0x59,
-	0x47, 0x47, 0xdc, 0x1a, 0xa7, 0x5b, 0x32, 0xea, 0x12, 0x19, 0xf0, 0x40, 0x45, 0xf5, 0xaa, 0x88,
-	0xea, 0xad, 0x44, 0x54, 0xd7, 0xc5, 0x6f, 0x2c, 0x98, 0xc3, 0x30, 0xcd, 0xc5, 0xc2, 0xf4, 0x36,
-	0x80, 0xbc, 0x2e, 0xa1, 0x35, 0x2f, 0xb4, 0x16, 0x25, 0x87, 0xeb, 0xdd, 0x82, 0x62, 0xcf, 0x73,
-	0x58, 0x47, 0x28, 0x5f, 0x93, 0x7e, 0xe7, 0x8c, 0xa7, 0xdc, 0xfa, 0xfb, 0x50, 0x8c, 0x54, 0x44,
-	0x11, 0xbc, 0x12, 0x45, 0xb0, 0x11, 0x8b, 0xf0, 0xac, 0xf5, 0x0b, 0x5c, 0x3f, 0xc4, 0x2c, 0x04,
-	0x47, 0x70, 0xf0, 0x01, 0x8b, 0x05, 0x0f, 0xe8, 0x79, 0xe5, 0x3a, 0xa0, 0xb1, 0x64, 0xcd, 0x07,
-	0xb4, 0xae, 0x0e, 0xa1, 0x84, 0x75, 0x06, 0x95, 0x63, 0x12, 0xb0, 0x03, 0xe2, 0x2d, 0x0d, 0xbe,
-	0x75, 0x0f, 0x36, 0x62, 0x3a, 0x74, 0x3c, 0x71, 0x3b, 0x24, 0xc6, 0xb2, 0x2d, 0x09, 0xab, 0x0b,
-	0x1b, 0x07, 0x64, 0xe4, 0xaa, 0xb4, 0x5b, 0x12, 0x9e, 0xef, 0x00, 0xc5, 0x95, 0x28, 0x40, 0xf7,
-	0x20, 0x2f, 0x83, 0x44, 0x69, 0x48, 0x29, 0x03, 0x4a, 0xc0, 0xea, 0xc0, 0x4d, 0x6e, 0x50, 0x58,
-	0x50, 0xa6, 0x2d, 0xe2, 0x5e, 0x06, 0x6b, 0x54, 0x91, 0xb3, 0x2a, 0x6d, 0xac, 0x26, 0x54, 0x93,
-	0x0a, 0x52, 0x70, 0x66, 0x2f, 0xc6, 0xf9, 0xc6, 0x80, 0xeb, 0xdc, 0xd2, 0x3d, 0xcf, 0x5b, 0x72,
-	0xbd, 0xda, 0x82, 0xe2, 0xd0, 0x79, 0xdd, 0x91, 0x15, 0x42, 0xce, 0x03, 0x85, 0xa1, 0xf3, 0x5a,
-	0x54, 0x12, 0xd1, 0x5f, 0x5e, 0x90, 0x71, 0xd8, 0x4b, 0xf8, 0x1a, 0x7d, 0x0b, 0x39, 0xea, 0xbb,
-	0xd8, 0x17, 0x99, 0xbb, 0xde, 0xf8, 0x38, 0xd4, 0x9d, 0x0a, 0xb7, 0xde, 0xe2, 0xa2, 0xb6, 0xfc,
-	0xc2, 0xfa, 0x14, 0x72, 0x82, 0xe6, 0x59, 0xf9, 0xa4, 0xf5, 0xa4, 0xa9, 0xf2, 0xb3, 0xf5, 0xb4,
-	0x25, 0x7b, 0xcd, 0xa3, 0xbd, 0x76, 0xb3, 0x92, 0xe1, 0x09, 0x32, 0x7f, 0xd8, 0xfb, 0x54, 0xfc,
-	0x7f, 0x33, 0xf1, 0x68, 0x59, 0x9a, 0x03, 0xa3, 0xde, 0x2f, 0x9d, 0x27, 0x09, 0x74, 0x03, 0xf2,
-	0xb4, 0xd7, 0x0b, 0x30, 0x53, 0xbe, 0x53, 0x94, 0x4e, 0x9e, 0x5c, 0x2c, 0x79, 0xb8, 0x74, 0x8f,
-	0x7a, 0x1e, 0x3d, 0x17, 0x45, 0xaf, 0x60, 0x2b, 0x8a, 0x8f, 0x4f, 0xdc, 0xe7, 0x9d, 0x21, 0xf6,
-	0xfb, 0x38, 0x10, 0x35, 0xaf, 0x60, 0x03, 0x67, 0x9d, 0x08, 0x0e, 0xba, 0x0b, 0x65, 0x97, 0x04,
-	0xce, 0x99, 0x87, 0x3b, 0xe7, 0x8e, 0xf7, 0xa2, 0x5a, 0x10, 0x12, 0x25, 0xc5, 0x7b, 0xe6, 0x78,
-	0x2f, 0x74, 0x43, 0x2a, 0xbe, 0x7b, 0x43, 0x82, 0xff, 0xdb, 0x90, 0xac, 0x7d, 0xb8, 0x3a, 0xe3,
-	0xeb, 0xf7, 0xb9, 0xb0, 0x41, 0xd8, 0xe9, 0x8f, 0x9d, 0x51, 0x7f, 0xe2, 0xf4, 0x97, 0x57, 0xd7,
-	0xfe, 0x88, 0xc6, 0xdc, 0x98, 0x2a, 0x05, 0xf9, 0x00, 0x8a, 0x5e, 0xc8, 0x54, 0xa0, 0x6b, 0xa1,
-	0xaa, 0x05, 0xdf, 0xd4, 0x43, 0x8e, 0xad, 0x3f, 0x35, 0x1f, 0x43, 0x21, 0x64, 0xf3, 0x3c, 0x1a,
-	0x39, 0x43, 0xac, 0xfa, 0xab, 0x58, 0xf3, 0x48, 0x10, 0xcf, 0x0c, 0x01, 0x2e, 0x63, 0x4b, 0x42,
-	0x36, 0x6b, 0x8f, 0xfa, 0x6a, 0x18, 0x96, 0x84, 0x35, 0x81, 0x2b, 0xb6, 0x73, 0xbe, 0xef, 0x39,
-	0x43, 0xfc, 0x21, 0x3b, 0xd5, 0x67, 0x50, 0xd1, 0x6a, 0x95, 0x7b, 0xc2, 0x51, 0xd2, 0x88, 0x8d,
-	0x92, 0xbf, 0x42, 0xf5, 0xd8, 0x09, 0x8b, 0xde, 0x01, 0xf5, 0x79, 0x43, 0xfe, 0x90, 0x38, 0x0f,
-	0x60, 0x33, 0x45, 0xff, 0xbb, 0x77, 0x87, 0xbf, 0xa2, 0xb0, 0x08, 0xf6, 0xa7, 0x27, 0x38, 0x08,
-	0xf8, 0x95, 0x2e, 0xc9, 0x0e, 0x5d, 0x20, 0xb2, 0xf3, 0x05, 0x42, 0x3f, 0x25, 0xa2, 0x72, 0x92,
-	0x32, 0xef, 0x71, 0xc9, 0x97, 0x13, 0xec, 0x4f, 0xd5, 0xa0, 0x24, 0x09, 0xeb, 0x30, 0x7c, 0x35,
-	0xc5, 0x4d, 0x78, 0x9f, 0x6c, 0x24, 0xb0, 0x7d, 0x40, 0x3c, 0x86, 0xfd, 0xd3, 0x81, 0x13, 0x3c,
-	0x23, 0x6c, 0x70, 0x4a, 0xfa, 0x23, 0x87, 0x4d, 0xfc, 0xcb, 0xa5, 0x25, 0x6f, 0x29, 0x03, 0x27,
-	0x10, 0x3d, 0xb3, 0x6c, 0x8b, 0xb5, 0xf5, 0x35, 0xec, 0x2c, 0x56, 0xa5, 0xe3, 0x4e, 0x7c, 0x67,
-	0xe8, 0xef, 0x1a, 0x7f, 0x02, 0x7c, 0xa4, 0xde, 0xc4, 0xd8, 0x7f, 0x45, 0xba, 0x18, 0x3d, 0x83,
-	0xca, 0xfc, 0x9b, 0x11, 0x6d, 0xcf, 0x66, 0x6f, 0xe2, 0x61, 0x6b, 0xee, 0x2c, 0x16, 0x90, 0xca,
-	0xad, 0x15, 0xf4, 0x28, 0x3e, 0x2d, 0x57, 0x53, 0x1e, 0x6d, 0xf2, 0xa8, 0xcd, 0x85, 0xcf, 0x39,
-	0x6b, 0x65, 0xd7, 0x40, 0xa7, 0xb0, 0x3e, 0xfb, 0x96, 0x41, 0xb7, 0x67, 0x75, 0xcf, 0x3d, 0xaa,
-	0xcc, 0x3b, 0x8b, 0xb6, 0x63, 0x87, 0xfe, 0x00, 0xe5, 0xf8, 0xdc, 0x8f, 0xb6, 0xf4, 0x37, 0x89,
-	0xe7, 0x8e, 0x79, 0x2b, 0x7d, 0x33, 0xb2, 0xf3, 0x14, 0xd6, 0x67, 0x87, 0x53, 0x8d, 0x30, 0x75,
-	0x62, 0xd6, 0x08, 0xd3, 0x67, 0x5a, 0x81, 0xf0, 0x11, 0x14, 0xa3, 0x31, 0x52, 0x3b, 0x6f, 0x7e,
-	0x7a, 0xd5, 0xce, 0x4b, 0xcc, 0x9c, 0xe2, 0x94, 0x26, 0x80, 0x6e, 0x31, 0x68, 0x33, 0x3e, 0x77,
-	0xcc, 0x4c, 0x9d, 0xa6, 0x99, 0xb6, 0x15, 0x59, 0xf8, 0x3d, 0x94, 0x62, 0xff, 0xa3, 0x20, 0x73,
-	0xd6, 0xc3, 0xf1, 0xbf, 0x70, 0xcc, 0xad, 0xd4, 0xbd, 0xb8, 0xaf, 0x66, 0xe7, 0x14, 0xed, 0xab,
-	0xd4, 0x61, 0x48, 0xfb, 0x2a, 0x7d, 0xbc, 0x11, 0x56, 0x3e, 0x86, 0x52, 0xac, 0x91, 0xa2, 0x14,
-	0x5b, 0x92, 0xf0, 0x52, 0x3a, 0xaf, 0x38, 0xab, 0x0d, 0x57, 0xe6, 0x3a, 0x16, 0xba, 0xb3, 0xb0,
-	0x95, 0xc9, 0x33, 0xb7, 0xdf, 0xd2, 0xea, 0xac, 0x15, 0xb4, 0x07, 0x85, 0xb0, 0x2b, 0xa0, 0x9b,
-	0x51, 0xb6, 0xcf, 0xb6, 0x27, 0xb3, 0x9a, 0xdc, 0x88, 0x01, 0xfb, 0x11, 0x36, 0x12, 0x05, 0x1b,
-	0x45, 0x69, 0xb8, 0xa8, 0x97, 0x98, 0x77, 0x2f, 0x90, 0x88, 0xe0, 0x3d, 0x0f, 0x4b, 0x80, 0x2e,
-	0x80, 0xf3, 0x25, 0x20, 0x51, 0xdd, 0xe7, 0x4b, 0x40, 0xb2, 0x76, 0x0a, 0xd8, 0xcf, 0xe5, 0x93,
-	0x2b, 0x3e, 0xdc, 0xeb, 0xa3, 0x17, 0xbc, 0x2b, 0xf4, 0xd1, 0x8b, 0xde, 0x05, 0xe2, 0xe8, 0x00,
-	0xaa, 0x8b, 0x4a, 0x20, 0xfa, 0x5c, 0xdf, 0xf3, 0x85, 0xf5, 0xd8, 0xac, 0xbd, 0x5d, 0x30, 0x54,
-	0x59, 0x33, 0x76, 0x8d, 0xb3, 0xbc, 0x18, 0xe8, 0xbe, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x29,
-	0x04, 0x24, 0xc5, 0x06, 0x15, 0x00, 0x00,
+	0x44, 0x0d, 0xc8, 0x9f, 0xe1, 0x1e, 0xf5, 0xe5, 0x95, 0xbd, 0xfd, 0x13, 0x25, 0x19, 0x05, 0x61,
+	0x4e, 0x07, 0xa1, 0xf5, 0x05, 0x5c, 0x9b, 0x35, 0x50, 0xe7, 0x4a, 0x97, 0xf3, 0x85, 0x71, 0x39,
+	0x5b, 0x12, 0xd6, 0x1b, 0x03, 0x8a, 0x51, 0xcc, 0xa5, 0x54, 0x91, 0x4d, 0x28, 0xf8, 0x94, 0xb2,
+	0x8e, 0x8e, 0xb8, 0x35, 0x4e, 0xb7, 0x64, 0xd4, 0x25, 0x32, 0xe0, 0x81, 0x8a, 0xea, 0x55, 0x11,
+	0xd5, 0x5b, 0x89, 0xa8, 0xae, 0x8b, 0xdf, 0x58, 0x30, 0x87, 0x61, 0x9a, 0x8b, 0x85, 0xe9, 0x6d,
+	0x00, 0x79, 0x5d, 0x42, 0x6b, 0x5e, 0x68, 0x2d, 0x4a, 0x0e, 0xd7, 0xbb, 0x05, 0xc5, 0x9e, 0xe7,
+	0xb0, 0x8e, 0x50, 0xbe, 0x26, 0xfd, 0xce, 0x19, 0x4f, 0xb9, 0xf5, 0xf7, 0xa1, 0x18, 0xa9, 0x88,
+	0x22, 0x78, 0x25, 0x8a, 0x60, 0x23, 0x16, 0xe1, 0x59, 0xeb, 0x17, 0xb8, 0x7e, 0x88, 0x59, 0x08,
+	0x8e, 0xe0, 0xe0, 0x03, 0x16, 0x0b, 0x1e, 0xd0, 0xf3, 0xca, 0x75, 0x40, 0x63, 0xc9, 0x9a, 0x0f,
+	0x68, 0x5d, 0x1d, 0x42, 0x09, 0xeb, 0x0c, 0x2a, 0xc7, 0x24, 0x60, 0x07, 0xc4, 0x5b, 0x1a, 0x7c,
+	0xeb, 0x1e, 0x6c, 0xc4, 0x74, 0xe8, 0x78, 0xe2, 0x76, 0x48, 0x8c, 0x65, 0x5b, 0x12, 0x56, 0x17,
+	0x36, 0x0e, 0xc8, 0xc8, 0x55, 0x69, 0xb7, 0x24, 0x3c, 0xdf, 0x01, 0x8a, 0x2b, 0x51, 0x80, 0xee,
+	0x41, 0x5e, 0x06, 0x89, 0xd2, 0x90, 0x52, 0x06, 0x94, 0x80, 0xd5, 0x81, 0x9b, 0xdc, 0xa0, 0xb0,
+	0xa0, 0x4c, 0x5b, 0xc4, 0xbd, 0x0c, 0xd6, 0xa8, 0x22, 0x67, 0x55, 0xda, 0x58, 0x87, 0x50, 0x4d,
+	0x2a, 0xb8, 0x48, 0xbd, 0x7a, 0x63, 0xc0, 0x75, 0x6e, 0xeb, 0x9e, 0xe7, 0x2d, 0xb9, 0x62, 0x6d,
+	0x41, 0x71, 0xe8, 0xbc, 0xee, 0xc8, 0x1a, 0x21, 0x27, 0x82, 0xc2, 0xd0, 0x79, 0x2d, 0x6a, 0x89,
+	0xe8, 0x30, 0x2f, 0xc8, 0x38, 0xec, 0x26, 0x7c, 0x8d, 0xbe, 0x85, 0x1c, 0xf5, 0x5d, 0xec, 0x8b,
+	0xdc, 0x5d, 0x6f, 0x7c, 0x1c, 0xea, 0x4e, 0x85, 0x5b, 0x6f, 0x71, 0x51, 0x5b, 0x7e, 0x61, 0x7d,
+	0x0a, 0x39, 0x41, 0xf3, 0xbc, 0x7c, 0xd2, 0x7a, 0xd2, 0x54, 0x19, 0xda, 0x7a, 0xda, 0x92, 0xdd,
+	0xe6, 0xd1, 0x5e, 0xbb, 0x59, 0xc9, 0xf0, 0x14, 0x99, 0x3f, 0xec, 0x22, 0x3e, 0xfc, 0x37, 0x13,
+	0x8f, 0x97, 0xa5, 0x39, 0x30, 0xea, 0xfe, 0xd2, 0x79, 0x92, 0x40, 0x37, 0x20, 0x4f, 0x7b, 0xbd,
+	0x00, 0x33, 0xe5, 0x3b, 0x45, 0xe9, 0xf4, 0xc9, 0xc5, 0xd2, 0x87, 0x4b, 0xf7, 0xa8, 0xe7, 0xd1,
+	0x73, 0x51, 0xf6, 0x0a, 0xb6, 0xa2, 0xf8, 0x00, 0xc5, 0x7d, 0xde, 0x19, 0x62, 0xbf, 0x8f, 0x03,
+	0x51, 0xf5, 0x0a, 0x36, 0x70, 0xd6, 0x89, 0xe0, 0xa0, 0xbb, 0x50, 0x76, 0x49, 0xe0, 0x9c, 0x79,
+	0xb8, 0x73, 0xee, 0x78, 0x2f, 0xaa, 0x05, 0x21, 0x51, 0x52, 0xbc, 0x67, 0x8e, 0xf7, 0x42, 0xb7,
+	0xa4, 0xe2, 0xfb, 0xb7, 0x24, 0xf8, 0xbf, 0x2d, 0xc9, 0xda, 0x87, 0xab, 0x33, 0xbe, 0xbe, 0xc8,
+	0x85, 0x0d, 0xc2, 0x5e, 0x7f, 0xec, 0x8c, 0xfa, 0x13, 0xa7, 0xbf, 0xbc, 0xca, 0xf6, 0x47, 0x34,
+	0xe8, 0xc6, 0x54, 0x29, 0xc8, 0x07, 0x50, 0xf4, 0x42, 0xa6, 0x02, 0x5d, 0x0b, 0x55, 0x2d, 0xf8,
+	0xa6, 0x1e, 0x72, 0x6c, 0xfd, 0xa9, 0xf9, 0x18, 0x0a, 0x21, 0x9b, 0xe7, 0xd1, 0xc8, 0x19, 0x62,
+	0xd5, 0x61, 0xc5, 0x9a, 0x47, 0x82, 0x78, 0x68, 0x08, 0x70, 0x19, 0x5b, 0x12, 0xb2, 0x5d, 0x7b,
+	0xd4, 0x57, 0xe3, 0xb0, 0x24, 0xac, 0x09, 0x5c, 0xb1, 0x9d, 0xf3, 0x7d, 0xcf, 0x19, 0xe2, 0x0f,
+	0xd9, 0xab, 0x3e, 0x83, 0x8a, 0x56, 0xab, 0xdc, 0x13, 0x0e, 0x93, 0x46, 0x6c, 0x98, 0xfc, 0x15,
+	0xaa, 0xc7, 0x4e, 0x58, 0xf6, 0x0e, 0xa8, 0xcf, 0x5b, 0xf2, 0x87, 0xc4, 0x79, 0x00, 0x9b, 0x29,
+	0xfa, 0xdf, 0xbf, 0x3f, 0xfc, 0x15, 0x85, 0x45, 0xb0, 0x3f, 0x3d, 0xc1, 0x41, 0xc0, 0xaf, 0x74,
+	0x49, 0x76, 0xe8, 0x02, 0x91, 0x9d, 0x2f, 0x10, 0xfa, 0x31, 0x11, 0x95, 0x93, 0x94, 0x89, 0x8f,
+	0x4b, 0xbe, 0x9c, 0x60, 0x7f, 0xaa, 0x46, 0x25, 0x49, 0xf0, 0x16, 0x94, 0x34, 0xe1, 0x22, 0xd9,
+	0x48, 0x60, 0xfb, 0x80, 0x78, 0x0c, 0xfb, 0xa7, 0x03, 0x27, 0x78, 0x46, 0xd8, 0xe0, 0x94, 0xf4,
+	0x47, 0x0e, 0x9b, 0xf8, 0x97, 0x4b, 0x4b, 0xde, 0x52, 0x06, 0x4e, 0x20, 0xba, 0x66, 0xd9, 0x16,
+	0x6b, 0xeb, 0x6b, 0xd8, 0x59, 0xac, 0x4a, 0xc7, 0x9d, 0xf8, 0xce, 0xd0, 0xdf, 0x35, 0xfe, 0x04,
+	0xf8, 0x48, 0xbd, 0x8a, 0xb1, 0xff, 0x8a, 0x74, 0x31, 0x7a, 0x06, 0x95, 0xf9, 0x57, 0x23, 0xda,
+	0x9e, 0xcd, 0xde, 0xc4, 0xd3, 0xd6, 0xdc, 0x59, 0x2c, 0x20, 0x95, 0x5b, 0x2b, 0xe8, 0x51, 0x7c,
+	0x5e, 0xae, 0xa6, 0x3c, 0xdb, 0xe4, 0x51, 0x9b, 0x0b, 0x1f, 0x74, 0xd6, 0xca, 0xae, 0x81, 0x4e,
+	0x61, 0x7d, 0xf6, 0x35, 0x83, 0x6e, 0xcf, 0xea, 0x9e, 0x7b, 0x56, 0x99, 0x77, 0x16, 0x6d, 0xc7,
+	0x0e, 0xfd, 0x01, 0xca, 0xf1, 0xc9, 0x1f, 0x6d, 0xe9, 0x6f, 0x12, 0x0f, 0x1e, 0xf3, 0x56, 0xfa,
+	0x66, 0x64, 0xe7, 0x29, 0xac, 0xcf, 0x8e, 0xa7, 0x1a, 0x61, 0xea, 0xcc, 0xac, 0x11, 0xa6, 0x4f,
+	0xb5, 0x02, 0xe1, 0x23, 0x28, 0x46, 0x83, 0xa4, 0x76, 0xde, 0xfc, 0xfc, 0xaa, 0x9d, 0x97, 0x98,
+	0x3a, 0xc5, 0x29, 0x4d, 0x00, 0xdd, 0x62, 0xd0, 0x66, 0x7c, 0xee, 0x98, 0x99, 0x3b, 0x4d, 0x33,
+	0x6d, 0x2b, 0xb2, 0xf0, 0x7b, 0x28, 0xc5, 0xfe, 0x49, 0x41, 0xe6, 0xac, 0x87, 0xe3, 0x7f, 0xe2,
+	0x98, 0x5b, 0xa9, 0x7b, 0x71, 0x5f, 0xcd, 0xce, 0x29, 0xda, 0x57, 0xa9, 0xc3, 0x90, 0xf6, 0x55,
+	0xfa, 0x78, 0x23, 0xac, 0x7c, 0x0c, 0xa5, 0x58, 0x23, 0x45, 0x29, 0xb6, 0x24, 0xe1, 0xa5, 0x74,
+	0x5e, 0x71, 0x56, 0x1b, 0xae, 0xcc, 0x75, 0x2c, 0x74, 0x67, 0x61, 0x2b, 0x93, 0x67, 0x6e, 0xbf,
+	0xa3, 0xd5, 0x59, 0x2b, 0x68, 0x0f, 0x0a, 0x61, 0x57, 0x40, 0x37, 0xa3, 0x6c, 0x9f, 0x6d, 0x4f,
+	0x66, 0x35, 0xb9, 0x11, 0x03, 0xf6, 0x23, 0x6c, 0x24, 0x0a, 0x36, 0x8a, 0xd2, 0x70, 0x51, 0x2f,
+	0x31, 0xef, 0xbe, 0x45, 0x22, 0x82, 0xf7, 0x3c, 0x2c, 0x01, 0xba, 0x00, 0xce, 0x97, 0x80, 0x44,
+	0x75, 0x9f, 0x2f, 0x01, 0xc9, 0xda, 0x29, 0x60, 0x3f, 0x97, 0x8f, 0xae, 0xf8, 0x78, 0xaf, 0x8f,
+	0x5e, 0xf0, 0xb2, 0xd0, 0x47, 0x2f, 0x7a, 0x19, 0x88, 0xa3, 0x03, 0xa8, 0x2e, 0x2a, 0x81, 0xe8,
+	0x73, 0x7d, 0xcf, 0x6f, 0xad, 0xc7, 0x66, 0xed, 0xdd, 0x82, 0xa1, 0xca, 0x9a, 0xb1, 0x6b, 0x9c,
+	0xe5, 0xc5, 0x40, 0xf7, 0xe5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x52, 0x6f, 0x9d, 0x27, 0x08,
+	0x15, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 3bf71ddf6..049e51684 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "gIbCgJtCbBOIFV3fkbF1UL7i+pQ=",
+			"checksumSHA1": "bGfAlbcqTr3IdViAogIPtRb8ZS4=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "3c86c0d21212fbeb64662456c5d21aefd72c59b2",
-			"revisionTime": "2017-11-28T21:32:50Z",
-			"version": "v0.57.0",
-			"versionExact": "v0.57.0"
+			"revision": "b1412591107369492d738b39493667548ce8c0f0",
+			"revisionTime": "2017-11-30T10:17:56Z",
+			"version": "v0.58.0",
+			"versionExact": "v0.58.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",