From 67362c5ebf17f7b8fc5f12098e2264c9a4f9bedb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:09:24 +0000 Subject: [PATCH 1/4] fix(deps): update module github.com/grpc-ecosystem/grpc-gateway to v2 --- gwy/templates/go.mod.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gwy/templates/go.mod.tmpl b/gwy/templates/go.mod.tmpl index 52a22a51..3ac7a0b6 100644 --- a/gwy/templates/go.mod.tmpl +++ b/gwy/templates/go.mod.tmpl @@ -4,7 +4,7 @@ go 1.19 require ( github.com/gorilla/handlers v1.5.1 - github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 github.com/sirupsen/logrus v1.9.0 github.com/spf13/pflag v1.0.5 From 25d97ec0deb0bc453c874baaaef2a3484fa6f31b Mon Sep 17 00:00:00 2001 From: James Craig Burley <430319+jcburley@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:37:50 -0500 Subject: [PATCH 2/4] Remove duplicate (diff-version) grpc-gateway --- gwy/templates/go.mod.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/gwy/templates/go.mod.tmpl b/gwy/templates/go.mod.tmpl index 3ac7a0b6..6cb0570a 100644 --- a/gwy/templates/go.mod.tmpl +++ b/gwy/templates/go.mod.tmpl @@ -5,7 +5,6 @@ go 1.19 require ( github.com/gorilla/handlers v1.5.1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 github.com/sirupsen/logrus v1.9.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.14.0 From c953457273155350fa63ec64e362c6baa1603c66 Mon Sep 17 00:00:00 2001 From: James Craig Burley <430319+jcburley@users.noreply.github.com> Date: Fri, 14 Apr 2023 10:09:44 -0400 Subject: [PATCH 3/4] go mod tidy -e -compat=1.19 --- all/test/go.mod | 2 +- all/test/go.sum | 4 ++-- gwy/templates/go.mod.tmpl | 8 ++++---- variables.sh | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/all/test/go.mod b/all/test/go.mod index 4382d015..4e417afc 100644 --- a/all/test/go.mod +++ b/all/test/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/otiai10/copy v1.9.0 - github.com/stretchr/testify v1.8.1 + github.com/stretchr/testify v1.8.2 ) require ( diff --git a/all/test/go.sum b/all/test/go.sum index 50220499..e05cc8d9 100644 --- a/all/test/go.sum +++ b/all/test/go.sum @@ -15,8 +15,8 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/gwy/templates/go.mod.tmpl b/gwy/templates/go.mod.tmpl index 6cb0570a..97a17526 100644 --- a/gwy/templates/go.mod.tmpl +++ b/gwy/templates/go.mod.tmpl @@ -4,10 +4,10 @@ go 1.19 require ( github.com/gorilla/handlers v1.5.1 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 github.com/sirupsen/logrus v1.9.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.14.0 - google.golang.org/grpc v1.51.0 - google.golang.org/protobuf v1.28.1 + github.com/spf13/viper v1.15.0 + google.golang.org/grpc v1.54.0 + google.golang.org/protobuf v1.30.0 ) diff --git a/variables.sh b/variables.sh index 6b4801dc..8bbb7f81 100755 --- a/variables.sh +++ b/variables.sh @@ -8,22 +8,22 @@ LATEST=${1:false} DEBIAN_VERSION=${DEBIAN_VERSION:-bullseye} GO_VERSION=${GO_VERSION:-1.19} -GRPC_VERSION=${GRPC_VERSION:-1.51} -GRPC_JAVA_VERSION=${GRPC_JAVA_VERSION:-1.51} +GRPC_VERSION=${GRPC_VERSION:-1.52} +GRPC_JAVA_VERSION=${GRPC_JAVA_VERSION:-1.53} GRPC_WEB_VERSION=${GRPC_WEB_VERSION:-1.4.2} -GRPC_GATEWAY_VERSION=${GRPC_GATEWAY_VERSION:-v2.0.1} +GRPC_GATEWAY_VERSION=${GRPC_GATEWAY_VERSION:-v2.15.2} PROTOBUF_JS_VERSION=${PROTOBUF_JS_VERSION:-v3.21.2} UBER_PROTOTOOL_VERSION=${UBER_PROTOTOOL_VERSION:-1.10.0} SCALA_PB_VERSION=${SCALA_PB_VERSION:-0.11.0} MYPY_VERSION=${MYPY_VERSION:-3.4.0} NODE_VERSION=${NODE_VERSION:-14} -NODE_GRPC_TOOLS_NODE_PROTOC_TS_VERSION=${NODE_GRPC_TOOLS_NODE_PROTOC_TS_VERSION:-5.3.2} -NODE_GRPC_TOOLS_VERSION=${NODE_GRPC_TOOLS_VERSION:-1.12.3} +NODE_GRPC_TOOLS_NODE_PROTOC_TS_VERSION=${NODE_GRPC_TOOLS_NODE_PROTOC_TS_VERSION:-5.3.3} +NODE_GRPC_TOOLS_VERSION=${NODE_GRPC_TOOLS_VERSION:-1.12.4} NODE_PROTOC_GEN_GRPC_WEB_VERSION=${NODE_PROTOC_GEN_GRPC_WEB_VERSION:-1.4.1} -TS_PROTO_VERSION=${TS_PROTO_VERSION:-1.138.0} -GO_ENVOYPROXY_PGV_VERSION=${GO_ENVOYPROXY_PGV_VERSION:-0.9.1} +TS_PROTO_VERSION=${TS_PROTO_VERSION:-1.146.0} +GO_ENVOYPROXY_PGV_VERSION=${GO_ENVOYPROXY_PGV_VERSION:-0.10.1} GO_MWITKOW_GPV_VERSION=${GO_MWITKOW_GPV_VERSION:-0.3.2} -GO_PROTOC_GEN_GO_VERSION=${GO_PROTOC_GEN_GO_VERSION:-v1.28.1} -GO_PROTOC_GEN_GO_GRPC_VERSION=${GO_PROTOC_GEN_GO_GRPC_VERSION:-v1.2.0} +GO_PROTOC_GEN_GO_VERSION=${GO_PROTOC_GEN_GO_VERSION:-v1.30.0} +GO_PROTOC_GEN_GO_GRPC_VERSION=${GO_PROTOC_GEN_GO_GRPC_VERSION:-v1.3.0} BUILD_VERSION="${BUILD_VERSION:-local}" VERSION="${VERSION:-${GRPC_VERSION}_${BUILD_VERSION}}" From 54dab79133e563568237e1a5fe55b3741f8e131f Mon Sep 17 00:00:00 2001 From: James Craig Burley <430319+jcburley@users.noreply.github.com> Date: Fri, 14 Apr 2023 10:51:32 -0400 Subject: [PATCH 4/4] Revert breaking change (for now) --- variables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.sh b/variables.sh index 8bbb7f81..28333b15 100755 --- a/variables.sh +++ b/variables.sh @@ -11,7 +11,7 @@ GO_VERSION=${GO_VERSION:-1.19} GRPC_VERSION=${GRPC_VERSION:-1.52} GRPC_JAVA_VERSION=${GRPC_JAVA_VERSION:-1.53} GRPC_WEB_VERSION=${GRPC_WEB_VERSION:-1.4.2} -GRPC_GATEWAY_VERSION=${GRPC_GATEWAY_VERSION:-v2.15.2} +GRPC_GATEWAY_VERSION=${GRPC_GATEWAY_VERSION:-v2.0.1} PROTOBUF_JS_VERSION=${PROTOBUF_JS_VERSION:-v3.21.2} UBER_PROTOTOOL_VERSION=${UBER_PROTOTOOL_VERSION:-1.10.0} SCALA_PB_VERSION=${SCALA_PB_VERSION:-0.11.0}