Merge pull request #5703 from gyuho/grpc_proto

Update gRPC, gogo/protobuf

cmd/Godeps/Godeps.json

@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/etcd",
 	"GoVersion": "go1.6",
-	"GodepVersion": "v60",
+	"GodepVersion": "v74",
 	"Packages": [
 		"./..."
 	],
@@ -87,7 +87,7 @@
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/proto",
-			"Comment": "v0.1-163-gc3995ae",
+			"Comment": "v0.2-13-gc3995ae",
 			"Rev": "c3995ae437bb78d1189f4f147dfe5f87ad3596e4"
 		},
 		{
@@ -129,7 +129,7 @@
 		},
 		{
 			"ImportPath": "github.com/mattn/go-runewidth",
-			"Comment": "travisish-46-gd6bea18",
+			"Comment": "v0.0.1",
 			"Rev": "d6bea18f789704b5f83375793155289da36a3c7f"
 		},
 		{
@@ -233,39 +233,39 @@
 		},
 		{
 			"ImportPath": "google.golang.org/grpc",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/codes",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/credentials",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/grpclog",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/internal",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/metadata",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/naming",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/peer",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/transport",
-			"Rev": "88aeffff979aa77aa502cb011423d0a08fa12c5a"
+			"Rev": "e78224b060cf3215247b7be455f80ea22e469b66"
 		},
 		{
 			"ImportPath": "gopkg.in/cheggaaa/pb.v1",

cmd/vendor/google.golang.org/grpc/rpc_util.go

@@ -406,10 +406,10 @@ func convertCode(err error) codes.Code {
 	return codes.Unknown
 }
 
-// SupportPackageIsVersion2 is referenced from generated protocol buffer files
+// SupportPackageIsVersion3 is referenced from generated protocol buffer files
 // to assert that that code is compatible with this version of the grpc package.
 //
 // This constant may be renamed in the future if a change in the generated code
 // requires a synchronised update of grpc-go and protoc-gen-go. This constant
 // should not be referenced from any other code.
-const SupportPackageIsVersion2 = true
+const SupportPackageIsVersion3 = true

etcdserver/etcdserverpb/rpc.pb.go

@@ -2046,7 +2046,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for KV service
 
@@ -2268,7 +2268,8 @@ var _KV_serviceDesc = grpc.ServiceDesc{
 			Handler:    _KV_Compact_Handler,
 		},
 	},
-	Streams: []grpc.StreamDesc{},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: fileDescriptorRpc,
 }
 
 // Client API for Watch service
@@ -2374,6 +2375,7 @@ var _Watch_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
+	Metadata: fileDescriptorRpc,
 }
 
 // Client API for Lease service
@@ -2548,6 +2550,7 @@ var _Lease_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
+	Metadata: fileDescriptorRpc,
 }
 
 // Client API for Cluster service
@@ -2717,7 +2720,8 @@ var _Cluster_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Cluster_MemberList_Handler,
 		},
 	},
-	Streams: []grpc.StreamDesc{},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: fileDescriptorRpc,
 }
 
 // Client API for Maintenance service
@@ -2955,6 +2959,7 @@ var _Maintenance_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorRpc,
 }
 
 // Client API for Auth service
@@ -3544,7 +3549,8 @@ var _Auth_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Auth_RoleRevokePermission_Handler,
 		},
 	},
-	Streams: []grpc.StreamDesc{},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: fileDescriptorRpc,
 }
 
 func (m *ResponseHeader) Marshal() (data []byte, err error) {

scripts/genproto.sh

@@ -20,7 +20,7 @@ fi
 DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb ./mvcc/mvccpb ./lease/leasepb ./auth/authpb"
 
 # exact version of protoc-gen-gogo to build
-SHA="c3995ae437bb78d1189f4f147dfe5f87ad3596e4"
+GOGO_PROTO_SHA="2752d97bbd91927dd1c43296dbf8700e50e2708c"
 GRPC_GATEWAY_SHA="dcb844349dc5d2cb0300fdc4d2d374839d0d2e13"
 
 # set up self-contained GOPATH for building
@@ -43,7 +43,7 @@ ln -s "${PWD}" "${ETCD_ROOT}"
 go get -u github.com/gogo/protobuf/{proto,protoc-gen-gogo,gogoproto}
 go get -u golang.org/x/tools/cmd/goimports
 pushd "${GOGOPROTO_ROOT}"
-	git reset --hard "${SHA}"
+	git reset --hard "${GOGO_PROTO_SHA}"
 	make install
 popd