From 59d6ece608e1c53297b83e44565b88f11940f693 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 20 Aug 2020 18:42:46 +0200 Subject: [PATCH] bridge: grpc codegen --- Tiltfile | 2 +- generate-protos.sh | 10 ++++++++-- tools/go.mod | 1 + tools/go.sum | 2 ++ tools/tools.go | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Tiltfile b/Tiltfile index 6ecf07a86..73175c432 100644 --- a/Tiltfile +++ b/Tiltfile @@ -6,7 +6,7 @@ num_guardians = int(cfg.get("num", "5")) local_resource( name = "proto-gen", - deps = "./proto", + deps = ["./proto", "./generate-protos.sh"], cmd = "./generate-protos.sh", ) diff --git a/generate-protos.sh b/generate-protos.sh index 996a47ae8..05b515560 100755 --- a/generate-protos.sh +++ b/generate-protos.sh @@ -3,7 +3,13 @@ ( cd tools/ go build -o bin/protoc-gen-go google.golang.org/protobuf/cmd/protoc-gen-go - go build -o bin/buf github.com/bufbuild/buf/cmd/buf + go build -o bin/protoc-gen-go-grpc google.golang.org/grpc/cmd/protoc-gen-go-grpc ) -tools/bin/buf protoc --go_out=bridge/pkg/ proto/**/**/** --plugin tools/bin/protoc-gen-go +tools/bin/buf protoc \ + --plugin tools/bin/protoc-gen-go \ + --go_out=bridge/pkg/ proto/**/**/** + +tools/bin/buf protoc \ + --plugin tools/bin/protoc-gen-go-grpc \ + --go-grpc_out=bridge/pkg/ proto/**/**/** diff --git a/tools/go.mod b/tools/go.mod index f76dcd41b..df11d264e 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -4,5 +4,6 @@ go 1.14 require ( github.com/bufbuild/buf v0.20.5 + google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200819190100-f640ae6a4f43 google.golang.org/protobuf v1.25.0 ) diff --git a/tools/go.sum b/tools/go.sum index f52e8afdb..afaefae65 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -369,6 +369,8 @@ google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200819190100-f640ae6a4f43 h1:314ZjuNAmZQpftg27u97fEVXJS2xj7nCdeQNuGJ3mW4= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200819190100-f640ae6a4f43/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/tools/tools.go b/tools/tools.go index 46f730dc6..cd367598c 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -5,5 +5,6 @@ package tools //noinspection ALL import ( _ "google.golang.org/protobuf/cmd/protoc-gen-go" + _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc" _ "github.com/bufbuild/buf/cmd/buf" )