From 8685ee8671b261fe6fa3f236d6b80f25b3ddbbfb Mon Sep 17 00:00:00 2001 From: chua Date: Wed, 26 Jun 2024 03:31:15 +0000 Subject: [PATCH 1/3] add failing test --- modules/example_protos/BUILD.bazel | 2 +- modules/example_protos/greeter.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/example_protos/BUILD.bazel b/modules/example_protos/BUILD.bazel index 47cc499c..1476b6cb 100644 --- a/modules/example_protos/BUILD.bazel +++ b/modules/example_protos/BUILD.bazel @@ -29,7 +29,7 @@ proto_library( proto_library( name = "thing_proto", srcs = ["thing.proto"], - import_prefix = "examples/proto", + import_prefix = "examples/proto-dash", visibility = ["//visibility:public"], deps = [ "@protobuf//:any_proto", diff --git a/modules/example_protos/greeter.proto b/modules/example_protos/greeter.proto index adf02172..3811fb5c 100644 --- a/modules/example_protos/greeter.proto +++ b/modules/example_protos/greeter.proto @@ -23,7 +23,7 @@ option go_package = "github.com/rules-proto-grpc/rules_proto_grpc/examples/proto package greeter; import "google/protobuf/any.proto"; -import "examples/proto/thing.proto"; +import "examples/proto-dash/thing.proto"; // The greeting service definition. From 4d1b8534e7da38c91bf2322c9b1814a4db77a340 Mon Sep 17 00:00:00 2001 From: chua Date: Wed, 26 Jun 2024 03:35:44 +0000 Subject: [PATCH 2/3] fix missing python path conversion --- modules/python/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/python/BUILD.bazel b/modules/python/BUILD.bazel index a35dd0f2..1f05eba3 100644 --- a/modules/python/BUILD.bazel +++ b/modules/python/BUILD.bazel @@ -35,7 +35,7 @@ proto_plugin( proto_plugin( name = "grpclib_plugin", - outputs = ["{protopath}_grpc.py"], + outputs = ["{protopath|python}_grpc.py"], tool = "//grpclib:plugin", visibility = ["//visibility:public"], ) From 68ca6008aef8d8b5b1e80bf1f644bc2dfa1fdd2a Mon Sep 17 00:00:00 2001 From: chua Date: Wed, 26 Jun 2024 03:41:02 +0000 Subject: [PATCH 3/3] Revert "add failing test" This reverts commit 8685ee8671b261fe6fa3f236d6b80f25b3ddbbfb. --- modules/example_protos/BUILD.bazel | 2 +- modules/example_protos/greeter.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/example_protos/BUILD.bazel b/modules/example_protos/BUILD.bazel index 1476b6cb..47cc499c 100644 --- a/modules/example_protos/BUILD.bazel +++ b/modules/example_protos/BUILD.bazel @@ -29,7 +29,7 @@ proto_library( proto_library( name = "thing_proto", srcs = ["thing.proto"], - import_prefix = "examples/proto-dash", + import_prefix = "examples/proto", visibility = ["//visibility:public"], deps = [ "@protobuf//:any_proto", diff --git a/modules/example_protos/greeter.proto b/modules/example_protos/greeter.proto index 3811fb5c..adf02172 100644 --- a/modules/example_protos/greeter.proto +++ b/modules/example_protos/greeter.proto @@ -23,7 +23,7 @@ option go_package = "github.com/rules-proto-grpc/rules_proto_grpc/examples/proto package greeter; import "google/protobuf/any.proto"; -import "examples/proto-dash/thing.proto"; +import "examples/proto/thing.proto"; // The greeting service definition.