Skip to content
This repository has been archived by the owner on Mar 4, 2022. It is now read-only.

Commit

Permalink
Update deps and nil fix (#513)
Browse files Browse the repository at this point in the history
* Checking in bazel deps

* Update deps and opt-out of TLS 1.3

* Deps update for Bazel/Gazelle

* Added comments for nil interface check

* Added erroneously removed line
  • Loading branch information
Steve Ayers authored Oct 11, 2019
1 parent 7df3b95 commit f454097
Show file tree
Hide file tree
Showing 10 changed files with 171 additions and 66 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ unexport GOPATH
export GO111MODULE := on
export GOBIN := $(abspath $(TMP_BIN))
export PATH := $(GOBIN):$(PATH)
# Go 1.13 defaults to TLS 1.3 and requires an opt-out. Opting out for now until certs can be regenerated before 1.14
# https://golang.org/doc/go1.12#tls_1_3
export GODEBUG := tls13=0

.PHONY: env
env:
Expand Down Expand Up @@ -159,7 +162,7 @@ grpcgen: $(CERTSTRAP)
.PHONY: updatedeps
updatedeps:
rm -f go.mod go.sum
go mod init
go mod init github.com/uber/prototool
go get -u ./...
$(MAKE) generate
$(MAKE)
Expand Down
88 changes: 50 additions & 38 deletions bazel/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "co_honnef_go_tools",
importpath = "honnef.co/go/tools",
sum = "h1:XJP7lxbSxWLOMNdBE4B/STaqVy6L73o0knwj2vIlxnw=",
version = "v0.0.0-20190102054323-c2f93a96b099",
sum = "h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=",
version = "v0.0.0-20190523083050-ea95bdfd59fc",
)
go_repository(
name = "com_github_burntsushi_toml",
Expand Down Expand Up @@ -34,20 +34,20 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_emicklei_proto",
importpath = "github.com/emicklei/proto",
sum = "h1:YrqiuMewYy3xC0rUXi9oqaT6IN68/vDffX2DAx8X+9w=",
version = "v1.6.12",
sum = "h1:5iEEswaKG9xfE8aqbERdx5MXV/QizS63UvYWga2v9FY=",
version = "v1.7.0",
)
go_repository(
name = "com_github_fullstorydev_grpcurl",
importpath = "github.com/fullstorydev/grpcurl",
sum = "h1:XwiEVudma689HpecmJX6sTmOQCd1G5Cyqyj+zSqdk30=",
version = "v1.3.0",
sum = "h1:rKQyAaegPtCj4mpItnCHd+PIEHspIZl14VWhHYIHhls=",
version = "v1.4.0",
)
go_repository(
name = "com_github_gobuffalo_flect",
importpath = "github.com/gobuffalo/flect",
sum = "h1:3GQ53z7E3o00C/yy7Ko8VXqQXoJGLkrTQCLTF1EjoXU=",
version = "v0.1.3",
sum = "h1:D7KWNRFiCknJKA495/e1BO7oxqf8tbieaLv/ehoZ/+g=",
version = "v0.1.6",
)
go_repository(
name = "com_github_gofrs_flock",
Expand All @@ -70,8 +70,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_golang_protobuf",
importpath = "github.com/golang/protobuf",
sum = "h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=",
version = "v1.3.1",
sum = "h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=",
version = "v1.3.2",
)
go_repository(
name = "com_github_inconshreveable_mousetrap",
Expand All @@ -82,8 +82,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_jhump_protoreflect",
importpath = "github.com/jhump/protoreflect",
sum = "h1:tgahjuElRiJthp9JfaMUFxabBVIytT/lnMSadY5kMjM=",
version = "v1.4.1",
sum = "h1:NgpVT+dX71c8hZnxHof2M7QDK7QtohIJ7DYycjnkyfc=",
version = "v1.5.0",
)
go_repository(
name = "com_github_mitchellh_go_wordwrap",
Expand Down Expand Up @@ -112,14 +112,14 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_spf13_cobra",
importpath = "github.com/spf13/cobra",
sum = "h1:S0tLZ3VOKl2Te0hpq8+ke0eSJPfCnNTPiDlsfwi1/NE=",
version = "v0.0.4",
sum = "h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=",
version = "v0.0.5",
)
go_repository(
name = "com_github_spf13_pflag",
importpath = "github.com/spf13/pflag",
sum = "h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=",
version = "v1.0.3",
sum = "h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=",
version = "v1.0.5",
)
go_repository(
name = "com_github_stretchr_objx",
Expand All @@ -130,8 +130,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_stretchr_testify",
importpath = "github.com/stretchr/testify",
sum = "h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=",
version = "v1.3.0",
sum = "h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=",
version = "v1.4.0",
)
go_repository(
name = "com_google_cloud_go",
Expand All @@ -148,26 +148,26 @@ def prototool_deps(**kwargs):
go_repository(
name = "in_gopkg_yaml_v2",
importpath = "gopkg.in/yaml.v2",
sum = "h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=",
version = "v2.2.2",
sum = "h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=",
version = "v2.2.4",
)
go_repository(
name = "org_golang_google_appengine",
importpath = "google.golang.org/appengine",
sum = "h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=",
version = "v1.1.0",
sum = "h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=",
version = "v1.4.0",
)
go_repository(
name = "org_golang_google_genproto",
importpath = "google.golang.org/genproto",
sum = "h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=",
version = "v0.0.0-20180817151627-c66870c02cf8",
sum = "h1:4HYDjxeNXAOTv3o1N2tjo8UUSlhQgAD52FVkwxnWgM8=",
version = "v0.0.0-20191009194640-548a555dbc03",
)
go_repository(
name = "org_golang_google_grpc",
importpath = "google.golang.org/grpc",
sum = "h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0=",
version = "v1.21.0",
sum = "h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=",
version = "v1.24.0",
)
go_repository(
name = "org_golang_x_lint",
Expand All @@ -178,8 +178,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "org_golang_x_net",
importpath = "golang.org/x/net",
sum = "h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=",
version = "v0.0.0-20190311183353-d8887717615a",
sum = "h1:TR699M2v0qoKTOHxeLgp6zPqaQNs74f01a/ob9W0qko=",
version = "v0.0.0-20191009170851-d66e71096ffb",
)
go_repository(
name = "org_golang_x_oauth2",
Expand All @@ -190,26 +190,26 @@ def prototool_deps(**kwargs):
go_repository(
name = "org_golang_x_sync",
importpath = "golang.org/x/sync",
sum = "h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=",
version = "v0.0.0-20180314180146-1d60e4601c6f",
sum = "h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=",
version = "v0.0.0-20190423024810-112230192c58",
)
go_repository(
name = "org_golang_x_sys",
importpath = "golang.org/x/sys",
sum = "h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=",
version = "v0.0.0-20190215142949-d0b11bdaac8a",
sum = "h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=",
version = "v0.0.0-20191010194322-b09406accb47",
)
go_repository(
name = "org_golang_x_text",
importpath = "golang.org/x/text",
sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
version = "v0.3.0",
sum = "h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=",
version = "v0.3.2",
)
go_repository(
name = "org_golang_x_tools",
importpath = "golang.org/x/tools",
sum = "h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=",
version = "v0.0.0-20190311212946-11955173bddd",
sum = "h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=",
version = "v0.0.0-20190524140312-2c0ae7006135",
)
go_repository(
name = "org_uber_go_atomic",
Expand All @@ -220,8 +220,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "org_uber_go_multierr",
importpath = "go.uber.org/multierr",
sum = "h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=",
version = "v1.1.0",
sum = "h1:6I+W7f5VwC5SV9dNrZ3qXrDB9mD0dyGOi/ZJmYw03T4=",
version = "v1.2.0",
)
go_repository(
name = "org_uber_go_zap",
Expand Down Expand Up @@ -337,3 +337,15 @@ def prototool_deps(**kwargs):
sum = "h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=",
version = "v0.0.3-0.20170626215501-b2862e3d0a77",
)
go_repository(
name = "com_github_shurcool_sanitized_anchor_name",
importpath = "github.com/shurcooL/sanitized_anchor_name",
sum = "h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=",
version = "v1.0.0",
)
go_repository(
name = "org_golang_x_exp",
importpath = "golang.org/x/exp",
sum = "h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=",
version = "v0.0.0-20190121172915-509febef88a4",
)
2 changes: 2 additions & 0 deletions example/gen/go/uber/foo/v1/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ go_library(
"@com_github_golang_protobuf//ptypes/duration:go_default_library",
"@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
"@org_golang_google_grpc//status:go_default_library",
],
)
19 changes: 19 additions & 0 deletions example/gen/go/uber/foo/v1/excited_api.pb.go

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

13 changes: 13 additions & 0 deletions example/gen/go/uber/foo/v1/hello_api.pb.go

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

26 changes: 15 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
module github.com/uber/prototool

go 1.12
go 1.13

require (
github.com/emicklei/proto v1.6.12
github.com/fullstorydev/grpcurl v1.3.2
github.com/gobuffalo/flect v0.1.3
github.com/emicklei/proto v1.7.0
github.com/fullstorydev/grpcurl v1.4.0
github.com/gobuffalo/flect v0.1.6
github.com/gofrs/flock v0.7.1
github.com/golang/protobuf v1.3.1
github.com/golang/protobuf v1.3.2
github.com/jhump/protoreflect v1.5.0
github.com/mitchellh/go-wordwrap v1.0.0
github.com/pkg/errors v0.8.1 // indirect
github.com/spf13/cobra v0.0.4
github.com/spf13/pflag v1.0.3
github.com/stretchr/testify v1.3.0
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0
go.uber.org/multierr v1.2.0
go.uber.org/zap v1.10.0
google.golang.org/grpc v1.21.0
gopkg.in/yaml.v2 v2.2.2
golang.org/x/net v0.0.0-20191009170851-d66e71096ffb // indirect
golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
golang.org/x/text v0.3.2 // indirect
google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 // indirect
google.golang.org/grpc v1.24.0
gopkg.in/yaml.v2 v2.2.4
)
Loading

0 comments on commit f454097

Please sign in to comment.