Leo пре 5 година
родитељ
комит
59d6ece608
5 измењених фајлова са 13 додато и 3 уклоњено
  1. 1 1
      Tiltfile
  2. 8 2
      generate-protos.sh
  3. 1 0
      tools/go.mod
  4. 2 0
      tools/go.sum
  5. 1 0
      tools/tools.go

+ 1 - 1
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",
 )
 

+ 8 - 2
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/**/**/**

+ 1 - 0
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
 )

+ 2 - 0
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=

+ 1 - 0
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"
 )