Populate `flat_path` field of `TreeEntry`s

7 files changed, 166 insertions, 96 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aa2ee64c..e527435ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ UNRELEASED
   https://gitlab.com/gitlab-org/gitaly/merge_requests/324
 - Add missing cmd.Close in log.GetCommit
   https://gitlab.com/gitlab-org/gitaly/merge_requests/326
+- Populate `flat_path` field of `TreeEntry`s
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/328
 
 v0.37.0
 
diff --git a/internal/service/commit/testhelper_test.go b/internal/service/commit/testhelper_test.go
index 840636bdb..852d22534 100644
--- a/internal/service/commit/testhelper_test.go
+++ b/internal/service/commit/testhelper_test.go
@@ -85,7 +85,8 @@ func newCommitServiceClient(t *testing.T, serviceSocketPath string) (pb.CommitSe
 
 func treeEntriesEqual(a, b *pb.TreeEntry) bool {
 	return a.CommitOid == b.CommitOid && a.Oid == b.Oid && a.Mode == b.Mode &&
-		bytes.Equal(a.Path, b.Path) && a.RootOid == b.RootOid && a.Type == b.Type
+		bytes.Equal(a.Path, b.Path) && bytes.Equal(a.FlatPath, b.FlatPath) &&
+		a.RootOid == b.RootOid && a.Type == b.Type
 }
 
 func dummyCommitAuthor(ts int64) *pb.CommitAuthor {
diff --git a/internal/service/commit/tree_entries.go b/internal/service/commit/tree_entries.go
index 540e99160..0651d0be7 100644
--- a/internal/service/commit/tree_entries.go
+++ b/internal/service/commit/tree_entries.go
@@ -26,6 +26,31 @@ func validateGetTreeEntriesRequest(in *pb.GetTreeEntriesRequest) error {
 	return nil
 }
 
+func populateFlatPath(entries []*pb.TreeEntry, stdin io.Writer, stdout *bufio.Reader) error {
+	for _, entry := range entries {
+		entry.FlatPath = entry.Path
+
+		if entry.Type != pb.TreeEntry_TREE {
+			continue
+		}
+
+		for {
+			subentries, err := treeEntries(entry.CommitOid, string(entry.FlatPath), stdin, stdout)
+
+			if err != nil {
+				return err
+			}
+			if len(subentries) != 1 || subentries[0].Type != pb.TreeEntry_TREE {
+				break
+			}
+
+			entry.FlatPath = subentries[0].Path
+		}
+	}
+
+	return nil
+}
+
 func getTreeEntriesHandler(stream pb.CommitService_GetTreeEntriesServer, revision, path string) catfile.Handler {
 	return func(stdin io.Writer, stdout *bufio.Reader) error {
 		entries, err := treeEntries(revision, path, stdin, stdout)
@@ -33,6 +58,10 @@ func getTreeEntriesHandler(stream pb.CommitService_GetTreeEntriesServer, revisio
 			return err
 		}
 
+		if err := populateFlatPath(entries, stdin, stdout); err != nil {
+			return err
+		}
+
 		for len(entries) > maxTreeEntries {
 			chunk := &pb.GetTreeEntriesResponse{
 				Entries: entries[:maxTreeEntries],
diff --git a/internal/service/commit/tree_entries_test.go b/internal/service/commit/tree_entries_test.go
index 2279ef21c..55b370c85 100644
--- a/internal/service/commit/tree_entries_test.go
+++ b/internal/service/commit/tree_entries_test.go
@@ -21,8 +21,8 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 		maxTreeEntries = oldMaxTreeEntries
 	}()
 
-	commitID := "913c66a37b4a45b9769037c55c2d238bd0942d2e"
-	rootOid := "faafbe7fe23fb83c664c78aaded9566c8f934412"
+	commitID := "ce369011c189f62c815f5971d096b26759bab0d1"
+	rootOid := "729bb692f55d49149609dd1ceaaf1febbdec7d0d"
 
 	server := startTestServices(t)
 	defer server.Stop()
@@ -35,6 +35,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "fd90a3d2d21d6b4f9bec2c33fb7f49780c55f0d2",
 			RootOid:   rootOid,
 			Path:      []byte(".DS_Store"),
+			FlatPath:  []byte(".DS_Store"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -43,6 +44,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "470ad2fcf1e33798f1afc5781d08e60c40f51e7a",
 			RootOid:   rootOid,
 			Path:      []byte(".gitignore"),
+			FlatPath:  []byte(".gitignore"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -51,6 +53,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "fdaada1754989978413d618ee1fb1c0469d6a664",
 			RootOid:   rootOid,
 			Path:      []byte(".gitmodules"),
+			FlatPath:  []byte(".gitmodules"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -59,6 +62,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "c74175afd117781cbc983664339a0f599b5bb34e",
 			RootOid:   rootOid,
 			Path:      []byte("CHANGELOG"),
+			FlatPath:  []byte("CHANGELOG"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -67,6 +71,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "c1788657b95998a2f177a4f86d68a60f2a80117f",
 			RootOid:   rootOid,
 			Path:      []byte("CONTRIBUTING.md"),
+			FlatPath:  []byte("CONTRIBUTING.md"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -75,6 +80,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "50b27c6518be44c42c4d87966ae2481ce895624c",
 			RootOid:   rootOid,
 			Path:      []byte("LICENSE"),
+			FlatPath:  []byte("LICENSE"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -83,6 +89,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "95d9f0a5e7bb054e9dd3975589b8dfc689e20e88",
 			RootOid:   rootOid,
 			Path:      []byte("MAINTENANCE.md"),
+			FlatPath:  []byte("MAINTENANCE.md"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -91,6 +98,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "bf757025c40c62e6ffa6f11d3819c769a76dbe09",
 			RootOid:   rootOid,
 			Path:      []byte("PROCESS.md"),
+			FlatPath:  []byte("PROCESS.md"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -99,6 +107,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "faaf198af3a36dbf41961466703cc1d47c61d051",
 			RootOid:   rootOid,
 			Path:      []byte("README.md"),
+			FlatPath:  []byte("README.md"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -107,6 +116,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "998707b421c89bd9a3063333f9f728ef3e43d101",
 			RootOid:   rootOid,
 			Path:      []byte("VERSION"),
+			FlatPath:  []byte("VERSION"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
@@ -115,14 +125,16 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "3c122d2b7830eca25235131070602575cf8b41a1",
 			RootOid:   rootOid,
 			Path:      []byte("encoding"),
+			FlatPath:  []byte("encoding"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
 		},
 		{
-			Oid:       "ab746f8ad0b84b147290041dc13cc9c7adc52930",
+			Oid:       "b4a3321157f6e80c42b031ecc9ba79f784c8a557",
 			RootOid:   rootOid,
 			Path:      []byte("files"),
+			FlatPath:  []byte("files"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
@@ -131,6 +143,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "409f37c4f05865e4fb208c771485f211a22c4c2d",
 			RootOid:   rootOid,
 			Path:      []byte("six"),
+			FlatPath:  []byte("six"),
 			Type:      pb.TreeEntry_COMMIT,
 			Mode:      0160000,
 			CommitOid: commitID,
@@ -141,14 +154,25 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "60d7a906c2fd9e4509aeb1187b98d0ea7ce827c9",
 			RootOid:   rootOid,
 			Path:      []byte("files/.DS_Store"),
+			FlatPath:  []byte("files/.DS_Store"),
 			Type:      pb.TreeEntry_BLOB,
 			Mode:      0100644,
 			CommitOid: commitID,
 		},
 		{
+			Oid:       "2132d150328bd9334cc4e62a16a5d998a7e399b9",
+			RootOid:   rootOid,
+			Path:      []byte("files/flat"),
+			FlatPath:  []byte("files/flat/path/correct"),
+			Type:      pb.TreeEntry_TREE,
+			Mode:      040000,
+			CommitOid: commitID,
+		},
+		{
 			Oid:       "a1e8f8d745cc87e3a9248358d9352bb7f9a0aeba",
 			RootOid:   rootOid,
 			Path:      []byte("files/html"),
+			FlatPath:  []byte("files/html"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
@@ -157,6 +181,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "5e147e3af6740ee83103ec2ecdf846cae696edd1",
 			RootOid:   rootOid,
 			Path:      []byte("files/images"),
+			FlatPath:  []byte("files/images"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
@@ -165,6 +190,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "7853101769f3421725ddc41439c2cd4610e37ad9",
 			RootOid:   rootOid,
 			Path:      []byte("files/js"),
+			FlatPath:  []byte("files/js"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
@@ -173,6 +199,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "fd581c619bf59cfdfa9c8282377bb09c2f897520",
 			RootOid:   rootOid,
 			Path:      []byte("files/markdown"),
+			FlatPath:  []byte("files/markdown"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
@@ -181,6 +208,7 @@ func TestSuccessfulGetTreeEntries(t *testing.T) {
 			Oid:       "b59dbe4a27371d53e61bf3cb8bef66be53572db0",
 			RootOid:   rootOid,
 			Path:      []byte("files/ruby"),
+			FlatPath:  []byte("files/ruby"),
 			Type:      pb.TreeEntry_TREE,
 			Mode:      040000,
 			CommitOid: commitID,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index 9eb2aa3f1..be386c9ed 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.32.0
+0.33.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 03a924880..a08273080 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
@@ -419,6 +419,8 @@ type TreeEntry struct {
 	Mode int32 `protobuf:"varint,5,opt,name=mode" json:"mode,omitempty"`
 	// The commit object via which this entry was retrieved
 	CommitOid string `protobuf:"bytes,6,opt,name=commit_oid,json=commitOid" json:"commit_oid,omitempty"`
+	// Relative path of the first subdir that doesn't have only one directory descendant
+	FlatPath []byte `protobuf:"bytes,7,opt,name=flat_path,json=flatPath,proto3" json:"flat_path,omitempty"`
 }
 
 func (m *TreeEntry) Reset()                    { *m = TreeEntry{} }
@@ -468,6 +470,13 @@ func (m *TreeEntry) GetCommitOid() string {
 	return ""
 }
 
+func (m *TreeEntry) GetFlatPath() []byte {
+	if m != nil {
+		return m.FlatPath
+	}
+	return nil
+}
+
 type GetTreeEntriesRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
 	Revision   []byte      `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"`
@@ -1773,90 +1782,91 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("commit.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 1353 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0x36, 0xf5, 0x67, 0x69, 0xa4, 0x3a, 0xf2, 0xe6, 0x4f, 0xa6, 0x93, 0xd8, 0xd9, 0xfe, 0xc0,
-	0x41, 0x0a, 0x25, 0x50, 0x51, 0xa0, 0x3d, 0x15, 0x56, 0x22, 0xbb, 0x4e, 0xed, 0x28, 0x60, 0x04,
-	0x04, 0xed, 0xc5, 0xa0, 0xc4, 0x95, 0xcc, 0x86, 0xd4, 0x2a, 0xe4, 0x2a, 0x8e, 0x5a, 0xa0, 0xf7,
-	0x02, 0x7d, 0x95, 0x3e, 0x44, 0x5f, 0xa1, 0xf7, 0xa2, 0xf7, 0x02, 0x7d, 0x81, 0x9e, 0x8a, 0xfd,
-	0x21, 0x97, 0x12, 0xa9, 0xb4, 0x71, 0x20, 0x5f, 0x84, 0x9d, 0xd9, 0xe1, 0xce, 0xb7, 0xb3, 0x33,
-	0xdf, 0xce, 0x0a, 0x6a, 0x03, 0xea, 0xfb, 0x2e, 0x6b, 0x4e, 0x02, 0xca, 0x28, 0x2a, 0x8d, 0x5c,
-	0x66, 0x7b, 0x33, 0xb3, 0x16, 0x9e, 0xd9, 0x01, 0x71, 0xa4, 0xd6, 0xdc, 0x19, 0x51, 0x3a, 0xf2,
-	0xc8, 0x03, 0x21, 0xf5, 0xa7, 0xc3, 0x07, 0xcc, 0xf5, 0x49, 0xc8, 0x6c, 0x7f, 0x22, 0x0d, 0xb0,
-	0x03, 0xe8, 0x91, 0x58, 0xe6, 0x39, 0xb3, 0x59, 0x68, 0x91, 0x57, 0x53, 0x12, 0x32, 0xd4, 0x02,
-	0x08, 0xc8, 0x84, 0x86, 0x2e, 0xa3, 0xc1, 0xac, 0x61, 0xec, 0x1a, 0x7b, 0xd5, 0x16, 0x6a, 0x4a,
-	0x0f, 0x4d, 0x2b, 0x9e, 0xb1, 0x12, 0x56, 0xc8, 0x84, 0x72, 0x40, 0x5e, 0xbb, 0xa1, 0x4b, 0xc7,
-	0x8d, 0xdc, 0xae, 0xb1, 0x57, 0xb3, 0x62, 0x19, 0x0f, 0xe0, 0xea, 0x9c, 0x97, 0x70, 0x42, 0xc7,
-	0x21, 0x41, 0x75, 0xc8, 0x53, 0xd7, 0x11, 0xeb, 0x57, 0x2c, 0x3e, 0x44, 0xb7, 0xa0, 0x62, 0x3b,
-	0x8e, 0xcb, 0x5c, 0x3a, 0x0e, 0xc5, 0x2a, 0x45, 0x4b, 0x2b, 0xf8, 0xac, 0x43, 0x3c, 0x22, 0x67,
-	0xf3, 0x72, 0x36, 0x56, 0xe0, 0x9f, 0x0d, 0xb8, 0x29, 0xbd, 0x1c, 0x85, 0xfb, 0xe3, 0x01, 0x09,
-	0x19, 0x0d, 0xde, 0x67, 0x43, 0x3b, 0x50, 0xb5, 0xd5, 0x32, 0xa7, 0xae, 0x23, 0xd0, 0x54, 0x2c,
-	0x88, 0x54, 0x47, 0x0e, 0xda, 0x82, 0xf2, 0xe0, 0xcc, 0xf5, 0x1c, 0x3e, 0x9b, 0x17, 0xb3, 0xeb,
-	0x42, 0x3e, 0x72, 0xf0, 0x43, 0x68, 0xa4, 0xa1, 0xa8, 0x5d, 0x5f, 0x83, 0xe2, 0x6b, 0xdb, 0x9b,
-	0x12, 0x01, 0xa3, 0x6c, 0x49, 0x01, 0xff, 0x62, 0x40, 0xbd, 0x17, 0x10, 0xd2, 0x19, 0xb3, 0x60,
-	0xb6, 0xa2, 0x73, 0x40, 0x08, 0x0a, 0x13, 0x9b, 0x9d, 0x09, 0xb4, 0x35, 0x4b, 0x8c, 0x39, 0x1c,
-	0xcf, 0xf5, 0x5d, 0xd6, 0x28, 0xec, 0x1a, 0x7b, 0x79, 0x4b, 0x0a, 0xf8, 0x77, 0x03, 0x36, 0x13,
-	0x70, 0x14, 0xf4, 0x2f, 0xa0, 0xc0, 0x66, 0x13, 0x89, 0x7c, 0xa3, 0xf5, 0x51, 0x84, 0x24, 0x65,
-	0xd8, 0xec, 0xf6, 0xbf, 0x27, 0x03, 0xd6, 0x9b, 0x4d, 0x88, 0x25, 0xbe, 0x88, 0x8e, 0x3a, 0xa7,
-	0x8f, 0x1a, 0x41, 0x21, 0x74, 0x7f, 0x20, 0x02, 0x4b, 0xde, 0x12, 0x63, 0xae, 0xf3, 0xa9, 0x43,
-	0x04, 0x94, 0xa2, 0x25, 0xc6, 0x5c, 0xe7, 0xd8, 0xcc, 0x6e, 0x14, 0x25, 0x66, 0x3e, 0xc6, 0x9f,
-	0x03, 0x68, 0x0f, 0x08, 0xa0, 0xf4, 0xa8, 0x7b, 0x72, 0x72, 0xd4, 0xab, 0xaf, 0xa1, 0x32, 0x14,
-	0xda, 0xc7, 0xdd, 0x76, 0xdd, 0xe0, 0xa3, 0x9e, 0xd5, 0xe9, 0xd4, 0x73, 0x68, 0x1d, 0xf2, 0xbd,
-	0xfd, 0xc3, 0x7a, 0x1e, 0x53, 0xb8, 0x2e, 0x4f, 0x25, 0x6c, 0x13, 0x76, 0x4e, 0xc8, 0xf8, 0x7d,
-	0xe2, 0x8c, 0xa0, 0x30, 0x0c, 0xa8, 0xaf, 0x62, 0x2c, 0xc6, 0x68, 0x03, 0x72, 0x8c, 0xaa, 0xe8,
-	0xe6, 0x18, 0xc5, 0x1d, 0xb8, 0xb1, 0xe8, 0x50, 0x45, 0xf2, 0x3e, 0xac, 0xcb, 0xf2, 0x0d, 0x1b,
-	0xc6, 0x6e, 0x7e, 0xaf, 0xda, 0xda, 0x8c, 0xdc, 0x1d, 0xba, 0x4c, 0x7e, 0x63, 0x45, 0x16, 0xf8,
-	0x4f, 0x83, 0xd7, 0xcf, 0x74, 0xac, 0x26, 0x56, 0x55, 0xa6, 0xe8, 0x21, 0x14, 0xed, 0x21, 0x23,
-	0x81, 0xd8, 0x41, 0xb5, 0x65, 0x36, 0x25, 0x7b, 0x34, 0x23, 0xf6, 0x68, 0xf6, 0x22, 0xf6, 0xb0,
-	0xa4, 0x21, 0x6a, 0x41, 0xa9, 0x4f, 0x86, 0x34, 0x90, 0x47, 0xf6, 0xf6, 0x4f, 0x94, 0x65, 0x9c,
-	0x84, 0x45, 0x9d, 0x84, 0xf8, 0x53, 0xb8, 0x36, 0xbf, 0x41, 0x5d, 0x2b, 0x03, 0xae, 0x17, 0x9b,
-	0x2b, 0x5a, 0x52, 0xc0, 0x7f, 0x18, 0x50, 0x89, 0x73, 0x2e, 0x83, 0x45, 0xb6, 0xa0, 0x1c, 0x50,
-	0xca, 0x4e, 0x75, 0xc6, 0xad, 0x73, 0xb9, 0x2b, 0xb3, 0x2e, 0x55, 0x01, 0x0f, 0x54, 0x56, 0x17,
-	0x44, 0x56, 0x6f, 0xa7, 0xb2, 0xba, 0x29, 0x7e, 0x13, 0xc9, 0x1c, 0xa5, 0x69, 0x31, 0x91, 0xa6,
-	0xb7, 0x01, 0xe4, 0x71, 0x09, 0xaf, 0x25, 0xe1, 0xb5, 0x22, 0x35, 0x5d, 0xd7, 0xc1, 0xf7, 0xa1,
-	0x12, 0xaf, 0x12, 0x27, 0xe9, 0x5a, 0x9c, 0xa4, 0x46, 0x22, 0x89, 0xf3, 0xf8, 0x47, 0xb8, 0x7e,
-	0x48, 0x58, 0xe4, 0xdf, 0x25, 0xe1, 0x25, 0xf2, 0x01, 0xcf, 0xd9, 0x45, 0xe7, 0x3a, 0x67, 0x89,
-	0x54, 0x2d, 0xe6, 0xac, 0x26, 0x80, 0xc8, 0x02, 0xf7, 0xa1, 0x7e, 0xec, 0x86, 0xec, 0xc0, 0xf5,
-	0x56, 0x06, 0x1f, 0xdf, 0x83, 0xcd, 0x84, 0x0f, 0x9d, 0x32, 0x7c, 0x1f, 0x12, 0x63, 0xcd, 0x92,
-	0x02, 0x1e, 0xc0, 0xe6, 0x81, 0x3b, 0x76, 0x54, 0x65, 0xad, 0x08, 0xcf, 0x57, 0x80, 0x92, 0x4e,
-	0x14, 0xa0, 0x7b, 0x50, 0x92, 0x79, 0xa0, 0x3c, 0x64, 0x54, 0xba, 0x32, 0xc0, 0xff, 0x18, 0x70,
-	0x9d, 0xaf, 0xb0, 0xef, 0x79, 0x2b, 0x2e, 0xf5, 0x6d, 0xa8, 0xf8, 0xf6, 0x9b, 0x53, 0x59, 0x5c,
-	0xf2, 0x2a, 0x2d, 0xfb, 0xf6, 0x1b, 0x51, 0x84, 0x82, 0x9a, 0x5f, 0xba, 0x93, 0x88, 0x86, 0xf9,
-	0x18, 0x7d, 0x09, 0x45, 0x1a, 0x38, 0x24, 0x10, 0x49, 0xbf, 0xd1, 0xfa, 0x30, 0xf2, 0x9d, 0x09,
-	0xb7, 0xd9, 0xe5, 0xa6, 0x96, 0xfc, 0x02, 0x7f, 0x0c, 0x45, 0x21, 0xf3, 0x6c, 0x7f, 0xda, 0x7d,
-	0xda, 0x51, 0x79, 0xdf, 0x7d, 0xd6, 0x95, 0x34, 0xfd, 0x78, 0xbf, 0xd7, 0xa9, 0xe7, 0x78, 0xe2,
-	0x2d, 0x2e, 0x76, 0x11, 0xb2, 0xfc, 0x2b, 0x97, 0x3c, 0x85, 0x95, 0x05, 0x30, 0xbe, 0x36, 0x65,
-	0xf0, 0xa4, 0x80, 0x6e, 0x40, 0x89, 0x0e, 0x87, 0x21, 0x61, 0x2a, 0x76, 0x4a, 0xd2, 0x49, 0x59,
-	0x4c, 0x24, 0x25, 0xb7, 0x1e, 0x52, 0xcf, 0xa3, 0xe7, 0x82, 0x2f, 0xca, 0x96, 0x92, 0x78, 0xe7,
-	0xc1, 0x63, 0x7e, 0xea, 0x93, 0x60, 0x44, 0xc2, 0xc6, 0xba, 0x98, 0x04, 0xae, 0x3a, 0x11, 0x1a,
-	0x74, 0x17, 0x6a, 0x8e, 0x1b, 0xda, 0x7d, 0x8f, 0x9c, 0x9e, 0xdb, 0xde, 0xcb, 0x46, 0x59, 0x58,
-	0x54, 0x95, 0xee, 0x85, 0xed, 0xbd, 0xd4, 0x5c, 0x5e, 0x79, 0x77, 0x2e, 0x87, 0xff, 0xcb, 0xe5,
-	0xb8, 0x0d, 0x57, 0xe7, 0x62, 0x7d, 0x91, 0x03, 0x3b, 0x8b, 0x2e, 0xc9, 0x63, 0x7b, 0x3c, 0x9a,
-	0xda, 0xa3, 0xd5, 0xf1, 0xc5, 0xaf, 0x71, 0x87, 0x98, 0x70, 0xa5, 0x20, 0x1f, 0x40, 0xc5, 0x8b,
-	0x94, 0x0a, 0xf4, 0x5e, 0xe4, 0x6a, 0xc9, 0x37, 0xcd, 0x48, 0x63, 0xe9, 0x4f, 0xcd, 0x27, 0x50,
-	0x8e, 0xd4, 0xbc, 0x8e, 0xc6, 0xb6, 0x4f, 0xd4, 0xd5, 0x24, 0xc6, 0x3c, 0x13, 0x44, 0x87, 0x2e,
-	0xc0, 0xe5, 0x2c, 0x29, 0xc8, 0x7b, 0xce, 0xa3, 0x81, 0xea, 0x23, 0xa5, 0x80, 0xa7, 0x70, 0xc5,
-	0xb2, 0xcf, 0xdb, 0x9e, 0xed, 0x93, 0xcb, 0xbc, 0x01, 0x3e, 0x81, 0xba, 0x76, 0xab, 0xc2, 0x13,
-	0x75, 0x61, 0x46, 0xa2, 0x0b, 0xfb, 0x09, 0x1a, 0xc7, 0x76, 0xa8, 0xce, 0xf3, 0x80, 0x06, 0xcf,
-	0x6c, 0x76, 0x76, 0x99, 0x38, 0x0f, 0x60, 0x2b, 0xc3, 0xff, 0xbb, 0xb3, 0xee, 0x6f, 0x71, 0x5a,
-	0x84, 0xed, 0xd9, 0x09, 0x09, 0x43, 0x7e, 0xa4, 0x2b, 0xda, 0x87, 0x26, 0x88, 0xfc, 0x22, 0x41,
-	0xe8, 0x2e, 0x3c, 0xa6, 0x93, 0x8c, 0x56, 0x89, 0x5b, 0xbe, 0x9a, 0x92, 0x60, 0xa6, 0x7a, 0x0c,
-	0x29, 0xe0, 0xc3, 0xe8, 0xc1, 0x91, 0xdc, 0xc2, 0x05, 0xaa, 0xb1, 0xf5, 0x77, 0x19, 0x3e, 0x50,
-	0x6f, 0x35, 0x12, 0xbc, 0x76, 0x07, 0x04, 0xbd, 0x80, 0xfa, 0xe2, 0x5b, 0x06, 0xed, 0xcc, 0x97,
-	0x46, 0xea, 0xc1, 0x65, 0xee, 0x2e, 0x37, 0x90, 0xa8, 0xf0, 0x1a, 0x7a, 0x9c, 0xec, 0xe2, 0x1a,
-	0x19, 0x8f, 0x09, 0xb9, 0xd4, 0xd6, 0xd2, 0x67, 0x06, 0x5e, 0x7b, 0x68, 0xa0, 0xe7, 0xb0, 0x31,
-	0xdf, 0x63, 0xa3, 0xdb, 0xf3, 0xbe, 0x17, 0x9a, 0x7d, 0xf3, 0xce, 0xb2, 0xe9, 0xc4, 0xa2, 0xdf,
-	0x40, 0x2d, 0xd9, 0x8f, 0xa2, 0x6d, 0xfd, 0x4d, 0xaa, 0x0d, 0x37, 0x6f, 0x65, 0x4f, 0xc6, 0xfb,
-	0x7c, 0x0e, 0x1b, 0xf3, 0x1d, 0x95, 0x46, 0x98, 0xd9, 0xe6, 0x69, 0x84, 0xd9, 0x8d, 0x98, 0x40,
-	0xf8, 0x18, 0x2a, 0x71, 0xef, 0xa3, 0x83, 0xb7, 0xd8, 0x72, 0xe9, 0xe0, 0xa5, 0x1a, 0x25, 0xb1,
-	0x4a, 0x07, 0x40, 0xf3, 0x37, 0xda, 0x4a, 0x5e, 0xea, 0x73, 0xad, 0x92, 0x69, 0x66, 0x4d, 0xc5,
-	0x3b, 0xfc, 0x1a, 0xaa, 0x89, 0xf7, 0x3d, 0x32, 0xe7, 0x23, 0x9c, 0xfc, 0x6b, 0xc1, 0xdc, 0xce,
-	0x9c, 0x4b, 0xc6, 0x6a, 0xbe, 0x09, 0xd0, 0xb1, 0xca, 0xec, 0x34, 0x74, 0xac, 0xb2, 0x7b, 0x07,
-	0xb1, 0xcb, 0x27, 0x50, 0x4d, 0xdc, 0x52, 0x28, 0x63, 0x2f, 0x69, 0x78, 0x19, 0xd7, 0x9a, 0x58,
-	0xab, 0x07, 0x57, 0x16, 0xae, 0x03, 0x74, 0x67, 0xe9, 0x3d, 0x21, 0xd7, 0xdc, 0xf9, 0x8f, 0x7b,
-	0x04, 0xaf, 0xa1, 0x7d, 0x28, 0x47, 0x94, 0x8b, 0x6e, 0xc6, 0xf4, 0x32, 0xcf, 0xfd, 0x66, 0x23,
-	0x3d, 0x91, 0x00, 0xf6, 0x1d, 0x6c, 0xa6, 0xd8, 0x10, 0xc5, 0x65, 0xb8, 0x8c, 0xa8, 0xcd, 0xbb,
-	0x6f, 0xb1, 0x88, 0xe1, 0x7d, 0x1b, 0x51, 0x80, 0x66, 0x97, 0x45, 0x0a, 0x48, 0x51, 0xe7, 0x22,
-	0x05, 0xa4, 0x89, 0x89, 0xc3, 0xee, 0x97, 0x44, 0x77, 0xf1, 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x72, 0x55, 0x08, 0x55, 0xce, 0x12, 0x00, 0x00,
+	// 1366 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6e, 0xdb, 0xb6,
+	0x17, 0x8f, 0xfc, 0x15, 0xf9, 0xd8, 0xff, 0xd4, 0x61, 0xbf, 0x1c, 0xa5, 0x6d, 0x52, 0xfd, 0xb7,
+	0x21, 0x45, 0x07, 0xb7, 0xf0, 0x30, 0x60, 0xbb, 0x1a, 0x92, 0xd6, 0xc9, 0xd2, 0x25, 0x75, 0xc1,
+	0x1a, 0x28, 0xb6, 0x9b, 0x40, 0xb6, 0x68, 0x47, 0xab, 0x64, 0xba, 0x12, 0xdd, 0xd4, 0x1b, 0xb0,
+	0xfb, 0x01, 0x7b, 0x95, 0x3d, 0xc4, 0x5e, 0x61, 0x2f, 0xb0, 0xfb, 0x01, 0x7b, 0x81, 0x5d, 0x0d,
+	0xfc, 0x90, 0x28, 0x5b, 0x72, 0xb7, 0xb6, 0x70, 0x6e, 0x0c, 0x9e, 0x43, 0x8a, 0xe7, 0xc7, 0xc3,
+	0x1f, 0x7f, 0x3c, 0x34, 0xd4, 0x07, 0x34, 0x08, 0x3c, 0xd6, 0x9a, 0x84, 0x94, 0x51, 0x54, 0x19,
+	0x79, 0xcc, 0xf1, 0x67, 0x56, 0x3d, 0x3a, 0x77, 0x42, 0xe2, 0x4a, 0xaf, 0xb5, 0x33, 0xa2, 0x74,
+	0xe4, 0x93, 0x07, 0xc2, 0xea, 0x4f, 0x87, 0x0f, 0x98, 0x17, 0x90, 0x88, 0x39, 0xc1, 0x44, 0x0e,
+	0xb0, 0x5d, 0x40, 0x8f, 0xc4, 0x34, 0xcf, 0x99, 0xc3, 0x22, 0x4c, 0x5e, 0x4d, 0x49, 0xc4, 0x50,
+	0x1b, 0x20, 0x24, 0x13, 0x1a, 0x79, 0x8c, 0x86, 0xb3, 0xa6, 0xb1, 0x6b, 0xec, 0xd5, 0xda, 0xa8,
+	0x25, 0x23, 0xb4, 0x70, 0xd2, 0x83, 0x53, 0xa3, 0x90, 0x05, 0x66, 0x48, 0x5e, 0x7b, 0x91, 0x47,
+	0xc7, 0xcd, 0xc2, 0xae, 0xb1, 0x57, 0xc7, 0x89, 0x6d, 0x0f, 0xe0, 0xea, 0x5c, 0x94, 0x68, 0x42,
+	0xc7, 0x11, 0x41, 0x0d, 0x28, 0x52, 0xcf, 0x15, 0xf3, 0x57, 0x31, 0x6f, 0xa2, 0x5b, 0x50, 0x75,
+	0x5c, 0xd7, 0x63, 0x1e, 0x1d, 0x47, 0x62, 0x96, 0x32, 0xd6, 0x0e, 0xde, 0xeb, 0x12, 0x9f, 0xc8,
+	0xde, 0xa2, 0xec, 0x4d, 0x1c, 0xf6, 0xcf, 0x06, 0xdc, 0x94, 0x51, 0x8e, 0xa3, 0xfd, 0xf1, 0x80,
+	0x44, 0x8c, 0x86, 0x1f, 0xb2, 0xa0, 0x1d, 0xa8, 0x39, 0x6a, 0x9a, 0x33, 0xcf, 0x15, 0x68, 0xaa,
+	0x18, 0x62, 0xd7, 0xb1, 0x8b, 0xb6, 0xc0, 0x1c, 0x9c, 0x7b, 0xbe, 0xcb, 0x7b, 0x8b, 0xa2, 0x77,
+	0x5d, 0xd8, 0xc7, 0xae, 0xfd, 0x10, 0x9a, 0x59, 0x28, 0x6a, 0xd5, 0xd7, 0xa0, 0xfc, 0xda, 0xf1,
+	0xa7, 0x44, 0xc0, 0x30, 0xb1, 0x34, 0xec, 0x5f, 0x0c, 0x68, 0xf4, 0x42, 0x42, 0x3a, 0x63, 0x16,
+	0xce, 0x56, 0xb4, 0x0f, 0x08, 0x41, 0x69, 0xe2, 0xb0, 0x73, 0x81, 0xb6, 0x8e, 0x45, 0x9b, 0xc3,
+	0xf1, 0xbd, 0xc0, 0x63, 0xcd, 0xd2, 0xae, 0xb1, 0x57, 0xc4, 0xd2, 0xb0, 0x7f, 0x37, 0x60, 0x33,
+	0x05, 0x47, 0x41, 0xff, 0x02, 0x4a, 0x6c, 0x36, 0x91, 0xc8, 0x37, 0xda, 0x1f, 0xc5, 0x48, 0x32,
+	0x03, 0x5b, 0xdd, 0xfe, 0xf7, 0x64, 0xc0, 0x7a, 0xb3, 0x09, 0xc1, 0xe2, 0x8b, 0x78, 0xab, 0x0b,
+	0x7a, 0xab, 0x11, 0x94, 0x22, 0xef, 0x07, 0x22, 0xb0, 0x14, 0xb1, 0x68, 0x73, 0x5f, 0x40, 0x5d,
+	0x22, 0xa0, 0x94, 0xb1, 0x68, 0x73, 0x9f, 0xeb, 0x30, 0xa7, 0x59, 0x96, 0x98, 0x79, 0xdb, 0xfe,
+	0x1c, 0x40, 0x47, 0x40, 0x00, 0x95, 0x47, 0xdd, 0xd3, 0xd3, 0xe3, 0x5e, 0x63, 0x0d, 0x99, 0x50,
+	0x3a, 0x38, 0xe9, 0x1e, 0x34, 0x0c, 0xde, 0xea, 0xe1, 0x4e, 0xa7, 0x51, 0x40, 0xeb, 0x50, 0xec,
+	0xed, 0x1f, 0x35, 0x8a, 0x36, 0x85, 0xeb, 0x72, 0x57, 0xa2, 0x03, 0xc2, 0x2e, 0x08, 0x19, 0x7f,
+	0x48, 0x9e, 0x11, 0x94, 0x86, 0x21, 0x0d, 0x54, 0x8e, 0x45, 0x1b, 0x6d, 0x40, 0x81, 0x51, 0x95,
+	0xdd, 0x02, 0xa3, 0x76, 0x07, 0x6e, 0x2c, 0x06, 0x54, 0x99, 0xbc, 0x0f, 0xeb, 0xf2, 0xf8, 0x46,
+	0x4d, 0x63, 0xb7, 0xb8, 0x57, 0x6b, 0x6f, 0xc6, 0xe1, 0x8e, 0x3c, 0x26, 0xbf, 0xc1, 0xf1, 0x08,
+	0xfb, 0x0f, 0x83, 0x9f, 0x9f, 0xe9, 0x58, 0x75, 0xac, 0xea, 0x98, 0xa2, 0x87, 0x50, 0x76, 0x86,
+	0x8c, 0x84, 0x62, 0x05, 0xb5, 0xb6, 0xd5, 0x92, 0xea, 0xd1, 0x8a, 0xd5, 0xa3, 0xd5, 0x8b, 0xd5,
+	0x03, 0xcb, 0x81, 0xa8, 0x0d, 0x95, 0x3e, 0x19, 0xd2, 0x50, 0x6e, 0xd9, 0xdb, 0x3f, 0x51, 0x23,
+	0x13, 0x12, 0x96, 0x35, 0x09, 0xed, 0x4f, 0xe1, 0xda, 0xfc, 0x02, 0xf5, 0x59, 0x19, 0x70, 0xbf,
+	0x58, 0x5c, 0x19, 0x4b, 0xc3, 0xfe, 0xdb, 0x80, 0x6a, 0xc2, 0xb9, 0x1c, 0x15, 0xd9, 0x02, 0x33,
+	0xa4, 0x94, 0x9d, 0x69, 0xc6, 0xad, 0x73, 0xbb, 0x2b, 0x59, 0x97, 0x39, 0x01, 0x0f, 0x14, 0xab,
+	0x4b, 0x82, 0xd5, 0xdb, 0x19, 0x56, 0xb7, 0xc4, 0x6f, 0x8a, 0xcc, 0x31, 0x4d, 0xcb, 0x29, 0x9a,
+	0xde, 0x06, 0x90, 0xdb, 0x25, 0xa2, 0x56, 0x44, 0xd4, 0xaa, 0xf4, 0xf0, 0xb8, 0xdb, 0x50, 0x1d,
+	0xfa, 0x0e, 0x3b, 0x13, 0xc1, 0xd7, 0x65, 0xde, 0xb9, 0xe3, 0x19, 0x5f, 0xfd, 0x7d, 0xa8, 0x26,
+	0x21, 0x12, 0x06, 0xaf, 0x25, 0x0c, 0x36, 0x52, 0x0c, 0x2f, 0xda, 0x3f, 0xc2, 0xf5, 0x23, 0xc2,
+	0x62, 0x70, 0x1e, 0x89, 0x2e, 0x51, 0x2c, 0x38, 0xa1, 0x17, 0x83, 0x6b, 0x42, 0x13, 0xe9, 0x5a,
+	0x24, 0xb4, 0x56, 0x87, 0x78, 0x84, 0xdd, 0x87, 0xc6, 0x89, 0x17, 0xb1, 0x43, 0xcf, 0x5f, 0x19,
+	0x7c, 0xfb, 0x1e, 0x6c, 0xa6, 0x62, 0x68, 0x3e, 0xf1, 0x75, 0x48, 0x8c, 0x75, 0x2c, 0x0d, 0x7b,
+	0x00, 0x9b, 0x87, 0xde, 0xd8, 0x55, 0xc7, 0x6e, 0x45, 0x78, 0xbe, 0x02, 0x94, 0x0e, 0xa2, 0x00,
+	0xdd, 0x83, 0x8a, 0x24, 0x89, 0x8a, 0x90, 0x23, 0x03, 0x6a, 0x00, 0x67, 0xfd, 0x75, 0x3e, 0xc3,
+	0xbe, 0xef, 0xaf, 0x58, 0x07, 0xb6, 0xa1, 0x1a, 0x38, 0x6f, 0xce, 0xe4, 0xc9, 0x93, 0xf7, 0xac,
+	0x19, 0x38, 0x6f, 0xc4, 0x09, 0x15, 0xba, 0xfd, 0xd2, 0x9b, 0xc4, 0x1a, 0xcd, 0xdb, 0xe8, 0x4b,
+	0x28, 0xd3, 0xd0, 0x25, 0xa1, 0x38, 0x11, 0x1b, 0xed, 0xff, 0xc7, 0xb1, 0x73, 0xe1, 0xb6, 0xba,
+	0x7c, 0x28, 0x96, 0x5f, 0xd8, 0x1f, 0x43, 0x59, 0xd8, 0x9c, 0xed, 0x4f, 0xbb, 0x4f, 0x3b, 0x8a,
+	0xf7, 0xdd, 0x67, 0x5d, 0xa9, 0xe1, 0x8f, 0xf7, 0x7b, 0x9d, 0x46, 0x81, 0x13, 0x6f, 0x71, 0xb2,
+	0xf7, 0x51, 0xd2, 0x3f, 0x0b, 0xe9, 0x5d, 0x58, 0x59, 0x02, 0x93, 0x3b, 0x55, 0x26, 0x4f, 0x1a,
+	0xe8, 0x06, 0x54, 0xe8, 0x70, 0x18, 0x11, 0xa6, 0x72, 0xa7, 0x2c, 0x4d, 0xca, 0x72, 0x8a, 0x94,
+	0x7c, 0xf4, 0x90, 0xfa, 0x3e, 0xbd, 0x10, 0x62, 0x62, 0x62, 0x65, 0xf1, 0xb2, 0x84, 0xe7, 0xfc,
+	0x2c, 0x20, 0xe1, 0x88, 0x44, 0x42, 0x4b, 0x4c, 0x0c, 0xdc, 0x75, 0x2a, 0x3c, 0xe8, 0x2e, 0xd4,
+	0x5d, 0x2f, 0x72, 0xfa, 0x3e, 0x39, 0xbb, 0x70, 0xfc, 0x97, 0x4d, 0x53, 0x8c, 0xa8, 0x29, 0xdf,
+	0x0b, 0xc7, 0x7f, 0xa9, 0x85, 0xbe, 0xfa, 0xee, 0x42, 0x0f, 0xff, 0x55, 0xe8, 0xed, 0x03, 0xb8,
+	0x3a, 0x97, 0xeb, 0xf7, 0xd9, 0xb0, 0xf3, 0xf8, 0x06, 0x3d, 0x71, 0xc6, 0xa3, 0xa9, 0x33, 0x5a,
+	0x9d, 0x5e, 0xfc, 0x9a, 0x94, 0x8f, 0xa9, 0x50, 0x0a, 0xf2, 0x21, 0x54, 0xfd, 0xd8, 0xa9, 0x40,
+	0xef, 0xc5, 0xa1, 0x96, 0x7c, 0xd3, 0x8a, 0x3d, 0x58, 0x7f, 0x6a, 0x3d, 0x01, 0x33, 0x76, 0xf3,
+	0x73, 0x34, 0x76, 0x02, 0xa2, 0xee, 0x2d, 0xd1, 0xe6, 0x4c, 0x10, 0xe5, 0xbb, 0x00, 0x57, 0xc0,
+	0xd2, 0x90, 0x97, 0xa0, 0x4f, 0x43, 0x55, 0x64, 0x4a, 0xc3, 0x9e, 0xc2, 0x15, 0xec, 0x5c, 0x1c,
+	0xf8, 0x4e, 0x40, 0x2e, 0xf3, 0x06, 0xf8, 0x04, 0x1a, 0x3a, 0xac, 0x4a, 0x4f, 0x5c, 0xa2, 0x19,
+	0xa9, 0x12, 0xed, 0x27, 0x68, 0x9e, 0x38, 0x91, 0xda, 0xcf, 0x43, 0x1a, 0xf2, 0x8b, 0xee, 0x32,
+	0x71, 0x1e, 0xc2, 0x56, 0x4e, 0xfc, 0x77, 0x57, 0xdd, 0xdf, 0x12, 0x5a, 0x44, 0x07, 0xb3, 0x53,
+	0x12, 0x45, 0x7c, 0x4b, 0x57, 0xb4, 0x0e, 0x2d, 0x10, 0xc5, 0x45, 0x81, 0xd0, 0x25, 0x7a, 0x22,
+	0x27, 0x39, 0x75, 0x14, 0x1f, 0xf9, 0x6a, 0x4a, 0xc2, 0x99, 0x2a, 0x40, 0xa4, 0x61, 0x1f, 0xc5,
+	0xaf, 0x91, 0xf4, 0x12, 0xde, 0xe3, 0x34, 0xb6, 0xff, 0x32, 0xe1, 0x7f, 0xea, 0x21, 0x47, 0xc2,
+	0xd7, 0xde, 0x80, 0xa0, 0x17, 0xd0, 0x58, 0x7c, 0xe8, 0xa0, 0x9d, 0xf9, 0xa3, 0x91, 0x79, 0x8d,
+	0x59, 0xbb, 0xcb, 0x07, 0x48, 0x54, 0xf6, 0x1a, 0x7a, 0x9c, 0x2e, 0xf1, 0x9a, 0x39, 0x2f, 0x0d,
+	0x39, 0xd5, 0xd6, 0xd2, 0x37, 0x88, 0xbd, 0xf6, 0xd0, 0x40, 0xcf, 0x61, 0x63, 0xbe, 0x00, 0x47,
+	0xb7, 0xe7, 0x63, 0x2f, 0xbc, 0x04, 0xac, 0x3b, 0xcb, 0xba, 0x53, 0x93, 0x7e, 0x03, 0xf5, 0x74,
+	0xb1, 0x8a, 0xb6, 0xf5, 0x37, 0x99, 0x1a, 0xdd, 0xba, 0x95, 0xdf, 0x99, 0xac, 0xf3, 0x39, 0x6c,
+	0xcc, 0x57, 0x54, 0x1a, 0x61, 0x6e, 0x99, 0xa7, 0x11, 0xe6, 0x17, 0x62, 0x02, 0xe1, 0x63, 0xa8,
+	0x26, 0xb5, 0x8f, 0x4e, 0xde, 0x62, 0xc9, 0xa5, 0x93, 0x97, 0x29, 0x94, 0xc4, 0x2c, 0x1d, 0x00,
+	0xad, 0xdf, 0x68, 0x2b, 0x7d, 0xa9, 0xcf, 0x95, 0x4a, 0x96, 0x95, 0xd7, 0x95, 0xac, 0xf0, 0x6b,
+	0xa8, 0xa5, 0x1e, 0xff, 0xc8, 0x9a, 0xcf, 0x70, 0xfa, 0x7f, 0x07, 0x6b, 0x3b, 0xb7, 0x2f, 0x9d,
+	0xab, 0xf9, 0x22, 0x40, 0xe7, 0x2a, 0xb7, 0xd2, 0xd0, 0xb9, 0xca, 0xaf, 0x1d, 0xc4, 0x2a, 0x9f,
+	0x40, 0x2d, 0x75, 0x4b, 0xa1, 0x9c, 0xb5, 0x64, 0xe1, 0xe5, 0x5c, 0x6b, 0x62, 0xae, 0x1e, 0x5c,
+	0x59, 0xb8, 0x0e, 0xd0, 0x9d, 0xa5, 0xf7, 0x84, 0x9c, 0x73, 0xe7, 0x5f, 0xee, 0x11, 0x7b, 0x0d,
+	0xed, 0x83, 0x19, 0x4b, 0x2e, 0xba, 0x99, 0xc8, 0xcb, 0xbc, 0xf6, 0x5b, 0xcd, 0x6c, 0x47, 0x0a,
+	0xd8, 0x77, 0xb0, 0x99, 0x51, 0x43, 0x94, 0x1c, 0xc3, 0x65, 0x42, 0x6d, 0xdd, 0x7d, 0xcb, 0x88,
+	0x04, 0xde, 0xb7, 0xb1, 0x04, 0x68, 0x75, 0x59, 0x94, 0x80, 0x8c, 0x74, 0x2e, 0x4a, 0x40, 0x56,
+	0x98, 0x38, 0xec, 0x7e, 0x45, 0x54, 0x17, 0x9f, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xed, 0xf2,
+	0x95, 0x19, 0xeb, 0x12, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index a843ca90f..1e0327c5e 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -191,12 +191,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "h9qIl7zL7oDn97SjEQJhqNoMT5k=",
+			"checksumSHA1": "6RQuk3nBbkefQZ8WVmUmEZUrZGc=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "8f90115d335d7914708491e81c94b535f982594c",
-			"revisionTime": "2017-08-30T07:53:26Z",
-			"version": "v0.32.0",
-			"versionExact": "v0.32.0"
+			"revision": "6cee456783f4da52e57062c253e82583d13eb55e",
+			"revisionTime": "2017-09-05T19:26:28Z",
+			"version": "v0.33.0",
+			"versionExact": "v0.33.0"
 		},
 		{
 			"checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=",