Skip to content

Commit 49b642f

Browse files
committed
fix: compile protos with original names
1 parent 23b07af commit 49b642f

File tree

1 file changed

+27
-10
lines changed

1 file changed

+27
-10
lines changed

lib/sidecar/grpc/generators/reflection_server_generator.ex

+27-10
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,42 @@ defmodule Sidecar.Grpc.Generators.ReflectionServerGenerator do
3535
end
3636

3737
@impl true
38-
def generate(ctx, %Google.Protobuf.FileDescriptorProto{service: svcs} = _desc) do
38+
def generate(ctx, %Google.Protobuf.FileDescriptorProto{name: name, service: svcs} = _desc) do
3939
current_services = :persistent_term.get(:grpc_reflection_services, [])
4040

41-
services = do_generate(ctx, svcs, current_services)
41+
{_name,
42+
[
43+
services: services
44+
]} = result = do_generate(ctx, name, svcs, current_services)
4245

4346
:persistent_term.put(:grpc_reflection_services, services)
4447

45-
{List.first(services),
48+
result
49+
end
50+
51+
defp do_generate(_ctx, name, nil, current_services) do
52+
{name,
4653
[
47-
services: services
54+
services: current_services
55+
]}
56+
end
57+
58+
defp do_generate(_ctx, name, [], current_services) do
59+
{name,
60+
[
61+
services: current_services
4862
]}
4963
end
5064

51-
defp do_generate(_ctx, nil, current_services), do: current_services
52-
defp do_generate(_ctx, [], current_services), do: current_services
65+
defp do_generate(ctx, _name, svcs, current_services) do
66+
services =
67+
svcs
68+
|> Enum.map(fn svc -> Util.mod_name(ctx, [Macro.camelize(svc.name)]) end)
69+
|> Kernel.++(current_services)
5370

54-
defp do_generate(ctx, svcs, current_services) do
55-
svcs
56-
|> Enum.map(fn svc -> Util.mod_name(ctx, [Macro.camelize(svc.name)]) end)
57-
|> Kernel.++(current_services)
71+
{List.first(services),
72+
[
73+
services: services
74+
]}
5875
end
5976
end

0 commit comments

Comments
 (0)