revert grpc-gateway to genrule

Author: pcj

bzl/base/class.bzl

@@ -138,6 +138,12 @@ def build_protoc_command(lang, self):
     self["cmd"] += ["$(location " + proto + ")" for proto in self["protos"]]
 
 
+def build_inputs(lang, self):
+    """Build a list of inputs to the ctx.action protoc"""
+    #self["inputs"] += self["srcs"]
+    self["requires"] += self["srcs"]
+
+
 def build_tools(lang, self):
     """Build a list of tools required for genrule execution"""
 
@@ -181,6 +187,7 @@ CLASS = struct(
     build_generated_files = build_generated_files,
     build_generated_filenames = build_generated_filenames,
     build_imports = build_imports,
+    build_inputs = build_inputs,
     build_tools = build_tools,
     build_protobuf_invocation = build_protobuf_invocation,
     build_protobuf_out = build_protobuf_out,

bzl/grpc_gateway/class.bzl

@@ -3,11 +3,6 @@ load("//bzl:go/class.bzl", GO = "CLASS")
 load("//bzl:util.bzl", "invokesuper")
 
 
-def build_protobuf_out(lang, self):
-    """Build the --{lang}_out option"""
-    build_plugin_out(lang.name, "protobuf", lang, self)
-
-
 def build_imports(lang, self):
     invokesuper("build_imports", lang, self)
     self["imports"] += [
@@ -16,6 +11,12 @@ def build_imports(lang, self):
         ".",
     ]
 
+def build_inputs(lang, self):
+    invokesuper("build_inputs", lang, self)
+    self["requires"] += [
+        "@com_github_grpc_ecosystem_grpc_gateway/third_party/googleapis",
+    ]
+
 def build_grpc_out(lang, self):
     opts = self.get("gateway_plugin_options", [])
     opts += ["logtostderr=true"]
@@ -64,4 +65,5 @@ CLASS = struct(
         build_protobuf_out = GO.build_protobuf_out,
         build_grpc_out = build_grpc_out,
         build_imports = build_imports,
+        build_inputs = build_inputs,
 )

bzl/grpc_gateway/rules.bzl

@@ -1,87 +1,88 @@
-load("//bzl:protoc.bzl", "EXECUTABLE", "implement")
+load("//bzl:protoc.bzl", "EXECUTABLE", "implement", "protoc_genrule")
 load("//bzl:grpc_gateway/class.bzl", GRPC_GATEWAY = "CLASS")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
-grpc_gateway_proto_compile = implement(["go", "gateway"])
+grpc_gateway_proto_compile = implement(["gateway"])
 
 def grpc_gateway_proto_library(
     name,
     protos,
-    copy_protos_to_genfiles = True,
-    deps = [],
-    grpc_plugin = None,
-    grpc_plugin_options = [],
-    imports = [],
     lang = GRPC_GATEWAY,
-    proto_compile = grpc_gateway_proto_compile,
-    protobuf_plugin_options = [],
-    protobuf_plugin = None,
-    protoc = EXECUTABLE,
     srcs = [],
-    verbose = 0,
+    imports = [],
     visibility = None,
+    testonly = 0,
+    protoc = None,
+    protobuf_plugin = None,
+    verbose = 0,
     **kwargs):
 
-  args = {}
-  args["name"] = name + "_pb_gw"
-  args["copy_protos_to_genfiles"] = copy_protos_to_genfiles
-  args["deps"] = deps
-  args["imports"] = imports
-  args["gen_grpc_gateway"] = True
-  args["gen_protobuf_go_plugin"] = protobuf_plugin
-  args["gen_go_plugin_options"] = protobuf_plugin_options
-  #args["gen_grpc_" + lang.name + "_plugin"] = grpc_plugin
-  args["protoc"] = protoc
-  args["protos"] = protos
-  args["verbose"] = verbose
-  args["with_grpc"] = True
-
-  proto_compile(**args)
-
-  proto_deps = [str(Label(dep)) for dep in getattr(lang.grpc, "compile_deps", [])]
+  result = protoc_genrule(
+    spec = [lang],
+    name = name + "_pb_gw",
+    protos = protos,
+    protoc = protoc,
+    protobuf_plugin = protobuf_plugin,
+    visibility = visibility,
+    testonly = testonly,
+    imports = imports,
+    with_grpc = True,
+    verbose = verbose,
+  )
 
-  grpc_gateway_deps = list(set(deps + proto_deps))
+  deps = [str(Label(dep)) for dep in getattr(lang.grpc, "compile_deps", [])]
 
   go_library(
-     name = name,
-     srcs = srcs + [name + "_pb_gw"],
-     deps = grpc_gateway_deps,
-     **kwargs
+    name = name,
+    srcs = result.outs,
+    deps = deps,
+    **kwargs
   )
 
-# grpc_gateway_proto_compile = implement(["grpc_gateway"])
 
-# def grpc_gateway_proto_library(
+# Not working yet as a rule...
+#
+# def grpc_gateway_proto_library_rule(
 #     name,
 #     protos,
-#     lang = GRPC_GATEWAY,
-#     srcs = [],
+#     copy_protos_to_genfiles = True,
+#     deps = [],
+#     grpc_plugin = None,
+#     grpc_plugin_options = [],
 #     imports = [],
-#     visibility = None,
-#     testonly = 0,
-#     protoc = None,
+#     lang = GRPC_GATEWAY,
+#     proto_compile = grpc_gateway_proto_compile,
+#     protobuf_plugin_options = [],
 #     protobuf_plugin = None,
+#     protoc = EXECUTABLE,
+#     srcs = [],
 #     verbose = 0,
+#     visibility = None,
 #     **kwargs):
 
-#   result = protoc_genrule(
-#     spec = [lang],
-#     name = name + "_pb_gw",
-#     protos = protos,
-#     protoc = protoc,
-#     protobuf_plugin = protobuf_plugin,
-#     visibility = visibility,
-#     testonly = testonly,
-#     imports = imports,
-#     with_grpc = True,
-#     verbose = verbose,
-#   )
+#   args = {}
+#   args["name"] = name + "_pb_gw"
+#   args["copy_protos_to_genfiles"] = copy_protos_to_genfiles
+#   args["deps"] = deps
+#   args["imports"] = imports
+#   args["gen_grpc_gateway"] = True
+#   args["gen_protobuf_go_plugin"] = protobuf_plugin
+#   args["gen_go_plugin_options"] = protobuf_plugin_options
+#   #args["gen_grpc_" + lang.name + "_plugin"] = grpc_plugin
+#   args["protoc"] = protoc
+#   args["protos"] = protos
+#   args["verbose"] = verbose
+#   args["with_grpc"] = True
+
+#   proto_compile(**args)
+
+#   proto_deps = [str(Label(dep)) for dep in getattr(lang.grpc, "compile_deps", [])]
 
-#   deps = [str(Label(dep)) for dep in getattr(lang.grpc, "compile_deps", [])]
+#   grpc_gateway_deps = list(set(deps + proto_deps))
 
 #   go_library(
-#     name = name,
-#     srcs = result.outs,
-#     deps = deps,
-#     **kwargs
+#      name = name,
+#      srcs = srcs + [name + "_pb_gw"],
+#      deps = grpc_gateway_deps,
+#      **kwargs
 #   )

bzl/protoc.bzl

@@ -116,8 +116,6 @@ def _execute_rule(self):
   if ctx == None:
       fail("Bazel context required for rule execution")
 
-  self["requires"] += self["srcs"]
-
   srcfiles = []
   for src in self["srcs"]:
     srcfiles += [src.path]
@@ -190,7 +188,7 @@ def _protoc_rule_impl(ctx):
     #"descriptor_set_file": descriptor_set_file,
   }
 
-  # Propogate proto deps
+  # Propogate proto deps: TODO: this is completely untested.
   for dep in ctx.attr.deps:
     self["imports"] += dep.proto.imports
     self["requires"] += dep.proto.deps
@@ -211,12 +209,12 @@ def _protoc_rule_impl(ctx):
 
     invoke("build_generated_files", lang, self)
     invoke("build_imports", lang, self)
-    #invoke("build_tools", lang, self)
     invoke("build_protobuf_invocation", lang, self)
     invoke("build_protobuf_out", lang, self)
     if self["with_grpc"]:
       invoke("build_grpc_invocation", lang, self)
       invoke("build_grpc_out", lang, self)
+    invoke("build_inputs", lang, self)
 
   # Run protoc
   _execute_rule(self)

examples/helloworld/cpp/BUILD

@@ -5,6 +5,7 @@ load("//bzl:cpp/class.bzl", CPP = "CLASS")
 
 cc_test(
     name = "test",
+    size = "small",
     srcs = ["greeter_client_test.cc"],
     copts = ["-Iexternal/gtest/include"],
     deps = [