fix(executor): Update proto compilation and package versions

Updates the `compile_seldon_proto` rule to place the updated protobuf in the correct location, along with correcting the package name and updating the grpc package version to work with newer versions of the proto compiler. Addresses #1663 Signed off by Nick Groszewski (<[email protected]>)
SeldonIO · Apr 10, 2020 · f319010 · f319010
1 parent 2e003dd
commit f319010
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 88 deletions.
diff --git a/executor/Makefile b/executor/Makefile
@@ -30,9 +30,10 @@ copy_protos:
 
 .PHONY: compile_seldon_proto
 compile_seldon_proto:
-	cp ../proto/prediction.proto api/grpc
-	cd api/grpc && protoc -I. -I${GOPATH}/src/github.com/tensorflow/tensorflow --go_out=paths=source_relative,plugins=grpc:. prediction.proto
-	rm api/grpc/prediction.proto
+	cp ../proto/prediction.proto api/grpc/seldon/proto
+	cd api/grpc/seldon/proto && protoc -I. -I${GOPATH}/src/github.com/tensorflow/tensorflow --go_out=paths=source_relative,plugins=grpc:. prediction.proto
+	sed -i "s/package api/package proto/" api/grpc/seldon/proto/prediction.pb.go
+	rm api/grpc/seldon/proto/prediction.proto
 
 # https://github.com/tensorflow/serving/issues/1365#issuecomment-525351995
 .PHONY: compile_tensorflow_proto

diff --git a/executor/api/grpc/seldon/proto/prediction.pb.go b/executor/api/grpc/seldon/proto/prediction.pb.go
diff --git a/executor/go.mod b/executor/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/uber/jaeger-client-go v2.21.1+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
-	google.golang.org/grpc v1.24.0
+	google.golang.org/grpc v1.27.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.17.2
 	k8s.io/apimachinery v0.17.2