From a1f41fdf44d4abaa1708a488845870cdada39202 Mon Sep 17 00:00:00 2001 From: sunwen18 Date: Thu, 4 Jun 2020 18:37:21 -0400 Subject: [PATCH 1/5] update docker dependency --- Dockerfile | 33 ++++++++++++++++----------------- docs/docker.md | 16 ++++++++-------- etc/docker/testing/bin/test.sh | 18 +++++++++--------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13dcaf674..890669c10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM golang:1.14-alpine3.11 as builder RUN apk add --update --no-cache build-base curl git upx && \ rm -rf /var/cache/apk/* -ENV GOLANG_PROTOBUF_VERSION=1.3.1 \ - GOGO_PROTOBUF_VERSION=1.2.1 +ENV GOLANG_PROTOBUF_VERSION=1.4.2 \ + GOGO_PROTOBUF_VERSION=1.3.1 RUN GO111MODULE=on go get \ github.com/golang/protobuf/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} \ github.com/gogo/protobuf/protoc-gen-gofast@v${GOGO_PROTOBUF_VERSION} \ @@ -14,7 +14,7 @@ RUN GO111MODULE=on go get \ github.com/gogo/protobuf/protoc-gen-gogoslick@v${GOGO_PROTOBUF_VERSION} && \ mv /go/bin/protoc-gen-go* /usr/local/bin/ -ENV GRPC_GATEWAY_VERSION=1.8.5 +ENV GRPC_GATEWAY_VERSION=1.14.6 RUN curl -sSL \ https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v${GRPC_GATEWAY_VERSION}/protoc-gen-grpc-gateway-v${GRPC_GATEWAY_VERSION}-linux-x86_64 \ -o /usr/local/bin/protoc-gen-grpc-gateway && \ @@ -24,20 +24,19 @@ RUN curl -sSL \ chmod +x /usr/local/bin/protoc-gen-grpc-gateway && \ chmod +x /usr/local/bin/protoc-gen-swagger -ENV GRPC_WEB_VERSION=1.0.4 +ENV GRPC_WEB_VERSION=1.1.0 RUN curl -sSL \ https://github.com/grpc/grpc-web/releases/download/${GRPC_WEB_VERSION}/protoc-gen-grpc-web-${GRPC_WEB_VERSION}-linux-x86_64 \ -o /usr/local/bin/protoc-gen-grpc-web && \ chmod +x /usr/local/bin/protoc-gen-grpc-web -ENV YARPC_VERSION=1.37.3 +ENV YARPC_VERSION=1.46.0 RUN git clone --depth 1 -b v${YARPC_VERSION} https://github.com/yarpc/yarpc-go.git /go/src/go.uber.org/yarpc && \ cd /go/src/go.uber.org/yarpc && \ - GO111MODULE=on go mod init && \ GO111MODULE=on go install ./encoding/protobuf/protoc-gen-yarpc-go && \ mv /go/bin/protoc-gen-yarpc-go /usr/local/bin/ -ENV TWIRP_VERSION=5.7.0 +ENV TWIRP_VERSION=5.11.0 RUN curl -sSL \ https://github.com/twitchtv/twirp/releases/download/v${TWIRP_VERSION}/protoc-gen-twirp-Linux-x86_64 \ -o /usr/local/bin/protoc-gen-twirp && \ @@ -47,7 +46,7 @@ RUN curl -sSL \ chmod +x /usr/local/bin/protoc-gen-twirp && \ chmod +x /usr/local/bin/protoc-gen-twirp_python -ENV PROTOBUF_VERSION=3.6.1 +ENV PROTOBUF_VERSION=3.12.2 RUN mkdir -p /tmp/protoc && \ curl -sSL \ https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip \ @@ -74,10 +73,10 @@ WORKDIR /work ENV \ PROTOTOOL_PROTOC_BIN_PATH=/usr/bin/protoc \ PROTOTOOL_PROTOC_WKT_PATH=/usr/include \ - GRPC_VERSION=1.25.0 \ - PROTOBUF_VERSION=3.11.2 \ + GRPC_VERSION=1.28.1 \ + PROTOBUF_VERSION=3.12.2 \ ALPINE_GRPC_VERSION_SUFFIX=r1 \ - ALPINE_PROTOBUF_VERSION_SUFFIX=r1 + ALPINE_PROTOBUF_VERSION_SUFFIX=r0 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \ apk add --update --no-cache bash curl git grpc=${GRPC_VERSION}-${ALPINE_GRPC_VERSION_SUFFIX} protobuf=${PROTOBUF_VERSION}-${ALPINE_PROTOBUF_VERSION_SUFFIX} && \ @@ -86,9 +85,9 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/reposit COPY --from=builder /usr/local/bin /usr/local/bin COPY --from=builder /usr/local/include /usr/include -ENV GOGO_PROTOBUF_VERSION=1.2.1 \ - GOLANG_PROTOBUF_VERSION=1.3.1 \ - GRPC_GATEWAY_VERSION=1.8.5 \ - GRPC_WEB_VERSION=1.0.4 \ - TWIRP_VERSION=5.7.0 \ - YARPC_VERSION=1.37.3 +ENV GOGO_PROTOBUF_VERSION=1.3.1 \ + GOLANG_PROTOBUF_VERSION=1.4.2 \ + GRPC_GATEWAY_VERSION=1.14.6 \ + GRPC_WEB_VERSION=1.1.0 \ + TWIRP_VERSION=5.11.0 \ + YARPC_VERSION=1.46.0 diff --git a/docs/docker.md b/docs/docker.md index 0c4172f88..b00587a73 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -33,14 +33,14 @@ to add additional plugins - our recommendation is to instead build your own imag | Name | Version | Binaries | | --- | --- | --- | | prototool | (varies) | prototool | -| [protoc] | 3.6.1 | protoc | -| [grpc] | 1.19.1 | grpc_cpp_plugin
grpc_csharp_plugin
grpc_node_plugin
grpc_objective_c_plugin
grpc_php_plugin
grpc_python_plugin
grpc_ruby_plugin | -| [golang/protobuf] | 1.3.1 | protoc-gen-go | -| [gogo/protobuf] | 1.2.1 | protoc-gen-gofast
protoc-gen-gogo
protoc-gen-gogofast
protoc-gen-gogofaster
protoc-gen-gogoslick | -| [grpc-gateway] | 1.8.5 | protoc-gen-grpc-gateway
protoc-gen-swagger | -| [grpc-web] | 1.0.4 | protoc-gen-grpc-web | -| [twirp] | 5.7.0 | protoc-gen-twirp
protoc-gen-twirp_python | -| [yarpc] | 1.37.3 | protoc-gen-yarpc-go | +| [protoc] | 3.12.2 | protoc | +| [grpc] | 1.28.1 | grpc_cpp_plugin
grpc_csharp_plugin
grpc_node_plugin
grpc_objective_c_plugin
grpc_php_plugin
grpc_python_plugin
grpc_ruby_plugin | +| [golang/protobuf] | 1.4.2 | protoc-gen-go | +| [gogo/protobuf] | 1.3.1 | protoc-gen-gofast
protoc-gen-gogo
protoc-gen-gogofast
protoc-gen-gogofaster
protoc-gen-gogoslick | +| [grpc-gateway] | 1.14.6 | protoc-gen-grpc-gateway
protoc-gen-swagger | +| [grpc-web] | 1.1.0 | protoc-gen-grpc-web | +| [twirp] | 5.11.0 | protoc-gen-twirp
protoc-gen-twirp_python | +| [yarpc] | 1.46.0 | protoc-gen-yarpc-go | The Well-Known Types are copied to `/usr/include`. The packages `bash`, `curl`, and `git` are also installed. diff --git a/etc/docker/testing/bin/test.sh b/etc/docker/testing/bin/test.sh index c1bfba431..452ab1d69 100644 --- a/etc/docker/testing/bin/test.sh +++ b/etc/docker/testing/bin/test.sh @@ -57,17 +57,17 @@ check_dir_not_exists() { fi } -check_env GOGO_PROTOBUF_VERSION 1.2.1 -check_env GOLANG_PROTOBUF_VERSION 1.3.1 -check_env GRPC_VERSION 1.25.0 -check_env GRPC_GATEWAY_VERSION 1.8.5 -check_env GRPC_WEB_VERSION 1.0.4 -check_env PROTOBUF_VERSION 3.11.2 -check_env TWIRP_VERSION 5.7.0 -check_env YARPC_VERSION 1.37.3 +check_env GOGO_PROTOBUF_VERSION 1.3.1 +check_env GOLANG_PROTOBUF_VERSION 1.4.2 +check_env GRPC_VERSION 1.28.1 +check_env GRPC_GATEWAY_VERSION 1.14.6 +check_env GRPC_WEB_VERSION 1.1.0 +check_env PROTOBUF_VERSION 3.12.2 +check_env TWIRP_VERSION 5.11.0 +check_env YARPC_VERSION 1.46.0 check_env PROTOTOOL_PROTOC_BIN_PATH /usr/bin/protoc check_env PROTOTOOL_PROTOC_WKT_PATH /usr/include -check_command_output "libprotoc 3.11.2" protoc --version +check_command_output "libprotoc 3.12.2" protoc --version check_command_output_file etc/wkt.txt find /usr/include -type f check_which /usr/bin/protoc check_which /usr/bin/grpc_cpp_plugin From ed2baa6184186a70612c1bb1c31c1f4c5b537c8a Mon Sep 17 00:00:00 2001 From: sunwen18 Date: Tue, 9 Jun 2020 09:47:18 -0400 Subject: [PATCH 2/5] update dep --- go.mod | 9 ++++----- go.sum | 34 ++++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 28dfe9d27..c5f9df3f1 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,11 @@ go 1.14 require ( github.com/emicklei/proto v1.9.0 - github.com/fullstorydev/grpcurl v1.4.0 + github.com/fullstorydev/grpcurl v1.6.0 github.com/gobuffalo/flect v0.2.1 github.com/gofrs/flock v0.7.1 - github.com/golang/protobuf v1.3.4 - github.com/jhump/protoreflect v1.6.0 + github.com/golang/protobuf v1.3.5 + github.com/jhump/protoreflect v1.6.1 github.com/mitchellh/go-wordwrap v1.0.0 github.com/spf13/cobra v0.0.6 github.com/spf13/pflag v1.0.5 @@ -19,8 +19,7 @@ require ( golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect golang.org/x/text v0.3.2 // indirect - golang.org/x/tools v0.0.0-20200311222014-c807066ff753 // indirect google.golang.org/genproto v0.0.0-20200311144346-b662892dd51b // indirect - google.golang.org/grpc v1.28.0 + google.golang.org/grpc v1.29.0 gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index 55b7a8aed..a6041f4b2 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -10,6 +11,7 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f h1:WBZRG4aNOuI15bLRrCgN8fCq8E5Xuty6jGbmSNEvSsU= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -27,11 +29,13 @@ github.com/emicklei/proto v1.9.0 h1:l0QiNT6Qs7Yj0Mb4X6dnWBQer4ebei2BFcgQLbGqUDc= github.com/emicklei/proto v1.9.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4 h1:rEvIZUSZ3fx39WIi3JkQqQBitGwpELBIYWeBVh6wn+E= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fullstorydev/grpcurl v1.4.0 h1:rKQyAaegPtCj4mpItnCHd+PIEHspIZl14VWhHYIHhls= -github.com/fullstorydev/grpcurl v1.4.0/go.mod h1:kvk8xPCXOrwVd9zYdjy+xSOT4YWm6kyth4Y9NMfBns4= +github.com/fullstorydev/grpcurl v1.6.0 h1:p8BB6VZF8O7w6MxGr3KJ9E6EVKaswCevSALK6FBtMzA= +github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -50,12 +54,13 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -63,9 +68,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jhump/protoreflect v1.5.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= -github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= +github.com/jhump/protoreflect v1.6.1 h1:4/2yi5LyDPP7nN+Hiird1SAJ6YoxUm13/oxHGRnbPd8= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -84,6 +88,7 @@ github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -130,6 +135,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -160,7 +166,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -174,6 +179,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -205,14 +211,16 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200311222014-c807066ff753 h1:CuaXjesf8HXc9cSxHpEzHyFF+1FCOpgdxhQ/5vRcYZw= -golang.org/x/tools v0.0.0-20200311222014-c807066ff753/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -226,8 +234,8 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.0 h1:2pJjwYOdkZ9HlN4sWRYBg9ttH5bCOlsueaM+b/oYjwo= +google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= @@ -243,3 +251,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= From c9a7ed08b951b8cfac1a028b5af00f505bc916db Mon Sep 17 00:00:00 2001 From: sunwen18 Date: Tue, 9 Jun 2020 15:43:28 -0400 Subject: [PATCH 3/5] change bazel --- bazel/deps.bzl | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 73739ad70..0efb4e214 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -4,8 +4,8 @@ def prototool_deps(**kwargs): go_repository( name = "co_honnef_go_tools", importpath = "honnef.co/go/tools", - sum = "h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=", - version = "v0.0.1-2019.2.3", + sum = "h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=", + version = "v0.0.1-2020.1.3", ) go_repository( name = "com_github_burntsushi_toml", @@ -40,8 +40,8 @@ def prototool_deps(**kwargs): go_repository( name = "com_github_fullstorydev_grpcurl", importpath = "github.com/fullstorydev/grpcurl", - sum = "h1:rKQyAaegPtCj4mpItnCHd+PIEHspIZl14VWhHYIHhls=", - version = "v1.4.0", + sum = "h1:p8BB6VZF8O7w6MxGr3KJ9E6EVKaswCevSALK6FBtMzA=", + version = "v1.6.0", ) go_repository( name = "com_github_gobuffalo_flect", @@ -70,8 +70,8 @@ def prototool_deps(**kwargs): go_repository( name = "com_github_golang_protobuf", importpath = "github.com/golang/protobuf", - sum = "h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=", - version = "v1.3.4", + sum = "h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=", + version = "v1.3.5", ) go_repository( name = "com_github_inconshreveable_mousetrap", @@ -82,8 +82,8 @@ def prototool_deps(**kwargs): go_repository( name = "com_github_jhump_protoreflect", importpath = "github.com/jhump/protoreflect", - sum = "h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=", - version = "v1.6.0", + sum = "h1:4/2yi5LyDPP7nN+Hiird1SAJ6YoxUm13/oxHGRnbPd8=", + version = "v1.6.1", ) go_repository( name = "com_github_mitchellh_go_wordwrap", @@ -166,8 +166,8 @@ def prototool_deps(**kwargs): go_repository( name = "org_golang_google_grpc", importpath = "google.golang.org/grpc", - sum = "h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=", - version = "v1.28.0", + sum = "h1:2pJjwYOdkZ9HlN4sWRYBg9ttH5bCOlsueaM+b/oYjwo=", + version = "v1.29.0", ) go_repository( name = "org_golang_x_lint", @@ -208,8 +208,8 @@ def prototool_deps(**kwargs): go_repository( name = "org_golang_x_tools", importpath = "golang.org/x/tools", - sum = "h1:CuaXjesf8HXc9cSxHpEzHyFF+1FCOpgdxhQ/5vRcYZw=", - version = "v0.0.0-20200311222014-c807066ff753", + sum = "h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM=", + version = "v0.0.0-20200426102838-f3a5411a4c3b", ) go_repository( name = "org_uber_go_atomic", @@ -715,3 +715,21 @@ def prototool_deps(**kwargs): sum = "h1:WBZRG4aNOuI15bLRrCgN8fCq8E5Xuty6jGbmSNEvSsU=", version = "v0.0.0-20191209042840-269d4d468f6f", ) + go_repository( + name = "com_github_gordonklaus_ineffassign", + importpath = "github.com/gordonklaus/ineffassign", + sum = "h1:vc7Dmrk4JwS0ZPS6WZvWlwDflgDTA26jItmbSj83nug=", + version = "v0.0.0-20200309095847-7953dde2c7bf", + ) + go_repository( + name = "com_github_nishanths_predeclared", + importpath = "github.com/nishanths/predeclared", + sum = "h1:0NtlnvxTh8fQsQm55+bkvrqgn0zcv+M4TF8otNCuYl4=", + version = "v0.0.0-20190419143655-18a43bb90ffc", + ) + go_repository( + name = "com_github_yuin_goldmark", + importpath = "github.com/yuin/goldmark", + sum = "h1:nqDD4MMMQA0lmWq03Z2/myGPYLQoXtmi0rGVs95ntbo=", + version = "v1.1.27", + ) From a88b59ff94582afae727d397fd0e8f07f86f77dd Mon Sep 17 00:00:00 2001 From: sunwen18 Date: Tue, 9 Jun 2020 22:52:31 -0400 Subject: [PATCH 4/5] try this --- prototool.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 prototool.yaml diff --git a/prototool.yaml b/prototool.yaml new file mode 100644 index 000000000..df9e37dd1 --- /dev/null +++ b/prototool.yaml @@ -0,0 +1,4 @@ +protoc: + version: 3.11.0 +lint: + group: uber2 From 80355f4bc92839b39f3d2a72d3227cdbf5f6bc0a Mon Sep 17 00:00:00 2001 From: sunwen18 Date: Wed, 10 Jun 2020 09:29:39 -0400 Subject: [PATCH 5/5] delete prototool yaml --- prototool.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 prototool.yaml diff --git a/prototool.yaml b/prototool.yaml deleted file mode 100644 index df9e37dd1..000000000 --- a/prototool.yaml +++ /dev/null @@ -1,4 +0,0 @@ -protoc: - version: 3.11.0 -lint: - group: uber2