Merge pull request ThreeDotsLabs#39 from Orphail/protoc-gen-go-grpc

Plugins are no longer supported by protoc-gen-go package
super-rain · Oct 9, 2021 · cd54b0f · cd54b0f
2 parents 9350df9 + 8023a0d
commit cd54b0f
Show file tree

Hide file tree

Showing 15 changed files with 1,068 additions and 571 deletions.
diff --git a/Makefile b/Makefile
@@ -40,8 +40,17 @@ openapi_js:
 
 .PHONY: proto
 proto:
-	protoc --go_out=plugins=grpc:internal/common/genproto/trainer -I api/protobuf api/protobuf/trainer.proto
-	protoc --go_out=plugins=grpc:internal/common/genproto/users -I api/protobuf api/protobuf/users.proto
+	protoc \
+		--proto_path=api/protobuf api/protobuf/trainer.proto \
+		--go_out=internal/common/genproto/trainer --go_opt=paths=source_relative \
+		--go-grpc_opt=require_unimplemented_servers=false \
+		--go-grpc_out=internal/common/genproto/trainer --go-grpc_opt=paths=source_relative \
+
+	protoc \
+		--proto_path=api/protobuf api/protobuf/users.proto \
+		--go_out=internal/common/genproto/users --go_opt=paths=source_relative \
+		--go-grpc_opt=require_unimplemented_servers=false \
+		--go-grpc_out=internal/common/genproto/users --go-grpc_opt=paths=source_relative \
 
 .PHONY: lint
 lint:

diff --git a/api/protobuf/trainer.proto b/api/protobuf/trainer.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package trainer;
 
+option go_package = "github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/trainer";
+
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 

diff --git a/api/protobuf/users.proto b/api/protobuf/users.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package users;
 
+option go_package = "github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/users";
+
 import "google/protobuf/empty.proto";
 
 service UsersService {