From eb9d0e7602aa637a3a45d25e28f3de09a6e4b95b Mon Sep 17 00:00:00 2001 From: peter-edge Date: Wed, 1 May 2019 11:45:37 -0400 Subject: [PATCH] Update dependencies and document (#443) --- Makefile | 8 ++++++++ bazel/deps.bzl | 34 ++++++++++++++++++++-------------- docs/maintenance.md | 13 ++++++++++++- go.mod | 6 +++--- go.sum | 23 +++++++++++++---------- 5 files changed, 56 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 83f3ee66..e9bf1a53 100644 --- a/Makefile +++ b/Makefile @@ -155,6 +155,14 @@ bazelgen: $(BAZEL) grpcgen: $(CERTSTRAP) bash etc/bin/grpcgen.sh +.PHONY: updatedeps +updatedeps: + rm -f go.mod go.sum + go mod init + go get -u ./... + $(MAKE) generate + $(MAKE) + .PHONY: generate generate: __eval_srcs golden example internalgen bazelgen license gofmt -s -w $(SRCS) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 5d6b64fc..faf2733b 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -46,8 +46,8 @@ def prototool_deps(**kwargs): go_repository( name = "com_github_gobuffalo_flect", importpath = "github.com/gobuffalo/flect", - sum = "h1:GTZJjJufv9FxgRs1+0Soo3wj+Md3kTUmTER/YE4uINA=", - version = "v0.1.1", + sum = "h1:3GQ53z7E3o00C/yy7Ko8VXqQXoJGLkrTQCLTF1EjoXU=", + version = "v0.1.3", ) go_repository( name = "com_github_gofrs_flock", @@ -166,20 +166,20 @@ def prototool_deps(**kwargs): go_repository( name = "org_golang_google_grpc", importpath = "google.golang.org/grpc", - sum = "h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM=", - version = "v1.19.1", + sum = "h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU=", + version = "v1.20.1", ) go_repository( name = "org_golang_x_lint", importpath = "golang.org/x/lint", - sum = "h1:x/bBzNauLQAlE3fLku/xy92Y8QwKX5HZymrMz2IiKFc=", - version = "v0.0.0-20181026193005-c67002cb31c3", + sum = "h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=", + version = "v0.0.0-20190313153728-d0100b6bd8b3", ) go_repository( name = "org_golang_x_net", importpath = "golang.org/x/net", - sum = "h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I=", - version = "v0.0.0-20180826012351-8a410e7b638d", + sum = "h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=", + version = "v0.0.0-20190311183353-d8887717615a", ) go_repository( name = "org_golang_x_oauth2", @@ -196,8 +196,8 @@ def prototool_deps(**kwargs): go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - sum = "h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE=", - version = "v0.0.0-20180830151530-49385e6e1522", + sum = "h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=", + version = "v0.0.0-20190215142949-d0b11bdaac8a", ) go_repository( name = "org_golang_x_text", @@ -208,8 +208,8 @@ def prototool_deps(**kwargs): go_repository( name = "org_golang_x_tools", importpath = "golang.org/x/tools", - sum = "h1:qMK98NmNCRVDIYFycQ5yVRkvgDUFfdP8Ip4KqmDEB7g=", - version = "v0.0.0-20190114222345-bf090417da8b", + sum = "h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=", + version = "v0.0.0-20190311212946-11955173bddd", ) go_repository( name = "org_uber_go_atomic", @@ -226,6 +226,12 @@ def prototool_deps(**kwargs): go_repository( name = "org_uber_go_zap", importpath = "go.uber.org/zap", - sum = "h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=", - version = "v1.9.1", + sum = "h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=", + version = "v1.10.0", + ) + go_repository( + name = "org_golang_x_crypto", + importpath = "golang.org/x/crypto", + sum = "h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=", + version = "v0.0.0-20190308221718-c2843e01d9a2", ) diff --git a/docs/maintenance.md b/docs/maintenance.md index 85bded76..cc11ce02 100644 --- a/docs/maintenance.md +++ b/docs/maintenance.md @@ -26,7 +26,18 @@ See https://github.com/uber/prototool/pull/417 for an example. ## Updating dependencies -See https://github.com/uber/prototool/pull/418 for an example of updating versions of dependencies. +There are some issues running `go get -u ./...` multiple times with Golang Modules as of writing +this documentation, so be careful when updating dependencies. Right now, the easiest way to make +sure dependencies are up to date is to run the corresponding Makefile target. + +``` +make updatedeps +``` + +This will do a complete update of the `go.mod`, `go.sum`, and `bazel/deps.bzl` files. This should +be revisited in the future, however. + +See https://github.com/uber/prototool/pull/443 for an example. ## Updating Docker image dependencies diff --git a/go.mod b/go.mod index b0f59231..601b2cfb 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/emicklei/proto v1.6.10 github.com/fullstorydev/grpcurl v1.2.1 - github.com/gobuffalo/flect v0.1.1 + github.com/gobuffalo/flect v0.1.3 github.com/gofrs/flock v0.7.1 github.com/golang/protobuf v1.3.1 github.com/inconshreveable/mousetrap v1.0.0 // indirect @@ -18,7 +18,7 @@ require ( github.com/stretchr/testify v1.3.0 go.uber.org/atomic v1.3.2 // indirect go.uber.org/multierr v1.1.0 - go.uber.org/zap v1.9.1 - google.golang.org/grpc v1.19.1 + go.uber.org/zap v1.10.0 + google.golang.org/grpc v1.20.1 gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 03249c13..19e85b9f 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/emicklei/proto v1.6.10 h1:tXKViikmzSAh7X+SCUliSDphrK9JKKkJaAZB84XVCyY github.com/emicklei/proto v1.6.10/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/fullstorydev/grpcurl v1.2.1 h1:5OUMseLFPJ7dXyvav6cB9z5HMr/vRdjeB4+LL9oGl4w= github.com/fullstorydev/grpcurl v1.2.1/go.mod h1:R6HR6EI02cafd3StLYD1Stwvqg3YaQCiXD8yj3Laq6g= -github.com/gobuffalo/flect v0.1.1 h1:GTZJjJufv9FxgRs1+0Soo3wj+Md3kTUmTER/YE4uINA= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.1.3 h1:3GQ53z7E3o00C/yy7Ko8VXqQXoJGLkrTQCLTF1EjoXU= +github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc= github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -43,29 +43,32 @@ go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20170818100345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=