github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 17:37:20 +00:00
Code Issues Projects Releases Wiki Activity

protocol: use workdir during build

Browse Source 
Currently, the script searches for .proto files within $GOPATH/.
Consequently, modifications to a definition file in the current working
directory won't influence the output .pb.go if the directory is outside
of $GOPATH. For developers, it's more intuitive to alter the local
codebase than the version stored in $GOPATH.

With this modification, the generated .pb.go files will be relative to
the current working directory, removing the need to clone this project
under $GOPATH/src/github.com/kata-containers.

Signed-off-by: Beraldo Leal <bleal@redhat.com>
This commit is contained in:
Beraldo Leal
2023-09-08 11:25:19 -04:00
parent 711a7ed965
commit 87accaaecb
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/protocols/hack/update-generated-proto.sh
View File

@@ -47,8 +47,15 @@ show_usage() {
}
generate_go_sources() {
local cmd="protoc -I$GOPATH/src:$GOPATH/src/github.com/kata-containers/kata-containers/src/libs/protocols/protos \
--gogottrpc_out=plugins=ttrpc+fieldpath,\
local proto_file="$1"
local dir_path="${proto_file%/*}"
local file_name="${proto_file##*/}"
[ "$dir_path" == "$proto_file" ] && dir_path="."
local root_path=$(realpath ../)/libs/protocols/protos
local cmd="protoc -I$GOPATH/src:${root_path} \
--gogottrpc_out=plugins=ttrpc+fieldpath,paths=source_relative,\
import_path=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc,\
Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,\
Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\
@@ -59,8 +66,8 @@ Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,\
Mgoogle/rpc/status.proto=github.com/gogo/googleapis/google/rpc\
:$GOPATH/src \
$GOPATH/src/github.com/kata-containers/kata-containers/src/libs/protocols/protos/$1"
:$(realpath ../)/runtime/virtcontainers/pkg/agent/protocols/$dir_path \
${root_path}/$file_name"
echo $cmd
$cmd
@@ -72,7 +79,7 @@ if [ "$(basename $(pwd))" != "agent" ]; then
fi
# Protocol buffer files required to generate golang/rust bindings.
proto_files_list=(agent.proto csi.proto health.proto oci.proto types.proto)
proto_files_list=(grpc/agent.proto grpc/csi.proto grpc/health.proto grpc/oci.proto types.proto)
if [ "$1" = "" ]; then
show_usage "${proto_files_list[@]}"