Merge pull request #349 from DataDog/vboulineau/import-path-vendor

Use canonical import path for jsonschema proto to allow external import
DataDog · Oct 9, 2024 · 74269ce · 74269ce
2 parents 08cc9ec + 3e7618a
commit 74269ce
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 108 deletions.
diff --git a/Rakefile b/Rakefile
@@ -113,7 +113,7 @@ BASH
       PATH=#{toolchain_bin_dir} #{protoc_binary} --proto_path=#{toolchain_include_dir}:. --go_out=$GOPATH/src proto/contlcycle/contlcycle.proto
 
       echo "Generating kubernetes autoscaling proto"
-      PATH=#{toolchain_bin_dir} #{protoc_binary} --proto_path=$GOPATH/src:#{toolchain_include_dir}:. --go_out=$GOPATH/src --jsonschema_out=type_names_with_no_package:jsonschema proto/autoscaling/kubernetes/autoscaling.proto
+      PATH=#{toolchain_bin_dir} #{protoc_binary} --proto_path=$GOPATH/src:#{toolchain_include_dir}:proto/deps:. --go_out=$GOPATH/src --jsonschema_out=type_names_with_no_package:jsonschema proto/autoscaling/kubernetes/autoscaling.proto
 
       echo "Generating contimage proto"
       PATH=#{toolchain_bin_dir}  #{protoc_binary} --proto_path=#{toolchain_include_dir}:. --go_out=$GOPATH/src proto/contimage/contimage.proto