From 62e6a77d856a5f5a846d643130940a967d08ff53 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 18 Sep 2018 12:37:33 -0700 Subject: [PATCH] Switch to go 1.11 Whitespace changes are caused by the fact that gofmt from go-1.11 uses a different heuristic as to how to format the file, making the source code that was OK for go-1.10 causing a warning with go-1.11. NOTE this whitespace change makes the gofmt from go-1.10 complain, so please upgrade your golang. [v2: regen pb files] Signed-off-by: Kir Kolyshkin --- .circleci/config.yml | 2 +- Dockerfile | 2 +- api/api.pb.txt | 18 +- api/dispatcher.pb.go | 6 +- api/logbroker.pb.go | 6 +- api/raft.pb.go | 2 +- api/types.pb.go | 2 +- manager/scheduler/constraint_test.go | 2 +- manager/scheduler/nodeinfo.go | 4 +- protobuf/plugin/deepcopy/test/deepcopy.pb.go | 248 +++++++++---------- protobuf/plugin/raftproxy/test/service.pb.go | 6 +- 11 files changed, 149 insertions(+), 149 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 55a7dcd6e2..4a8c9c620b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: # Needed to install go OS: linux ARCH: amd64 - GOVERSION: 1.10.3 + GOVERSION: 1.11 # Needed to install protoc PROTOC: https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip diff --git a/Dockerfile b/Dockerfile index 4a951ecc69..924bd00a33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # NOTE(dperny): for some reason, alpine was giving me trouble -FROM golang:1.10.3-stretch +FROM golang:1.11.0-stretch RUN apt-get update && apt-get install -y make git unzip diff --git a/api/api.pb.txt b/api/api.pb.txt index 27aa683b42..7c94371b8b 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -2491,8 +2491,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65003: "os.FileMode" 65001: 0 + 65003: "os.FileMode" } json_name: "mode" } @@ -2646,8 +2646,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65011: 1 65001: 0 + 65011: 1 } json_name: "delay" } @@ -3090,8 +3090,8 @@ file { } } options { - 62023: "PublishMode" 62001: 0 + 62023: "PublishMode" } } } @@ -3790,8 +3790,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65003: "os.FileMode" 65001: 0 + 65003: "os.FileMode" } json_name: "mode" } @@ -4207,8 +4207,8 @@ file { } } options { - 62023: "NodeRole" 62001: 0 + 62023: "NodeRole" } } syntax: "proto3" @@ -8058,8 +8058,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65011: 1 65001: 0 + 65011: 1 } json_name: "period" } @@ -9106,11 +9106,11 @@ file { } } options { - 63017: 1 - 63020: 1 - 63018: 1 63001: 0 63002: 0 + 63017: 1 + 63018: 1 + 63020: 1 } } file { diff --git a/api/dispatcher.pb.go b/api/dispatcher.pb.go index cc443848de..f72d3d9995 100644 --- a/api/dispatcher.pb.go +++ b/api/dispatcher.pb.go @@ -1664,7 +1664,7 @@ func (p *raftProxyDispatcherServer) Session(r *SessionRequest, stream Dispatcher } streamWrapper := Dispatcher_SessionServerWrapper{ Dispatcher_SessionServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.Session(r, streamWrapper) } @@ -1785,7 +1785,7 @@ func (p *raftProxyDispatcherServer) Tasks(r *TasksRequest, stream Dispatcher_Tas } streamWrapper := Dispatcher_TasksServerWrapper{ Dispatcher_TasksServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.Tasks(r, streamWrapper) } @@ -1836,7 +1836,7 @@ func (p *raftProxyDispatcherServer) Assignments(r *AssignmentsRequest, stream Di } streamWrapper := Dispatcher_AssignmentsServerWrapper{ Dispatcher_AssignmentsServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.Assignments(r, streamWrapper) } diff --git a/api/logbroker.pb.go b/api/logbroker.pb.go index b6231e941c..5456c85816 100644 --- a/api/logbroker.pb.go +++ b/api/logbroker.pb.go @@ -1335,7 +1335,7 @@ func (p *raftProxyLogsServer) SubscribeLogs(r *SubscribeLogsRequest, stream Logs } streamWrapper := Logs_SubscribeLogsServerWrapper{ Logs_SubscribeLogsServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.SubscribeLogs(r, streamWrapper) } @@ -1458,7 +1458,7 @@ func (p *raftProxyLogBrokerServer) ListenSubscriptions(r *ListenSubscriptionsReq } streamWrapper := LogBroker_ListenSubscriptionsServerWrapper{ LogBroker_ListenSubscriptionsServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.ListenSubscriptions(r, streamWrapper) } @@ -1509,7 +1509,7 @@ func (p *raftProxyLogBrokerServer) PublishLogs(stream LogBroker_PublishLogsServe } streamWrapper := LogBroker_PublishLogsServerWrapper{ LogBroker_PublishLogsServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.PublishLogs(streamWrapper) } diff --git a/api/raft.pb.go b/api/raft.pb.go index 058b29450c..a32a6001b9 100644 --- a/api/raft.pb.go +++ b/api/raft.pb.go @@ -1746,7 +1746,7 @@ func (p *raftProxyRaftServer) StreamRaftMessage(stream Raft_StreamRaftMessageSer } streamWrapper := Raft_StreamRaftMessageServerWrapper{ Raft_StreamRaftMessageServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.StreamRaftMessage(streamWrapper) } diff --git a/api/types.pb.go b/api/types.pb.go index f41d5e2033..f5843467cb 100644 --- a/api/types.pb.go +++ b/api/types.pb.go @@ -594,7 +594,7 @@ var MaybeEncryptedRecord_Algorithm_name = map[int32]string{ 2: "FERNET_AES_128_CBC", } var MaybeEncryptedRecord_Algorithm_value = map[string]int32{ - "NONE": 0, + "NONE": 0, "SECRETBOX_SALSA20_POLY1305": 1, "FERNET_AES_128_CBC": 2, } diff --git a/manager/scheduler/constraint_test.go b/manager/scheduler/constraint_test.go index 7bd378139e..04097c8d34 100644 --- a/manager/scheduler/constraint_test.go +++ b/manager/scheduler/constraint_test.go @@ -54,7 +54,7 @@ func setupEnv() { Addr: "186.17.9.41", }, }, - Tasks: make(map[string]*api.Task), + Tasks: make(map[string]*api.Task), ActiveTasksCountByService: make(map[string]int), } } diff --git a/manager/scheduler/nodeinfo.go b/manager/scheduler/nodeinfo.go index 78fa630ca3..7f49058697 100644 --- a/manager/scheduler/nodeinfo.go +++ b/manager/scheduler/nodeinfo.go @@ -45,8 +45,8 @@ type NodeInfo struct { func newNodeInfo(n *api.Node, tasks map[string]*api.Task, availableResources api.Resources) NodeInfo { nodeInfo := NodeInfo{ - Node: n, - Tasks: make(map[string]*api.Task), + Node: n, + Tasks: make(map[string]*api.Task), ActiveTasksCountByService: make(map[string]int), AvailableResources: availableResources.Copy(), usedHostPorts: make(map[hostPortSpec]struct{}), diff --git a/protobuf/plugin/deepcopy/test/deepcopy.pb.go b/protobuf/plugin/deepcopy/test/deepcopy.pb.go index 951f30d9a9..39c8d46e4e 100644 --- a/protobuf/plugin/deepcopy/test/deepcopy.pb.go +++ b/protobuf/plugin/deepcopy/test/deepcopy.pb.go @@ -45,21 +45,21 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package type BasicScalar struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3" json:"Field1,omitempty"` - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3" json:"Field2,omitempty"` - Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3" json:"Field3,omitempty"` - Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3" json:"Field4,omitempty"` - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3" json:"Field5,omitempty"` - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3" json:"Field6,omitempty"` - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3" json:"Field7,omitempty"` - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3" json:"Field8,omitempty"` - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3" json:"Field9,omitempty"` - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3" json:"Field10,omitempty"` - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3" json:"Field11,omitempty"` - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3" json:"Field12,omitempty"` - Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3" json:"Field13,omitempty"` - Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3" json:"Field14,omitempty"` - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3" json:"Field15,omitempty"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,json=field1,proto3" json:"Field1,omitempty"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,json=field2,proto3" json:"Field2,omitempty"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,json=field3,proto3" json:"Field3,omitempty"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,json=field4,proto3" json:"Field4,omitempty"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,json=field5,proto3" json:"Field5,omitempty"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,json=field6,proto3" json:"Field6,omitempty"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,json=field7,proto3" json:"Field7,omitempty"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,json=field8,proto3" json:"Field8,omitempty"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,json=field9,proto3" json:"Field9,omitempty"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,json=field10,proto3" json:"Field10,omitempty"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,json=field11,proto3" json:"Field11,omitempty"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,json=field12,proto3" json:"Field12,omitempty"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,json=field13,proto3" json:"Field13,omitempty"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,json=field14,proto3" json:"Field14,omitempty"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,json=field15,proto3" json:"Field15,omitempty"` } func (m *BasicScalar) Reset() { *m = BasicScalar{} } @@ -67,21 +67,21 @@ func (*BasicScalar) ProtoMessage() {} func (*BasicScalar) Descriptor() ([]byte, []int) { return fileDescriptorDeepcopy, []int{0} } type RepeatedScalar struct { - Field1 []float64 `protobuf:"fixed64,1,rep,packed,name=Field1" json:"Field1,omitempty"` - Field2 []float32 `protobuf:"fixed32,2,rep,packed,name=Field2" json:"Field2,omitempty"` - Field3 []int32 `protobuf:"varint,3,rep,packed,name=Field3" json:"Field3,omitempty"` - Field4 []int64 `protobuf:"varint,4,rep,packed,name=Field4" json:"Field4,omitempty"` - Field5 []uint32 `protobuf:"varint,5,rep,packed,name=Field5" json:"Field5,omitempty"` - Field6 []uint64 `protobuf:"varint,6,rep,packed,name=Field6" json:"Field6,omitempty"` - Field7 []int32 `protobuf:"zigzag32,7,rep,packed,name=Field7" json:"Field7,omitempty"` - Field8 []int64 `protobuf:"zigzag64,8,rep,packed,name=Field8" json:"Field8,omitempty"` - Field9 []uint32 `protobuf:"fixed32,9,rep,packed,name=Field9" json:"Field9,omitempty"` - Field10 []int32 `protobuf:"fixed32,10,rep,packed,name=Field10" json:"Field10,omitempty"` - Field11 []uint64 `protobuf:"fixed64,11,rep,packed,name=Field11" json:"Field11,omitempty"` - Field12 []int64 `protobuf:"fixed64,12,rep,packed,name=Field12" json:"Field12,omitempty"` - Field13 []bool `protobuf:"varint,13,rep,packed,name=Field13" json:"Field13,omitempty"` - Field14 []string `protobuf:"bytes,14,rep,name=Field14" json:"Field14,omitempty"` - Field15 [][]byte `protobuf:"bytes,15,rep,name=Field15" json:"Field15,omitempty"` + Field1 []float64 `protobuf:"fixed64,1,rep,packed,name=Field1,json=field1" json:"Field1,omitempty"` + Field2 []float32 `protobuf:"fixed32,2,rep,packed,name=Field2,json=field2" json:"Field2,omitempty"` + Field3 []int32 `protobuf:"varint,3,rep,packed,name=Field3,json=field3" json:"Field3,omitempty"` + Field4 []int64 `protobuf:"varint,4,rep,packed,name=Field4,json=field4" json:"Field4,omitempty"` + Field5 []uint32 `protobuf:"varint,5,rep,packed,name=Field5,json=field5" json:"Field5,omitempty"` + Field6 []uint64 `protobuf:"varint,6,rep,packed,name=Field6,json=field6" json:"Field6,omitempty"` + Field7 []int32 `protobuf:"zigzag32,7,rep,packed,name=Field7,json=field7" json:"Field7,omitempty"` + Field8 []int64 `protobuf:"zigzag64,8,rep,packed,name=Field8,json=field8" json:"Field8,omitempty"` + Field9 []uint32 `protobuf:"fixed32,9,rep,packed,name=Field9,json=field9" json:"Field9,omitempty"` + Field10 []int32 `protobuf:"fixed32,10,rep,packed,name=Field10,json=field10" json:"Field10,omitempty"` + Field11 []uint64 `protobuf:"fixed64,11,rep,packed,name=Field11,json=field11" json:"Field11,omitempty"` + Field12 []int64 `protobuf:"fixed64,12,rep,packed,name=Field12,json=field12" json:"Field12,omitempty"` + Field13 []bool `protobuf:"varint,13,rep,packed,name=Field13,json=field13" json:"Field13,omitempty"` + Field14 []string `protobuf:"bytes,14,rep,name=Field14,json=field14" json:"Field14,omitempty"` + Field15 [][]byte `protobuf:"bytes,15,rep,name=Field15,json=field15" json:"Field15,omitempty"` } func (m *RepeatedScalar) Reset() { *m = RepeatedScalar{} } @@ -89,19 +89,19 @@ func (*RepeatedScalar) ProtoMessage() {} func (*RepeatedScalar) Descriptor() ([]byte, []int) { return fileDescriptorDeepcopy, []int{1} } type RepeatedScalarPacked struct { - Field1 []float64 `protobuf:"fixed64,1,rep,packed,name=Field1" json:"Field1,omitempty"` - Field2 []float32 `protobuf:"fixed32,2,rep,packed,name=Field2" json:"Field2,omitempty"` - Field3 []int32 `protobuf:"varint,3,rep,packed,name=Field3" json:"Field3,omitempty"` - Field4 []int64 `protobuf:"varint,4,rep,packed,name=Field4" json:"Field4,omitempty"` - Field5 []uint32 `protobuf:"varint,5,rep,packed,name=Field5" json:"Field5,omitempty"` - Field6 []uint64 `protobuf:"varint,6,rep,packed,name=Field6" json:"Field6,omitempty"` - Field7 []int32 `protobuf:"zigzag32,7,rep,packed,name=Field7" json:"Field7,omitempty"` - Field8 []int64 `protobuf:"zigzag64,8,rep,packed,name=Field8" json:"Field8,omitempty"` - Field9 []uint32 `protobuf:"fixed32,9,rep,packed,name=Field9" json:"Field9,omitempty"` - Field10 []int32 `protobuf:"fixed32,10,rep,packed,name=Field10" json:"Field10,omitempty"` - Field11 []uint64 `protobuf:"fixed64,11,rep,packed,name=Field11" json:"Field11,omitempty"` - Field12 []int64 `protobuf:"fixed64,12,rep,packed,name=Field12" json:"Field12,omitempty"` - Field13 []bool `protobuf:"varint,13,rep,packed,name=Field13" json:"Field13,omitempty"` + Field1 []float64 `protobuf:"fixed64,1,rep,packed,name=Field1,json=field1" json:"Field1,omitempty"` + Field2 []float32 `protobuf:"fixed32,2,rep,packed,name=Field2,json=field2" json:"Field2,omitempty"` + Field3 []int32 `protobuf:"varint,3,rep,packed,name=Field3,json=field3" json:"Field3,omitempty"` + Field4 []int64 `protobuf:"varint,4,rep,packed,name=Field4,json=field4" json:"Field4,omitempty"` + Field5 []uint32 `protobuf:"varint,5,rep,packed,name=Field5,json=field5" json:"Field5,omitempty"` + Field6 []uint64 `protobuf:"varint,6,rep,packed,name=Field6,json=field6" json:"Field6,omitempty"` + Field7 []int32 `protobuf:"zigzag32,7,rep,packed,name=Field7,json=field7" json:"Field7,omitempty"` + Field8 []int64 `protobuf:"zigzag64,8,rep,packed,name=Field8,json=field8" json:"Field8,omitempty"` + Field9 []uint32 `protobuf:"fixed32,9,rep,packed,name=Field9,json=field9" json:"Field9,omitempty"` + Field10 []int32 `protobuf:"fixed32,10,rep,packed,name=Field10,json=field10" json:"Field10,omitempty"` + Field11 []uint64 `protobuf:"fixed64,11,rep,packed,name=Field11,json=field11" json:"Field11,omitempty"` + Field12 []int64 `protobuf:"fixed64,12,rep,packed,name=Field12,json=field12" json:"Field12,omitempty"` + Field13 []bool `protobuf:"varint,13,rep,packed,name=Field13,json=field13" json:"Field13,omitempty"` } func (m *RepeatedScalarPacked) Reset() { *m = RepeatedScalarPacked{} } @@ -109,9 +109,9 @@ func (*RepeatedScalarPacked) ProtoMessage() {} func (*RepeatedScalarPacked) Descriptor() ([]byte, []int) { return fileDescriptorDeepcopy, []int{2} } type ExternalStruct struct { - Field1 *BasicScalar `protobuf:"bytes,1,opt,name=Field1" json:"Field1,omitempty"` - Field2 *RepeatedScalar `protobuf:"bytes,2,opt,name=Field2" json:"Field2,omitempty"` - Field3 *RepeatedScalarPacked `protobuf:"bytes,3,opt,name=Field3" json:"Field3,omitempty"` + Field1 *BasicScalar `protobuf:"bytes,1,opt,name=Field1,json=field1" json:"Field1,omitempty"` + Field2 *RepeatedScalar `protobuf:"bytes,2,opt,name=Field2,json=field2" json:"Field2,omitempty"` + Field3 *RepeatedScalarPacked `protobuf:"bytes,3,opt,name=Field3,json=field3" json:"Field3,omitempty"` } func (m *ExternalStruct) Reset() { *m = ExternalStruct{} } @@ -119,9 +119,9 @@ func (*ExternalStruct) ProtoMessage() {} func (*ExternalStruct) Descriptor() ([]byte, []int) { return fileDescriptorDeepcopy, []int{3} } type RepeatedExternalStruct struct { - Field1 []*BasicScalar `protobuf:"bytes,1,rep,name=Field1" json:"Field1,omitempty"` - Field2 []*RepeatedScalar `protobuf:"bytes,2,rep,name=Field2" json:"Field2,omitempty"` - Field3 []*RepeatedScalarPacked `protobuf:"bytes,3,rep,name=Field3" json:"Field3,omitempty"` + Field1 []*BasicScalar `protobuf:"bytes,1,rep,name=Field1,json=field1" json:"Field1,omitempty"` + Field2 []*RepeatedScalar `protobuf:"bytes,2,rep,name=Field2,json=field2" json:"Field2,omitempty"` + Field3 []*RepeatedScalarPacked `protobuf:"bytes,3,rep,name=Field3,json=field3" json:"Field3,omitempty"` } func (m *RepeatedExternalStruct) Reset() { *m = RepeatedExternalStruct{} } @@ -129,9 +129,9 @@ func (*RepeatedExternalStruct) ProtoMessage() {} func (*RepeatedExternalStruct) Descriptor() ([]byte, []int) { return fileDescriptorDeepcopy, []int{4} } type NonNullableExternalStruct struct { - Field1 BasicScalar `protobuf:"bytes,1,opt,name=Field1" json:"Field1"` - Field2 RepeatedScalar `protobuf:"bytes,2,opt,name=Field2" json:"Field2"` - Field3 RepeatedScalarPacked `protobuf:"bytes,3,opt,name=Field3" json:"Field3"` + Field1 BasicScalar `protobuf:"bytes,1,opt,name=Field1,json=field1" json:"Field1"` + Field2 RepeatedScalar `protobuf:"bytes,2,opt,name=Field2,json=field2" json:"Field2"` + Field3 RepeatedScalarPacked `protobuf:"bytes,3,opt,name=Field3,json=field3" json:"Field3"` } func (m *NonNullableExternalStruct) Reset() { *m = NonNullableExternalStruct{} } @@ -141,9 +141,9 @@ func (*NonNullableExternalStruct) Descriptor() ([]byte, []int) { } type RepeatedNonNullableExternalStruct struct { - Field1 []BasicScalar `protobuf:"bytes,1,rep,name=Field1" json:"Field1"` - Field2 []RepeatedScalar `protobuf:"bytes,2,rep,name=Field2" json:"Field2"` - Field3 []RepeatedScalarPacked `protobuf:"bytes,3,rep,name=Field3" json:"Field3"` + Field1 []BasicScalar `protobuf:"bytes,1,rep,name=Field1,json=field1" json:"Field1"` + Field2 []RepeatedScalar `protobuf:"bytes,2,rep,name=Field2,json=field2" json:"Field2"` + Field3 []RepeatedScalarPacked `protobuf:"bytes,3,rep,name=Field3,json=field3" json:"Field3"` } func (m *RepeatedNonNullableExternalStruct) Reset() { *m = RepeatedNonNullableExternalStruct{} } @@ -193,37 +193,37 @@ type isOneOf_FieldsTwo interface { } type OneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,json=field1,proto3,oneof"` } type OneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,json=field2,proto3,oneof"` } type OneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,json=field3,proto3,oneof"` } type OneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,json=field4,proto3,oneof"` } type OneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,json=field5,proto3,oneof"` } type OneOf_Field6 struct { - Field6 string `protobuf:"bytes,6,opt,name=Field6,proto3,oneof"` + Field6 string `protobuf:"bytes,6,opt,name=Field6,json=field6,proto3,oneof"` } type OneOf_Field7 struct { - Field7 []byte `protobuf:"bytes,7,opt,name=Field7,proto3,oneof"` + Field7 []byte `protobuf:"bytes,7,opt,name=Field7,json=field7,proto3,oneof"` } type OneOf_Field8 struct { - Field8 *MapStruct `protobuf:"bytes,8,opt,name=Field8,oneof"` + Field8 *MapStruct `protobuf:"bytes,8,opt,name=Field8,json=field8,oneof"` } type OneOf_Field9 struct { - Field9 *RepeatedNonNullableExternalStruct `protobuf:"bytes,9,opt,name=Field9,oneof"` + Field9 *RepeatedNonNullableExternalStruct `protobuf:"bytes,9,opt,name=Field9,json=field9,oneof"` } type OneOf_Field10 struct { - Field10 *NonNullableExternalStruct `protobuf:"bytes,10,opt,name=Field10,oneof"` + Field10 *NonNullableExternalStruct `protobuf:"bytes,10,opt,name=Field10,json=field10,oneof"` } type OneOf_Field11 struct { - Field11 *RepeatedExternalStruct `protobuf:"bytes,11,opt,name=Field11,oneof"` + Field11 *RepeatedExternalStruct `protobuf:"bytes,11,opt,name=Field11,json=field11,oneof"` } func (*OneOf_Field1) isOneOf_Fields() {} @@ -2651,62 +2651,62 @@ func init() { } var fileDescriptorDeepcopy = []byte{ - // 904 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0x3d, 0x99, 0x36, 0x6d, 0xc6, 0xdd, 0xb6, 0x6b, 0x56, 0xab, 0x21, 0xaa, 0x66, 0x87, - 0x70, 0x58, 0x23, 0x41, 0x42, 0xc6, 0x49, 0x9b, 0xc2, 0x89, 0xc0, 0xc2, 0x5e, 0x76, 0x17, 0xb2, - 0x7b, 0x47, 0x6e, 0xe2, 0x96, 0x28, 0xae, 0x6d, 0x25, 0x0e, 0x4b, 0x6f, 0x8b, 0xc4, 0x89, 0xef, - 0x80, 0xc4, 0x05, 0x89, 0x8f, 0x00, 0x1c, 0x39, 0xf5, 0x82, 0xb4, 0x47, 0x4e, 0x88, 0x78, 0x2f, - 0x7b, 0xdc, 0x63, 0x8f, 0x28, 0xf1, 0xf8, 0xd9, 0x13, 0x32, 0x90, 0xc2, 0xcd, 0xf3, 0xff, 0xcd, - 0x4c, 0xde, 0xf8, 0xe7, 0x8c, 0x1e, 0xf9, 0xe4, 0x6c, 0x18, 0x7f, 0x31, 0x3d, 0xa9, 0xf7, 0xc3, - 0xf3, 0xc6, 0x20, 0xec, 0x8f, 0xbc, 0x71, 0x63, 0xf2, 0xd4, 0x1d, 0x9f, 0x8f, 0x86, 0x71, 0x23, - 0x1a, 0x87, 0x71, 0x78, 0x32, 0x3d, 0x6d, 0x44, 0xfe, 0xf4, 0x6c, 0x18, 0x34, 0x06, 0x9e, 0x17, - 0xf5, 0xc3, 0xe8, 0xa2, 0x11, 0x7b, 0x93, 0x18, 0x46, 0xf5, 0xc5, 0x34, 0x6b, 0x63, 0x1e, 0x56, - 0xdf, 0x29, 0x6c, 0x77, 0x16, 0x9e, 0x85, 0xf9, 0x1e, 0xf3, 0xd1, 0x62, 0xb0, 0x78, 0x4a, 0x17, - 0xd5, 0xbe, 0xc6, 0xc4, 0xec, 0xba, 0x93, 0x61, 0xff, 0x71, 0xdf, 0xf5, 0xdd, 0xb1, 0x75, 0x9b, - 0x94, 0x3f, 0x1e, 0x7a, 0xfe, 0xa0, 0x49, 0x11, 0x47, 0x36, 0xea, 0xc9, 0x11, 0xe4, 0x82, 0x96, - 0x38, 0xb2, 0x4b, 0x32, 0x17, 0x90, 0x3b, 0x14, 0x73, 0x64, 0x6f, 0xca, 0xdc, 0x81, 0xbc, 0x45, - 0x37, 0x38, 0xb2, 0xb1, 0xcc, 0x5b, 0x90, 0xb7, 0xe9, 0x26, 0x47, 0xf6, 0x0d, 0x99, 0xb7, 0x21, - 0x3f, 0xa4, 0x65, 0x8e, 0xec, 0x0d, 0x99, 0x1f, 0x42, 0x7e, 0x44, 0xb7, 0x38, 0xb2, 0x6f, 0xca, - 0xfc, 0x08, 0xf2, 0x0e, 0xdd, 0xe6, 0xc8, 0xb6, 0x64, 0xde, 0x81, 0xfc, 0x98, 0x56, 0x38, 0xb2, - 0xb7, 0x64, 0x7e, 0x6c, 0x51, 0xb2, 0x95, 0x9e, 0xe4, 0x5d, 0x4a, 0x38, 0xb2, 0xf7, 0x7a, 0xd9, - 0x30, 0x27, 0x4d, 0x6a, 0x72, 0x64, 0x97, 0x33, 0xd2, 0xcc, 0x89, 0xa0, 0x3b, 0x1c, 0xd9, 0xfb, - 0x19, 0x11, 0x39, 0x71, 0xe8, 0x0d, 0x8e, 0xec, 0xed, 0x8c, 0x38, 0x39, 0x69, 0xd1, 0x5d, 0x8e, - 0xec, 0x4a, 0x46, 0x5a, 0x39, 0x69, 0xd3, 0x3d, 0x8e, 0xec, 0x9d, 0x8c, 0xb4, 0x6b, 0xdf, 0x60, - 0xb2, 0xdb, 0xf3, 0x22, 0xcf, 0x8d, 0xbd, 0xc1, 0x0a, 0x0d, 0x58, 0xa3, 0x01, 0x6b, 0x34, 0x60, - 0x8d, 0x06, 0xac, 0xd1, 0x80, 0x35, 0x1a, 0xb0, 0x46, 0x03, 0xd6, 0x68, 0xc0, 0x1a, 0x0d, 0x58, - 0xa7, 0x01, 0x6b, 0x35, 0x60, 0xad, 0x06, 0xac, 0xd5, 0x80, 0xb5, 0x1a, 0xb0, 0x56, 0x03, 0x2e, - 0x6a, 0xf8, 0x16, 0x93, 0x5b, 0xaa, 0x86, 0x4f, 0xdd, 0xfe, 0xc8, 0x1b, 0x58, 0x55, 0x55, 0x46, - 0xb7, 0xb4, 0x9f, 0x0b, 0xa9, 0xaa, 0x42, 0x0a, 0x4c, 0x00, 0x93, 0x52, 0x0a, 0xcc, 0x01, 0x26, - 0xc5, 0x14, 0x58, 0x0b, 0x98, 0x94, 0x53, 0x60, 0x6d, 0x60, 0x52, 0x50, 0x81, 0x1d, 0x02, 0x93, - 0x92, 0x0a, 0xec, 0x08, 0x98, 0x14, 0x55, 0x60, 0x1d, 0x60, 0x52, 0x56, 0x81, 0x1d, 0x5b, 0x07, - 0x4b, 0xc2, 0x16, 0x10, 0xa4, 0x1d, 0x2c, 0x49, 0x2b, 0xd2, 0x66, 0x4e, 0xa5, 0xb8, 0x22, 0x15, - 0x39, 0x95, 0xf2, 0x8a, 0xd4, 0xa9, 0x7d, 0x87, 0xc8, 0xee, 0xbd, 0xaf, 0x62, 0x6f, 0x1c, 0xb8, - 0xfe, 0xe3, 0x78, 0x3c, 0xed, 0xc7, 0xd6, 0x5b, 0xca, 0xd5, 0x64, 0x8a, 0x9b, 0xf5, 0xf9, 0x85, - 0x57, 0x2f, 0xdc, 0x5e, 0x60, 0xe5, 0x6d, 0xe5, 0xb6, 0x32, 0xc5, 0xad, 0x74, 0xaa, 0x6a, 0x17, - 0x3c, 0x09, 0xe5, 0x0e, 0x33, 0x45, 0x75, 0xd5, 0xec, 0xf4, 0x5b, 0xc8, 0xfc, 0xd5, 0x7e, 0x40, - 0xe4, 0x76, 0x36, 0xe1, 0x1f, 0xea, 0xc4, 0xeb, 0xd7, 0x89, 0xaf, 0x55, 0x27, 0x5e, 0xb3, 0xce, - 0x5f, 0x10, 0x79, 0xfd, 0x61, 0x18, 0x3c, 0x9c, 0xfa, 0xbe, 0x7b, 0xe2, 0x7b, 0x4b, 0xa5, 0x36, - 0xfe, 0xf5, 0x95, 0x76, 0x37, 0x2e, 0xff, 0xb8, 0x63, 0x40, 0xc1, 0x62, 0x9d, 0x17, 0xab, 0xac, - 0x11, 0x56, 0x67, 0xfd, 0xd7, 0xab, 0xac, 0x74, 0x6a, 0xbf, 0x22, 0xf2, 0x46, 0x36, 0x6d, 0xbd, - 0x43, 0xe0, 0xeb, 0x1e, 0x02, 0xff, 0x87, 0x43, 0xe0, 0x6b, 0x1d, 0xe2, 0xb7, 0x12, 0xa9, 0x3c, - 0x70, 0x23, 0x59, 0xec, 0x87, 0x64, 0x27, 0x90, 0xc7, 0xf8, 0xfc, 0xdc, 0x8d, 0x64, 0xc9, 0x3c, - 0xdd, 0x0d, 0xa6, 0xd5, 0xb3, 0xa3, 0x3e, 0x70, 0xa3, 0x7b, 0x41, 0x3c, 0xbe, 0xe8, 0x99, 0x41, - 0x9e, 0x58, 0x3d, 0xb2, 0x17, 0x84, 0x81, 0xb2, 0x4f, 0x7a, 0x92, 0x37, 0xff, 0xb6, 0x4f, 0x3e, - 0x2d, 0xdb, 0x4a, 0x96, 0xb7, 0x1b, 0x28, 0xa8, 0xfa, 0x19, 0xd9, 0x5f, 0xfe, 0x51, 0x6b, 0x9f, - 0xe0, 0x91, 0x77, 0xb1, 0xf8, 0x36, 0x2a, 0xbd, 0xf9, 0xa3, 0x75, 0x97, 0x6c, 0x7e, 0xe9, 0xfa, - 0x53, 0x4f, 0xea, 0x5f, 0xf1, 0x69, 0xa7, 0xfc, 0xbd, 0x52, 0x07, 0x55, 0x9f, 0x90, 0xd7, 0x56, - 0xfc, 0xfe, 0xff, 0xdc, 0xb5, 0xf6, 0x33, 0x26, 0x9b, 0x8f, 0x02, 0xef, 0xd1, 0xa9, 0x45, 0xd5, - 0x5e, 0xe5, 0x7e, 0x6e, 0x98, 0xaa, 0xdd, 0xca, 0xfd, 0xdc, 0x23, 0x55, 0xfb, 0x15, 0x20, 0x0e, - 0x10, 0xd9, 0xb1, 0x00, 0x69, 0x01, 0x91, 0x3d, 0x0b, 0x90, 0x36, 0x90, 0xb4, 0x6b, 0xa9, 0x00, - 0x39, 0x04, 0x92, 0xf6, 0x2d, 0x3b, 0x40, 0x8e, 0xe0, 0x7a, 0x48, 0x3b, 0x17, 0x53, 0xec, 0x2d, - 0x39, 0x83, 0xa9, 0x1d, 0xeb, 0x03, 0xa5, 0x99, 0x31, 0xc5, 0x5d, 0xf5, 0xa3, 0xd3, 0xfe, 0x25, - 0x60, 0x8b, 0x63, 0xeb, 0x7d, 0xb5, 0xef, 0x31, 0xc5, 0x9d, 0x74, 0x0f, 0xfd, 0xda, 0xc2, 0xf5, - 0xde, 0x51, 0x5b, 0x23, 0x53, 0x1c, 0xa8, 0x05, 0xe8, 0x56, 0x36, 0xbb, 0xdb, 0xa4, 0x7c, 0x3a, - 0x7f, 0x9c, 0x74, 0x4d, 0x52, 0x49, 0x9f, 0x9e, 0x3c, 0x0d, 0xbb, 0x1f, 0x5d, 0xce, 0x98, 0xf1, - 0x7c, 0xc6, 0x8c, 0xdf, 0x67, 0xcc, 0x78, 0x39, 0x63, 0xc6, 0xab, 0x19, 0x33, 0xae, 0x66, 0x0c, - 0x3d, 0x4b, 0x18, 0xfa, 0x31, 0x61, 0xe8, 0xa7, 0x84, 0xa1, 0xcb, 0x84, 0x19, 0xcf, 0x13, 0x66, - 0xfc, 0x99, 0x30, 0xe3, 0x65, 0xc2, 0x8c, 0x57, 0x09, 0x33, 0xae, 0x12, 0x66, 0x3c, 0x7b, 0xc1, - 0x8c, 0xef, 0x5f, 0x30, 0xe3, 0xa4, 0xbc, 0x68, 0x5d, 0x9d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x50, 0xbf, 0xa8, 0x70, 0x3a, 0x0b, 0x00, 0x00, + // 907 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x41, 0x8f, 0xdb, 0x44, + 0x14, 0xc7, 0x3d, 0x99, 0xdd, 0xec, 0x66, 0xbc, 0xdd, 0xdd, 0x9a, 0xaa, 0x1a, 0xa2, 0xd5, 0x74, + 0x08, 0x87, 0x1a, 0x09, 0x92, 0x66, 0x9c, 0xec, 0x66, 0xe1, 0x44, 0xa0, 0xd0, 0x4b, 0x5b, 0x48, + 0x7b, 0x47, 0xde, 0xc4, 0xbb, 0x44, 0xf1, 0xda, 0x56, 0xe2, 0x50, 0xf6, 0x56, 0x24, 0x4e, 0x7c, + 0x07, 0x24, 0x2e, 0x48, 0x7c, 0x04, 0xe0, 0xc8, 0x69, 0x2f, 0x48, 0x3d, 0x72, 0x42, 0xc4, 0xbd, + 0xf4, 0xd8, 0x63, 0x8f, 0x28, 0xf1, 0xf8, 0xd9, 0x13, 0x32, 0x90, 0xa5, 0x37, 0xfb, 0xff, 0x1b, + 0x4f, 0xde, 0xf3, 0xcf, 0x19, 0x3d, 0xf2, 0xe9, 0xd9, 0x30, 0xfe, 0x72, 0x7a, 0x52, 0xef, 0x87, + 0xe7, 0x8d, 0x41, 0xd8, 0x1f, 0x79, 0xe3, 0xc6, 0xe4, 0x89, 0x3b, 0x3e, 0x1f, 0x0d, 0xe3, 0x46, + 0x34, 0x0e, 0xe3, 0xf0, 0x64, 0x7a, 0xda, 0x88, 0xfc, 0xe9, 0xd9, 0x30, 0x68, 0x0c, 0x3c, 0x2f, + 0xea, 0x87, 0xd1, 0x45, 0x23, 0xf6, 0x26, 0x31, 0xdc, 0xd5, 0x17, 0xcb, 0xac, 0x8d, 0x79, 0x58, + 0x7d, 0xaf, 0xb0, 0xdd, 0x59, 0x78, 0x16, 0xe6, 0x7b, 0xcc, 0xef, 0x16, 0x37, 0x8b, 0xab, 0xf4, + 0xa1, 0xda, 0x37, 0x98, 0x98, 0x5d, 0x77, 0x32, 0xec, 0x3f, 0xea, 0xbb, 0xbe, 0x3b, 0xb6, 0x6e, + 0x92, 0xf2, 0x27, 0x43, 0xcf, 0x1f, 0x34, 0x29, 0xe2, 0xc8, 0x46, 0xbd, 0xf2, 0xe9, 0xe2, 0x0e, + 0x72, 0x41, 0x4b, 0x1c, 0xd9, 0x25, 0x99, 0x0b, 0xc8, 0x1d, 0x8a, 0x39, 0xb2, 0x37, 0x65, 0xee, + 0x40, 0xde, 0xa2, 0x1b, 0x1c, 0xd9, 0x58, 0xe6, 0x2d, 0xc8, 0xdb, 0x74, 0x93, 0x23, 0xfb, 0x9a, + 0xcc, 0xdb, 0x90, 0x1f, 0xd2, 0x32, 0x47, 0xf6, 0x86, 0xcc, 0x0f, 0x21, 0x3f, 0xa2, 0x5b, 0x1c, + 0xd9, 0xd7, 0x65, 0x7e, 0x04, 0x79, 0x87, 0x6e, 0x73, 0x64, 0x5b, 0x32, 0xef, 0x40, 0x7e, 0x4c, + 0x2b, 0x1c, 0xd9, 0x5b, 0x32, 0x3f, 0xb6, 0x28, 0xd9, 0x4a, 0xfb, 0xba, 0x43, 0x09, 0x47, 0xf6, + 0x5e, 0x6f, 0x2b, 0x6d, 0xec, 0x4e, 0x4e, 0x9a, 0xd4, 0xe4, 0xc8, 0x2e, 0x67, 0xa4, 0x99, 0x13, + 0x41, 0x77, 0x38, 0xb2, 0xf7, 0x33, 0x22, 0x72, 0xe2, 0xd0, 0x6b, 0x1c, 0xd9, 0xdb, 0x19, 0x71, + 0x72, 0xd2, 0xa2, 0xbb, 0x1c, 0xd9, 0x95, 0x8c, 0xb4, 0x72, 0xd2, 0xa6, 0x7b, 0x1c, 0xd9, 0x3b, + 0x19, 0x69, 0xd7, 0xbe, 0xc5, 0x64, 0xb7, 0xe7, 0x45, 0x9e, 0x1b, 0x7b, 0x83, 0x15, 0x1a, 0xb0, + 0x46, 0x03, 0xd6, 0x68, 0xc0, 0x1a, 0x0d, 0x58, 0xa3, 0x01, 0x6b, 0x34, 0x60, 0x8d, 0x06, 0xac, + 0xd1, 0x80, 0x35, 0x1a, 0xb0, 0x4e, 0x03, 0xd6, 0x6a, 0xc0, 0x5a, 0x0d, 0x58, 0xab, 0x01, 0x6b, + 0x35, 0x60, 0xad, 0x06, 0x5c, 0xd4, 0xf0, 0x1d, 0x26, 0x37, 0x54, 0x0d, 0x9f, 0xb9, 0xfd, 0x91, + 0x37, 0xb0, 0xaa, 0xaa, 0x8c, 0x6e, 0x69, 0x3f, 0x17, 0x52, 0x55, 0x85, 0x14, 0x98, 0x00, 0x26, + 0xa5, 0x14, 0x98, 0x03, 0x4c, 0x8a, 0x29, 0xb0, 0x16, 0x30, 0x29, 0xa7, 0xc0, 0xda, 0xc0, 0xa4, + 0xa0, 0x02, 0x3b, 0x04, 0x26, 0x25, 0x15, 0xd8, 0x11, 0x30, 0x29, 0xaa, 0xc0, 0x3a, 0xc0, 0xa4, + 0xac, 0x02, 0x3b, 0xb6, 0x0e, 0x96, 0x84, 0x2d, 0x20, 0x48, 0x3b, 0x58, 0x92, 0x56, 0xa4, 0xcd, + 0x9c, 0x4a, 0x71, 0x45, 0x2a, 0x72, 0x2a, 0xe5, 0x15, 0xa9, 0x53, 0xfb, 0x1e, 0x91, 0xdd, 0xbb, + 0x5f, 0xc7, 0xde, 0x38, 0x70, 0xfd, 0x47, 0xf1, 0x78, 0xda, 0x8f, 0xad, 0x77, 0x94, 0xa3, 0xc9, + 0x14, 0xd7, 0xeb, 0xf3, 0x03, 0xaf, 0x5e, 0x38, 0xbd, 0xc0, 0xca, 0xbb, 0xca, 0x69, 0x65, 0x8a, + 0x1b, 0xe9, 0x52, 0xd5, 0x2e, 0x78, 0x12, 0xca, 0x19, 0x66, 0x8a, 0xea, 0xaa, 0xd5, 0xe9, 0xb7, + 0x90, 0xf9, 0xab, 0xfd, 0x88, 0xc8, 0xcd, 0x6c, 0xc1, 0xbf, 0xd4, 0x89, 0xd7, 0xaf, 0x13, 0x5f, + 0xa9, 0x4e, 0xbc, 0x66, 0x9d, 0xbf, 0x22, 0xf2, 0xe6, 0x83, 0x30, 0x78, 0x30, 0xf5, 0x7d, 0xf7, + 0xc4, 0xf7, 0x96, 0x4a, 0x6d, 0xfc, 0xe7, 0x2b, 0xed, 0x6e, 0x5c, 0xfe, 0x79, 0xcb, 0x80, 0x82, + 0xc5, 0x3a, 0x2f, 0x56, 0x79, 0x46, 0x58, 0x9d, 0xf5, 0x5f, 0xaf, 0xf2, 0xa4, 0x53, 0xfb, 0x0d, + 0x91, 0xb7, 0xb2, 0x65, 0xeb, 0x35, 0x81, 0xaf, 0xda, 0x04, 0xfe, 0x1f, 0x4d, 0xe0, 0x2b, 0x35, + 0xf1, 0x7b, 0x89, 0x54, 0xee, 0xbb, 0x91, 0x2c, 0xf6, 0x23, 0xb2, 0x13, 0xc8, 0x36, 0xbe, 0x38, + 0x77, 0x23, 0x59, 0x32, 0x4f, 0x77, 0x83, 0x65, 0xf5, 0xac, 0xd5, 0xfb, 0x6e, 0x74, 0x37, 0x88, + 0xc7, 0x17, 0x3d, 0x33, 0xc8, 0x13, 0xab, 0x47, 0xf6, 0x82, 0x30, 0x50, 0xf6, 0x49, 0x3b, 0x79, + 0xfb, 0x1f, 0xfb, 0xe4, 0xcb, 0xb2, 0xad, 0x64, 0x79, 0xbb, 0x81, 0x82, 0xaa, 0x9f, 0x93, 0xfd, + 0xe5, 0x1f, 0xb5, 0xf6, 0x09, 0x1e, 0x79, 0x17, 0x8b, 0x6f, 0xa3, 0xd2, 0x9b, 0x5f, 0x5a, 0xb7, + 0xc9, 0xe6, 0x57, 0xae, 0x3f, 0xf5, 0xa4, 0xfe, 0x15, 0x9f, 0x76, 0xca, 0xdf, 0x2f, 0x75, 0x50, + 0xf5, 0x31, 0x79, 0x63, 0xc5, 0xef, 0xbf, 0xe6, 0xae, 0xb5, 0x5f, 0x30, 0xd9, 0x7c, 0x18, 0x78, + 0x0f, 0x4f, 0x2d, 0xaa, 0xce, 0x2a, 0xf7, 0x72, 0xc3, 0x54, 0x9d, 0x56, 0xee, 0xe5, 0x1e, 0xa9, + 0x3a, 0xaf, 0x00, 0x71, 0x80, 0xc8, 0x89, 0x05, 0x48, 0x0b, 0x88, 0x9c, 0x59, 0x80, 0xb4, 0x81, + 0xa4, 0x53, 0x4b, 0x05, 0xc8, 0x21, 0x90, 0x74, 0x6e, 0xd9, 0x01, 0x72, 0x04, 0xc7, 0x43, 0x3a, + 0xb9, 0x98, 0x62, 0x6f, 0xc9, 0x19, 0x2c, 0xed, 0x58, 0x1f, 0x2a, 0xc3, 0x8c, 0x29, 0x6e, 0xab, + 0x1f, 0x9d, 0xf6, 0x2f, 0x01, 0x5b, 0x1c, 0x5b, 0x1f, 0xa8, 0x73, 0x8f, 0x29, 0x6e, 0xa5, 0x7b, + 0xe8, 0x9f, 0x2d, 0x1c, 0xef, 0x1d, 0x75, 0x34, 0x32, 0xc5, 0x81, 0x5a, 0x80, 0xee, 0xc9, 0x66, + 0x77, 0x9b, 0xa4, 0x05, 0x4c, 0xba, 0x26, 0xa9, 0xa4, 0x57, 0x8f, 0x9f, 0x84, 0xdd, 0x8f, 0x2f, + 0x67, 0xcc, 0x78, 0x36, 0x63, 0xc6, 0x1f, 0x33, 0x66, 0xbc, 0x98, 0x31, 0xe3, 0xe5, 0x8c, 0x19, + 0xaf, 0x66, 0x0c, 0x3d, 0x4d, 0x18, 0xfa, 0x29, 0x61, 0xe8, 0xe7, 0x84, 0xa1, 0xcb, 0x84, 0x19, + 0xcf, 0x12, 0x66, 0xfc, 0x95, 0x30, 0xe3, 0x45, 0xc2, 0x8c, 0x97, 0x09, 0x33, 0x5e, 0x25, 0xcc, + 0x78, 0xfa, 0x9c, 0x19, 0x3f, 0x3c, 0x67, 0xc6, 0x49, 0x79, 0x31, 0xba, 0x3a, 0x7f, 0x07, 0x00, + 0x00, 0xff, 0xff, 0xef, 0xf5, 0x33, 0xfa, 0x3a, 0x0b, 0x00, 0x00, } diff --git a/protobuf/plugin/raftproxy/test/service.pb.go b/protobuf/plugin/raftproxy/test/service.pb.go index a2e36b343c..61ca52768e 100644 --- a/protobuf/plugin/raftproxy/test/service.pb.go +++ b/protobuf/plugin/raftproxy/test/service.pb.go @@ -1070,7 +1070,7 @@ func (p *raftProxyRouteGuideServer) ListFeatures(r *Rectangle, stream RouteGuide } streamWrapper := RouteGuide_ListFeaturesServerWrapper{ RouteGuide_ListFeaturesServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.ListFeatures(r, streamWrapper) } @@ -1121,7 +1121,7 @@ func (p *raftProxyRouteGuideServer) RecordRoute(stream RouteGuide_RecordRouteSer } streamWrapper := RouteGuide_RecordRouteServerWrapper{ RouteGuide_RecordRouteServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.RecordRoute(streamWrapper) } @@ -1178,7 +1178,7 @@ func (p *raftProxyRouteGuideServer) RouteChat(stream RouteGuide_RouteChatServer) } streamWrapper := RouteGuide_RouteChatServerWrapper{ RouteGuide_RouteChatServer: stream, - ctx: ctx, + ctx: ctx, } return p.local.RouteChat(streamWrapper) }