Skip to content

Commit

Permalink
deps: update golang/protobuf everywhere and bump protoc-gen-star (#373)
Browse files Browse the repository at this point in the history
* gazelle update

Signed-off-by: Daniel Hochman <danielhochman@users.noreply.github.com>

* undo change to WORKSPACE

Signed-off-by: Daniel Hochman <danielhochman@users.noreply.github.com>

* more version updates

Signed-off-by: Daniel Hochman <danielhochman@users.noreply.github.com>

* latest PGG

Signed-off-by: Daniel Hochman <danielhochman@users.noreply.github.com>
  • Loading branch information
danielhochman committed Aug 10, 2020
1 parent d2f9a12 commit e020f3a
Show file tree
Hide file tree
Showing 10 changed files with 213 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
environment:
MAVEN_OPTS: -Xms512m -Xmx1024m # Customize the JVM maximum heap limit
GO111MODULE: "on"
CI_GO_VERSION: 1.14.3
CI_GO_VERSION: 1.14.7
steps:
- checkout:
path: ~/.go_workspace/src/github.com/envoyproxy/protoc-gen-validate
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update \


# protoc
ENV PROTOC_VER=3.6.1
ENV PROTOC_VER=3.12.4
ENV PROTOC_REL=protoc-"${PROTOC_VER}"-linux-x86_64.zip
RUN wget https://github.com/google/protobuf/releases/download/v"${PROTOC_VER}/${PROTOC_REL}" \
&& unzip ${PROTOC_REL} -d protoc \
Expand All @@ -36,7 +36,7 @@ RUN wget https://github.com/google/protobuf/releases/download/v"${PROTOC_VER}/${
ENV GOROOT /usr/local/go
ENV GOPATH /go
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
ENV GORELEASE go1.13.9.linux-amd64.tar.gz
ENV GORELEASE go1.14.7.linux-amd64.tar.gz
RUN wget -q https://dl.google.com/go/$GORELEASE \
&& tar -C $(dirname $GOROOT) -xzf $GORELEASE \
&& rm $GORELEASE \
Expand All @@ -45,7 +45,7 @@ RUN wget -q https://dl.google.com/go/$GORELEASE \
# protoc-gen-go
ENV PGG_PKG "github.com/golang/protobuf/protoc-gen-go"
ENV PGG_PATH "${GOPATH}/src/${PGG_PKG}"
ENV PGG_VER=v1.3.1
ENV PGG_VER=v1.4.2
RUN go get -d ${PGG_PKG} \
&& cd ${PGG_PATH} \
&& git checkout ${PGG_VER} \
Expand Down
4 changes: 2 additions & 2 deletions Gopkg.toml
@@ -1,10 +1,10 @@
[[constraint]]
name = "github.com/golang/protobuf"
version = "1.2.0"
version = "1.4.2"

[[constraint]]
name = "github.com/lyft/protoc-gen-star"
version = "0.4.10"
version = "0.5.1"

[[constraint]]
branch = "master"
Expand Down
140 changes: 130 additions & 10 deletions dependencies.bzl
Expand Up @@ -10,8 +10,8 @@ def go_third_party():
go_repository(
name = "com_github_golang_protobuf",
importpath = "github.com/golang/protobuf",
sum = "h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=",
version = "v1.3.1",
sum = "h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=",
version = "v1.4.2",
)
go_repository(
name = "com_github_iancoleman_strcase",
Expand All @@ -22,8 +22,8 @@ def go_third_party():
go_repository(
name = "com_github_lyft_protoc_gen_star",
importpath = "github.com/lyft/protoc-gen-star",
sum = "h1:yekjh68Yp+AF+IXd/0vLd+DQv+eb6joCTA6qxRmtE2A=",
version = "v0.4.10",
sum = "h1:sImehRT+p7lW9n6R7MQc5hVgzWGEkDVZU4AsBQ4Isu8=",
version = "v0.5.1",
)
go_repository(
name = "com_github_pmezard_go_difflib",
Expand All @@ -34,8 +34,8 @@ def go_third_party():
go_repository(
name = "com_github_spf13_afero",
importpath = "github.com/spf13/afero",
sum = "h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=",
version = "v1.1.2",
sum = "h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc=",
version = "v1.3.4",
)
go_repository(
name = "com_github_stretchr_objx",
Expand All @@ -46,8 +46,8 @@ def go_third_party():
go_repository(
name = "com_github_stretchr_testify",
importpath = "github.com/stretchr/testify",
sum = "h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=",
version = "v1.5.1",
sum = "h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=",
version = "v1.6.1",
)
go_repository(
name = "com_github_yuin_goldmark",
Expand Down Expand Up @@ -106,8 +106,8 @@ def go_third_party():
go_repository(
name = "org_golang_x_text",
importpath = "golang.org/x/text",
sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
version = "v0.3.0",
sum = "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=",
version = "v0.3.3",
)
go_repository(
name = "org_golang_x_tools",
Expand All @@ -121,3 +121,123 @@ def go_third_party():
sum = "h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=",
version = "v0.0.0-20191204190536-9bdfabe68543",
)
go_repository(
name = "co_honnef_go_tools",
importpath = "honnef.co/go/tools",
sum = "h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=",
version = "v0.0.0-20190523083050-ea95bdfd59fc",
)
go_repository(
name = "com_github_burntsushi_toml",
importpath = "github.com/BurntSushi/toml",
sum = "h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=",
version = "v0.3.1",
)
go_repository(
name = "com_github_census_instrumentation_opencensus_proto",
importpath = "github.com/census-instrumentation/opencensus-proto",
sum = "h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=",
version = "v0.2.1",
)
go_repository(
name = "com_github_client9_misspell",
importpath = "github.com/client9/misspell",
sum = "h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=",
version = "v0.3.4",
)
go_repository(
name = "com_github_envoyproxy_go_control_plane",
importpath = "github.com/envoyproxy/go-control-plane",
sum = "h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w=",
version = "v0.9.1-0.20191026205805-5f8ba28d4473",
)
go_repository(
name = "com_github_golang_glog",
importpath = "github.com/golang/glog",
sum = "h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=",
version = "v0.0.0-20160126235308-23def4e6c14b",
)
go_repository(
name = "com_github_golang_mock",
importpath = "github.com/golang/mock",
sum = "h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=",
version = "v1.1.1",
)
go_repository(
name = "com_github_google_go_cmp",
importpath = "github.com/google/go-cmp",
sum = "h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=",
version = "v0.5.0",
)
go_repository(
name = "com_github_kr_fs",
importpath = "github.com/kr/fs",
sum = "h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=",
version = "v0.1.0",
)
go_repository(
name = "com_github_pkg_errors",
importpath = "github.com/pkg/errors",
sum = "h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=",
version = "v0.8.1",
)
go_repository(
name = "com_github_pkg_sftp",
importpath = "github.com/pkg/sftp",
sum = "h1:VasscCm72135zRysgrJDKsntdmPN+OuU3+nnHYA9wyc=",
version = "v1.10.1",
)
go_repository(
name = "com_github_prometheus_client_model",
importpath = "github.com/prometheus/client_model",
sum = "h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=",
version = "v0.0.0-20190812154241-14fe0d1b01d4",
)
go_repository(
name = "com_google_cloud_go",
importpath = "cloud.google.com/go",
sum = "h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=",
version = "v0.26.0",
)
go_repository(
name = "in_gopkg_yaml_v3",
importpath = "gopkg.in/yaml.v3",
sum = "h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=",
version = "v3.0.0-20200313102051-9f266ea9e77c",
)
go_repository(
name = "org_golang_google_appengine",
importpath = "google.golang.org/appengine",
sum = "h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=",
version = "v1.4.0",
)
go_repository(
name = "org_golang_google_genproto",
importpath = "google.golang.org/genproto",
sum = "h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=",
version = "v0.0.0-20200526211855-cb27e3aa2013",
)
go_repository(
name = "org_golang_google_grpc",
importpath = "google.golang.org/grpc",
sum = "h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=",
version = "v1.27.0",
)
go_repository(
name = "org_golang_google_protobuf",
importpath = "google.golang.org/protobuf",
sum = "h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=",
version = "v1.25.0",
)
go_repository(
name = "org_golang_x_exp",
importpath = "golang.org/x/exp",
sum = "h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=",
version = "v0.0.0-20190121172915-509febef88a4",
)
go_repository(
name = "org_golang_x_oauth2",
importpath = "golang.org/x/oauth2",
sum = "h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=",
version = "v0.0.0-20180821212333-d2e6202438be",
)
6 changes: 3 additions & 3 deletions go.mod
Expand Up @@ -5,10 +5,10 @@ go 1.14
require (
github.com/golang/protobuf v1.4.2
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
github.com/lyft/protoc-gen-star v0.4.10
github.com/spf13/afero v1.1.2 // indirect
github.com/stretchr/testify v1.5.1 // indirect
github.com/lyft/protoc-gen-star v0.5.1
github.com/spf13/afero v1.3.4 // indirect
golang.org/x/lint v0.0.0-20200302205851-738671d3881b
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375
google.golang.org/protobuf v1.25.0 // indirect
)

0 comments on commit e020f3a

Please sign in to comment.