code generator only needing one protos path

Author: eliasdarruda

lib/actors/config/persistent_term_config.ex

@@ -33,7 +33,6 @@ if Code.ensure_loaded?(:persistent_term) do
       {:grpc_http_transcoding_enabled, "true"},
       # default values are evaluated at runtime.
       {:grpc_compiled_modules_path, :runtime},
-      {:grpc_actors_protos_path, :runtime},
       {:grpc_include_protos_path, :runtime},
       {:internal_nats_hosts, "nats://127.0.0.1:4222"},
       {:internal_nats_tls, "false"},
@@ -271,15 +270,6 @@ if Code.ensure_loaded?(:persistent_term) do
       value
     end
 
-    defp load_env({:grpc_actors_protos_path, :runtime}) do
-      default_value = "#{File.cwd!()}/priv/protos/actors"
-
-      value = env("PROXY_GRPC_ACTORS_PROTOS_PATH", default_value)
-      :persistent_term.put({__MODULE__, :grpc_actors_protos_path}, value)
-
-      value
-    end
-
     defp load_env({:grpc_include_protos_path, :runtime}) do
       default_value = "#{File.cwd!()}/priv/protos"
 

lib/sidecar/grpc/code_generator.ex

@@ -37,7 +37,6 @@ defmodule Sidecar.GRPC.CodeGenerator do
   def compile_protos(opts \\ []) do
     Logger.debug("Compiling ActorHost Protocol Buffers...")
 
-    actors_path = Keyword.get(opts, :protos_path, Config.get(:grpc_actors_protos_path))
     include_path = Keyword.get(opts, :protos_path, Config.get(:grpc_include_protos_path))
     output_path = Keyword.get(opts, :output_path, Config.get(:grpc_compiled_modules_path))
 
@@ -52,13 +51,8 @@ defmodule Sidecar.GRPC.CodeGenerator do
         {ProtobufGenerate.Plugins.GRPC, Sidecar.GRPC.Generators.HandlerGenerator}
       end
 
-    user_defined_proto_files_list = list_files_with_full_path_by_extensions(actors_path, ".proto")
     include_files_path = list_files_with_full_path_by_extensions(include_path, ".proto")
 
-    Logger.info(
-      "Found #{length(user_defined_proto_files_list)} ActorHost Protocol Buffers to compile... (#{inspect(user_defined_proto_files_list)})"
-    )
-
     invoker_helper =
       if Code.ensure_loaded?(SpawnSdk) do
         ["--plugin=Sidecar.GRPC.Generators.ActorInvoker"]
@@ -68,7 +62,7 @@ defmodule Sidecar.GRPC.CodeGenerator do
 
     spawn_protos_dir = Application.app_dir(:spawn, "priv/protos")
 
-    if length(user_defined_proto_files_list) > 0 do
+    if Enum.count(include_files_path) > 0 do
       protoc_options =
         [
           "--include-path=#{include_path}",
@@ -80,19 +74,8 @@ defmodule Sidecar.GRPC.CodeGenerator do
           "--plugin=#{handler_generator_plugin}",
           "--plugin=Sidecar.GRPC.Generators.GeneratorAccumulator"
         ] ++
-          invoker_helper ++
-          user_defined_proto_files_list
-
-      include_files_options =
-        [
-          "--include-path=#{include_path}",
-          "--include-path=#{spawn_protos_dir}",
-          "--generate-descriptors=true",
-          "--one-file-per-module",
-          "--output-path=#{output_path}"
-        ] ++ include_files_path
+          invoker_helper ++ include_files_path
 
-      _ = Generate.run(include_files_options)
       _ = Generate.run(protoc_options)
 
       :ok

lib/sidecar/grpc/generators/handler_transcoding_generator.ex

@@ -14,29 +14,29 @@ defmodule Sidecar.GRPC.Generators.HandlerTranscodingGenerator do
   @impl true
   def template do
     """
+    <%= if @render do %>
     defmodule <%= @module %>.ActorDispatcher do
-      <%= if @render do %>
-        use GRPC.Server, service: <%= @service_name %>.Service, http_transcode: true
-
-        alias Sidecar.GRPC.Dispatcher
-
-        <%= for {method_name, input, output, _options} <- @methods do %>
-          @spec <%= Macro.underscore(method_name) %>(<%= input %>.t(), GRPC.Server.Stream.t()) :: <%= output %>.t()
-          def <%= Macro.underscore(method_name) %>(message, stream) do
-            request = %{
-              system: <%= inspect(@actor_system) %>,
-              actor_name: <%= inspect(@actor_name) %>,
-              action_name: <%= inspect(method_name) %>,
-              input: message,
-              stream: stream,
-              descriptor: <%= @service_name %>.Service.descriptor()
-            }
-
-            Dispatcher.dispatch(request)
-          end
-        <% end %>
+      use GRPC.Server, service: <%= @service_name %>.Service, http_transcode: true
+
+      alias Sidecar.GRPC.Dispatcher
+
+      <%= for {method_name, input, output, _options} <- @methods do %>
+        @spec <%= Macro.underscore(method_name) %>(<%= input %>.t(), GRPC.Server.Stream.t()) :: <%= output %>.t()
+        def <%= Macro.underscore(method_name) %>(message, stream) do
+          request = %{
+            system: <%= inspect(@actor_system) %>,
+            actor_name: <%= inspect(@actor_name) %>,
+            action_name: <%= inspect(method_name) %>,
+            input: message,
+            stream: stream,
+            descriptor: <%= @service_name %>.Service.descriptor()
+          }
+
+          Dispatcher.dispatch(request)
+        end
       <% end %>
     end
+    <% end %>
     """
   end