Skip to content

G
gitlab-workhorse
Commit 6e29dae2 authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)
Browse files
Options

Merge branch 'gitaly-proto-0.3.0' into 'master' 

Use gitaly-proto 0.3.0 (new import path)

See merge request !130
parents 261e6951 14f35583
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1362 additions and 1453 deletions
internal/gitaly/gitaly.go
View file @ 6e29dae2
......@@ -5,7 +5,7 @@ import (
"sync"
"time"
pb "gitlab.com/gitlab-org/gitaly/protos/go"
pb "gitlab.com/gitlab-org/gitaly-proto/go"
"google.golang.org/grpc"
"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
......
internal/gitaly/smarthttp.go
View file @ 6e29dae2
......@@ -4,8 +4,8 @@ import (
"fmt"
"io"
pb "gitlab.com/gitlab-org/gitaly/protos/go"
pbhelper "gitlab.com/gitlab-org/gitaly/protos/go/helper"
pb "gitlab.com/gitlab-org/gitaly-proto/go"
pbhelper "gitlab.com/gitlab-org/gitaly-proto/go/helper"
"golang.org/x/net/context"
)
......
internal/testhelper/gitaly.go
View file @ 6e29dae2
package testhelper
import (
pb "gitlab.com/gitlab-org/gitaly/protos/go"
pb "gitlab.com/gitlab-org/gitaly-proto/go"
)
type GitalyTestServer struct{}
......
main_test.go
View file @ 6e29dae2
......@@ -26,7 +26,7 @@ import (
"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
"gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream"
pb "gitlab.com/gitlab-org/gitaly/protos/go"
pb "gitlab.com/gitlab-org/gitaly-proto/go"
"google.golang.org/grpc"
)
......
vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitaly.pb.go 0 → 100644
View file @ 6e29dae2
This diff is collapsed.
vendor/gitlab.com/gitlab-org/gitaly/protos/go/helper/inforefs.go → vendor/gitlab.com/gitlab-org/gitaly-proto/go/helper/inforefs.go
View file @ 6e29dae2
......@@ -3,7 +3,7 @@ package helper
import (
"io"
pb "gitlab.com/gitlab-org/gitaly/protos/go"
pb "gitlab.com/gitlab-org/gitaly-proto/go"
)
type InfoRefsClient interface {
......
vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go 0 → 100644
View file @ 6e29dae2
// Code generated by protoc-gen-go.
// source: shared.proto
// DO NOT EDIT!
package gitaly
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
type Repository struct {
Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
}
func (m *Repository) Reset() { *m = Repository{} }
func (m *Repository) String() string { return proto.CompactTextString(m) }
func (*Repository) ProtoMessage() {}
func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
func (m *Repository) GetPath() string {
if m != nil {
return m.Path
}
return ""
}
type ExitStatus struct {
Value int32 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
}
func (m *ExitStatus) Reset() { *m = ExitStatus{} }
func (m *ExitStatus) String() string { return proto.CompactTextString(m) }
func (*ExitStatus) ProtoMessage() {}
func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
func (m *ExitStatus) GetValue() int32 {
if m != nil {
return m.Value
}
return 0
}
func init() {
proto.RegisterType((*Repository)(nil), "gitaly.Repository")
proto.RegisterType((*ExitStatus)(nil), "gitaly.ExitStatus")
}
func init() { proto.RegisterFile("shared.proto", fileDescriptor1) }
var fileDescriptor1 = []byte{
// 111 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0xce, 0x48, 0x2c,
0x4a, 0x4d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4b, 0xcf, 0x2c, 0x49, 0xcc, 0xa9,
0x54, 0x52, 0xe0, 0xe2, 0x0a, 0x4a, 0x2d, 0xc8, 0x2f, 0xce, 0x2c, 0xc9, 0x2f, 0xaa, 0x14, 0x12,
0xe2, 0x62, 0x29, 0x48, 0x2c, 0xc9, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x95,
0x94, 0xb8, 0xb8, 0x5c, 0x2b, 0x32, 0x4b, 0x82, 0x4b, 0x12, 0x4b, 0x4a, 0x8b, 0x85, 0x44, 0xb8,
0x58, 0xcb, 0x12, 0x73, 0x4a, 0x53, 0xc1, 0x4a, 0x58, 0x83, 0x20, 0x9c, 0x24, 0x36, 0xb0, 0xa1,
0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x48, 0xc1, 0x82, 0x64, 0x00, 0x00, 0x00,
}
vendor/gitlab.com/gitlab-org/gitaly/protos/go/gitaly.pb.go → vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
View file @ 6e29dae2
// Code generated by protoc-gen-go.
// source: gitaly.proto
// source: smarthttp.proto
// DO NOT EDIT!
/*
Package gitaly is a generated protocol buffer package.
It is generated from these files:
gitaly.proto
It has these top-level messages:
InfoRefsRequest
InfoRefsResponse
Repository
*/
package gitaly
import proto "github.com/golang/protobuf/proto"
......@@ -29,12 +18,6 @@ var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type InfoRefsRequest struct {
Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
}
......@@ -42,7 +25,7 @@ type InfoRefsRequest struct {
func (m *InfoRefsRequest) Reset() { *m = InfoRefsRequest{} }
func (m *InfoRefsRequest) String() string { return proto.CompactTextString(m) }
func (*InfoRefsRequest) ProtoMessage() {}
func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
func (m *InfoRefsRequest) GetRepository() *Repository {
if m != nil {
......@@ -58,7 +41,7 @@ type InfoRefsResponse struct {
func (m *InfoRefsResponse) Reset() { *m = InfoRefsResponse{} }
func (m *InfoRefsResponse) String() string { return proto.CompactTextString(m) }
func (*InfoRefsResponse) ProtoMessage() {}
func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
func (m *InfoRefsResponse) GetData() []byte {
if m != nil {
......@@ -67,26 +50,9 @@ func (m *InfoRefsResponse) GetData() []byte {
return nil
}
type Repository struct {
Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
}
func (m *Repository) Reset() { *m = Repository{} }
func (m *Repository) String() string { return proto.CompactTextString(m) }
func (*Repository) ProtoMessage() {}
func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
func (m *Repository) GetPath() string {
if m != nil {
return m.Path
}
return ""
}
func init() {
proto.RegisterType((*InfoRefsRequest)(nil), "gitaly.InfoRefsRequest")
proto.RegisterType((*InfoRefsResponse)(nil), "gitaly.InfoRefsResponse")
proto.RegisterType((*Repository)(nil), "gitaly.Repository")
}
// Reference imports to suppress errors if they are not otherwise used.
......@@ -249,24 +215,24 @@ var _SmartHTTP_serviceDesc = grpc.ServiceDesc{
ServerStreams: true,
},
},
Metadata: "gitaly.proto",
}
func init() { proto.RegisterFile("gitaly.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 202 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x49, 0xcf, 0x2c, 0x49,
0xcc, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0x5c, 0xb9, 0xf8,
0x3d, 0xf3, 0xd2, 0xf2, 0x83, 0x52, 0xd3, 0x8a, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84,
0x8c, 0xb8, 0xb8, 0x8a, 0x52, 0x0b, 0xf2, 0x8b, 0x33, 0x4b, 0xf2, 0x8b, 0x2a, 0x25, 0x18, 0x15,
0x18, 0x35, 0xb8, 0x8d, 0x84, 0xf4, 0xa0, 0xba, 0x83, 0xe0, 0x32, 0x41, 0x48, 0xaa, 0x94, 0xd4,
0xb8, 0x04, 0x10, 0xc6, 0x14, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x0a, 0x09, 0x71, 0xb1, 0xa4, 0x24,
0x96, 0x24, 0x82, 0x4d, 0xe0, 0x09, 0x02, 0xb3, 0x95, 0x14, 0xb8, 0xb8, 0x10, 0x26, 0x80, 0x54,
0x14, 0x24, 0x96, 0x64, 0x80, 0x55, 0x70, 0x06, 0x81, 0xd9, 0x46, 0xcb, 0x18, 0xb9, 0x38, 0x83,
0x73, 0x13, 0x8b, 0x4a, 0x3c, 0x42, 0x42, 0x02, 0x84, 0xbc, 0xb9, 0x84, 0x60, 0xe6, 0x86, 0x16,
0xe4, 0xe4, 0x27, 0xa6, 0x04, 0x24, 0x26, 0x67, 0x0b, 0x89, 0xc3, 0x5c, 0x83, 0xe6, 0x74, 0x29,
0x09, 0x4c, 0x09, 0x88, 0x63, 0x94, 0x18, 0x0c, 0x18, 0x85, 0x7c, 0xb8, 0x84, 0x11, 0xe2, 0xc9,
0xa9, 0x99, 0x65, 0xa9, 0x14, 0x98, 0x96, 0xc4, 0x06, 0x0e, 0x48, 0x63, 0x40, 0x00, 0x00, 0x00,
0xff, 0xff, 0x35, 0xf6, 0x6a, 0x74, 0x58, 0x01, 0x00, 0x00,
Metadata: "smarthttp.proto",
}
func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor2) }
var fileDescriptor2 = []byte{
// 200 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x2f, 0xce, 0x4d, 0x2c,
0x2a, 0xc9, 0x28, 0x29, 0x29, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4b, 0xcf, 0x2c,
0x49, 0xcc, 0xa9, 0x94, 0xe2, 0x29, 0xce, 0x48, 0x2c, 0x4a, 0x4d, 0x81, 0x88, 0x2a, 0xb9, 0x72,
0xf1, 0x7b, 0xe6, 0xa5, 0xe5, 0x07, 0xa5, 0xa6, 0x15, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97,
0x08, 0x19, 0x71, 0x71, 0x15, 0xa5, 0x16, 0xe4, 0x17, 0x67, 0x96, 0xe4, 0x17, 0x55, 0x4a, 0x30,
0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x09, 0xe9, 0x41, 0x74, 0xeb, 0x05, 0xc1, 0x65, 0x82, 0x90, 0x54,
0x29, 0xa9, 0x71, 0x09, 0x20, 0x8c, 0x29, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x15, 0x12, 0xe2, 0x62,
0x49, 0x49, 0x2c, 0x49, 0x04, 0x9b, 0xc0, 0x13, 0x04, 0x66, 0x1b, 0x2d, 0x63, 0xe4, 0xe2, 0x0c,
0x06, 0x39, 0xcc, 0x23, 0x24, 0x24, 0x40, 0xc8, 0x9b, 0x4b, 0x08, 0xa6, 0x2b, 0xb4, 0x20, 0x27,
0x3f, 0x31, 0x25, 0x20, 0x31, 0x39, 0x5b, 0x48, 0x1c, 0x66, 0x17, 0x9a, 0xc3, 0xa4, 0x24, 0x30,
0x25, 0x20, 0x56, 0x29, 0x31, 0x18, 0x30, 0x0a, 0xf9, 0x70, 0x09, 0x23, 0xc4, 0x93, 0x53, 0x33,
0xcb, 0x52, 0x29, 0x30, 0x2d, 0x89, 0x0d, 0x1c, 0x3c, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
0xfd, 0x13, 0x70, 0x6d, 0x47, 0x01, 0x00, 0x00,
}
vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go 0 → 100644
View file @ 6e29dae2
This diff is collapsed.
vendor/gitlab.com/gitlab-org/gitaly/NOTICE deleted 100644 → 0
View file @ 261e6951
This diff is collapsed.
vendor/vendor.json
View file @ 6e29dae2
......@@ -86,16 +86,20 @@
"revision": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"
},
{
"checksumSHA1": "DIHbjVauqs8UF9Mu5cAS1gS6y70=",
"comment": "v0.2.0",
"path": "gitlab.com/gitlab-org/gitaly/protos/go",
"revision": "833b069cd41ec76f56091da40722535735431d2c"
},
{
"checksumSHA1": "KTdei2iUtmq9vzEHHGpeL6QSZqc=",
"comment": "v0.2.0",
"path": "gitlab.com/gitlab-org/gitaly/protos/go/helper",
"revision": "833b069cd41ec76f56091da40722535735431d2c"
"checksumSHA1": "HWuFvDMQ5zp554X4QpVjBUgW5wk=",
"path": "gitlab.com/gitlab-org/gitaly-proto/go",
"revision": "84b3ffd032eea7af8df96fb9d7bdc100dac2c569",
"revisionTime": "2017-02-27T16:43:55Z",
"version": "v0.3.0",
"versionExact": "v0.3.0"
},
{
"checksumSHA1": "2E36lBoyaVky2EJP1E5ub6Rg+uI=",
"path": "gitlab.com/gitlab-org/gitaly-proto/go/helper",
"revision": "84b3ffd032eea7af8df96fb9d7bdc100dac2c569",
"revisionTime": "2017-02-27T16:43:55Z",
"version": "v0.3.0",
"versionExact": "v0.3.0"
},
{
"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7