Skip to content

Commit

Permalink
dep: Bump grpc-go version
Browse files Browse the repository at this point in the history
And pull in new packages -- in particular, the encoding/proto package
isn't needed for compilation but is needed at runtime.

Release note: None
  • Loading branch information
a-robinson committed May 17, 2018
1 parent db6180b commit b161db8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
9 changes: 6 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/testutils/lint/lint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,10 @@ func TestLint(t *testing.T) {
//
// sql/parser/yaccpar:362:3: this value of sqlDollar is never used (SA4006)
&lint.GlobIgnore{Pattern: "github.com/cockroachdb/cockroach/pkg/sql/parser/sql.go", Checks: []string{"SA4006"}},
// Files generated by github.com/grpc-ecosystem/grpc-gateway use a
// deprecated logging method (SA1019). Ignore such errors until they
// fix it and we update to using a newer SHA.
&lint.GlobIgnore{Pattern: "github.com/cockroachdb/cockroach/pkg/*/*/*.pb.gw.go", Checks: []string{"SA1019"}},
},
unused.NewLintChecker(unusedChecker): {
// sql/parser/yaccpar:14:6: type sqlParser is unused (U1000)
Expand Down
3 changes: 1 addition & 2 deletions pkg/util/grpcutil/grpc_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ func IsClosedConnection(err error) bool {
}
if s, ok := status.FromError(err); ok {
if s.Code() == codes.Canceled ||
s.Code() == codes.Unavailable ||
s.Message() == grpc.ErrClientConnClosing.Error() {
s.Code() == codes.Unavailable {
return true
}
}
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 84 files
+173 −15 github.com/golang/protobuf/jsonpb/jsonpb.go
+0 −43 github.com/golang/protobuf/proto/Makefile
+35 −11 github.com/golang/protobuf/proto/clone.go
+63 −605 github.com/golang/protobuf/proto/decode.go
+200 −1 github.com/golang/protobuf/proto/discard.go
+25 −1,166 github.com/golang/protobuf/proto/encode.go
+15 −15 github.com/golang/protobuf/proto/equal.go
+80 −124 github.com/golang/protobuf/proto/extensions.go
+47 −23 github.com/golang/protobuf/proto/lib.go
+42 −39 github.com/golang/protobuf/proto/message_set.go
+234 −361 github.com/golang/protobuf/proto/pointer_reflect.go
+202 −164 github.com/golang/protobuf/proto/pointer_unsafe.go
+48 −376 github.com/golang/protobuf/proto/properties.go
+2,681 −0 github.com/golang/protobuf/proto/table_marshal.go
+654 −0 github.com/golang/protobuf/proto/table_merge.go
+1,967 −0 github.com/golang/protobuf/proto/table_unmarshal.go
+25 −36 github.com/golang/protobuf/proto/text.go
+31 −46 github.com/golang/protobuf/proto/text_parser.go
+0 −37 github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
+945 −348 github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+25 −2 github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
+0 −40 github.com/golang/protobuf/protoc-gen-go/generator/Makefile
+589 −531 github.com/golang/protobuf/protoc-gen-go/generator/generator.go
+117 −0 github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap.go
+0 −45 github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
+85 −9 github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
+31 −18 github.com/golang/protobuf/ptypes/any/any.pb.go
+33 −18 github.com/golang/protobuf/ptypes/duration/duration.pb.go
+0 −43 github.com/golang/protobuf/ptypes/regen.sh
+100 −40 github.com/golang/protobuf/ptypes/struct/struct.pb.go
+34 −19 github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go
+1 −1 github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
+0 −0 google.golang.org/grpc/.please-update
+5 −4 google.golang.org/grpc/.travis.yml
+4 −0 google.golang.org/grpc/CONTRIBUTING.md
+6 −3 google.golang.org/grpc/Makefile
+1 −2 google.golang.org/grpc/README.md
+10 −3 google.golang.org/grpc/balancer.go
+9 −4 google.golang.org/grpc/balancer/balancer.go
+0 −1 google.golang.org/grpc/balancer/base/balancer.go
+1 −1 google.golang.org/grpc/balancer_conn_wrappers.go
+0 −3 google.golang.org/grpc/balancer_v1_wrapper.go
+36 −289 google.golang.org/grpc/call.go
+573 −0 google.golang.org/grpc/channelz/funcs.go
+418 −0 google.golang.org/grpc/channelz/types.go
+257 −53 google.golang.org/grpc/clientconn.go
+17 −81 google.golang.org/grpc/codec.go
+12 −11 google.golang.org/grpc/codes/codes.go
+3 −2 google.golang.org/grpc/credentials/credentials.go
+78 −21 google.golang.org/grpc/encoding/encoding.go
+110 −0 google.golang.org/grpc/encoding/proto/proto.go
+37 −0 google.golang.org/grpc/envconfig.go
+3 −31 google.golang.org/grpc/go16.go
+3 −31 google.golang.org/grpc/go17.go
+4 −5 google.golang.org/grpc/grpclb.go
+297 −113 google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.pb.go
+24 −12 google.golang.org/grpc/grpclb_remote_balancer.go
+124 −0 google.golang.org/grpc/grpclb_util.go
+3 −0 google.golang.org/grpc/grpclog/grpclog.go
+2 −0 google.golang.org/grpc/grpclog/logger.go
+64 −27 google.golang.org/grpc/health/grpc_health_v1/health.pb.go
+16 −6 google.golang.org/grpc/health/grpc_health_v1/health.proto
+3 −1 google.golang.org/grpc/interceptor.go
+81 −8 google.golang.org/grpc/metadata/metadata.go
+3 −3 google.golang.org/grpc/naming/dns_resolver.go
+11 −1 google.golang.org/grpc/naming/naming.go
+192 −2 google.golang.org/grpc/picker_wrapper.go
+23 −21 google.golang.org/grpc/resolver/dns/dns_resolver.go
+15 −16 google.golang.org/grpc/resolver/resolver.go
+10 −11 google.golang.org/grpc/resolver_conn_wrapper.go
+275 −53 google.golang.org/grpc/rpc_util.go
+214 −38 google.golang.org/grpc/server.go
+11 −4 google.golang.org/grpc/service_config.go
+2 −0 google.golang.org/grpc/stats/stats.go
+15 −7 google.golang.org/grpc/status/status.go
+289 −245 google.golang.org/grpc/stream.go
+769 −0 google.golang.org/grpc/transport/controlbuf.go
+87 −185 google.golang.org/grpc/transport/flowcontrol.go
+59 −21 google.golang.org/grpc/transport/handler_server.go
+509 −604 google.golang.org/grpc/transport/http2_client.go
+334 −413 google.golang.org/grpc/transport/http2_server.go
+116 −31 google.golang.org/grpc/transport/http_util.go
+108 −182 google.golang.org/grpc/transport/transport.go
+9 −0 google.golang.org/grpc/vet.sh

0 comments on commit b161db8

Please sign in to comment.