- grpc_gateway moved to own folder.

- grpc_gateway functional and passing test.
- implementation of grpc_gateway_binary
- removal of old genrule related code.

Author: pcj

bzl/base/class.bzl

@@ -1,30 +1,29 @@
 def get_generated_filename_extensions(lang, self):
-
-    if not hasattr(lang, "protobuf"):
-        return
-
-    exts = getattr(lang.protobuf, "file_extensions", [])
-
-    with_grpc = self.get("with_grpc", False)
     ctx = self.get("ctx", None)
-    if ctx != None:
-        with_grpc = getattr(ctx.attr, "gen_grpc_" + lang.name, False)
+    with_grpc = self["with_grpc"]
+    exts = []
 
-    if with_grpc:
-        if not hasattr(lang, "grpc"):
-            fail("Language %s does not support gRPC" % lang.name)
-        exts += getattr(lang.grpc, "file_extensions", [])
+    if hasattr(lang, "protobuf"):
+        exts += getattr(lang.protobuf, "file_extensions", [])
+
+    if with_grpc or getattr(ctx.attr, "gen_grpc_" + lang.name, False):
+        if hasattr(lang, "grpc"):
+            exts += getattr(lang.grpc, "file_extensions", [])
 
     return exts
 
+
 def build_generated_files(lang, self):
     """Build a list of generated filenames (used by rule)"""
     exts = get_generated_filename_extensions(lang, self)
 
+    ctx = self.get("ctx", None)
+    if ctx.attr.verbose > 1:
+        print("generated_file extensions for language %s: %s" % (lang.name, exts))
+
     if not exts:
         return
 
-    ctx = self.get("ctx", None)
     if ctx == None:
         fail("build_generated_files can only be used in bazel context")
 
@@ -39,26 +38,12 @@ def build_generated_files(lang, self):
             self["provides"] += [pbfile]
 
 
-def build_generated_filenames(lang, self):
-    """Build a list of generated filenames (used by genrule)"""
-    exts = get_generated_filename_extensions(lang, self)
-
-    protos = self.get("protos", [])
-    if not protos:
-        fail("Empty proto filename input list.")
-
-    for srcfile in protos:
-        if not srcfile.endswith('.proto'):
-            fail("Non .proto source file: %s" % srcfile, "protos")
-        for ext in exts:
-            self["outs"] += [srcfile.rsplit('.', 1)[0] + ext]
-
-
 def build_imports(lang, self):
     """Build the list of imports"""
     ctx = self["ctx"]
     self["imports"] = self.get("imports", []) + ctx.attr.imports
 
+
 def build_plugin_out(name, key, lang, self):
     #print("build_plugin_out(%s, %s)" % (name, key))
     if not hasattr(lang, key):
@@ -142,30 +127,6 @@ def build_inputs(lang, self):
     self["requires"] += self["srcs"]
 
 
-def build_tools(lang, self):
-    """Build a list of tools required for genrule execution"""
-
-    self["tools"] += [self["protoc"]]
-
-    protobuf_plugin = self["protobuf_plugin"]
-    if not protobuf_plugin:
-        if hasattr(lang, "protobuf") and hasattr(lang.protobuf, "executable"):
-            protobuf_plugin = lang.protobuf.executable
-
-    if protobuf_plugin:
-        self["tools"] += [protobuf_plugin]
-
-    grpc_plugin = self["grpc_plugin"]
-    if self["with_grpc"] and not grpc_plugin:
-        if hasattr(lang, "grpc") and hasattr(lang.grpc, "executable"):
-            grpc_plugin = lang.grpc.executable
-
-    if grpc_plugin:
-        self["tools"] += [grpc_plugin]
-
-    #print("tools: %s" % self["tools"])
-
-
 def post_execute(lang, self):
     """No default post-execute actions"""
     pass
@@ -236,10 +197,8 @@ 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,
     build_grpc_out = build_grpc_out,

bzl/cpp/rules.bzl

@@ -1,4 +1,4 @@
-load("//bzl:protoc.bzl", "implement", "EXECUTABLE")
+load("//bzl:protoc.bzl", "implement", "PROTOC")
 load("//bzl:util.bzl", "invoke")
 load("//bzl:cpp/class.bzl", CPP = "CLASS")
 
@@ -15,7 +15,7 @@ def cc_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = cc_proto_compile,
-    protoc = EXECUTABLE,
+    protoc = PROTOC,
     srcs = [],
     verbose = 0,
     visibility = None,

bzl/go/rules.bzl

@@ -1,4 +1,4 @@
-load("//bzl:protoc.bzl", "implement", "EXECUTABLE")
+load("//bzl:protoc.bzl", "implement", "PROTOC")
 load("//bzl:go/class.bzl", GO = "CLASS")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
@@ -15,7 +15,7 @@ def go_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = go_proto_compile,
-    protoc = EXECUTABLE,
+    protoc = PROTOC,
     srcs = [],
     verbose = 0,
     visibility = None,

bzl/grpc_gateway/class.bzl

@@ -8,7 +8,6 @@ load("//bzl:util.bzl", "invokesuper")
 def implement_compile_attributes(lang, self):
     """Override attributes for the X_proto_compile rule"""
     GO.implement_compile_attributes(lang, self)
-    #invokesuper("implement_compile_attributes", lang, self)
 
     attrs = self["attrs"]
 
@@ -27,15 +26,17 @@ def implement_compile_attributes(lang, self):
     # TODO:-vmodule value: what does this mean?
 
     attrs["import_prefix"] = attr.string()
+    attrs["gateway_imports"] = attr.string_list(
+        default = lang.default_imports
+    )
 
 
 def build_imports(lang, self):
     invokesuper("build_imports", lang, self)
+    # TODO(this is hardcoded.  Make it configurable.)
+    ctx = self["ctx"]
+    self["imports"] += ctx.attr.gateway_imports
 
-    self["imports"] += [
-        "external/com_github_grpc_ecosystem_grpc_gateway/third_party/googleapis/",
-        "external/com_github_google_protobuf/src/",
-    ]
 
 def build_inputs(lang, self):
     invokesuper("build_inputs", lang, self)
@@ -82,12 +83,17 @@ CLASS = struct(
             "google/api/annotations.proto": "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api"
         },
 
+        default_imports = [
+            "external/com_github_grpc_ecosystem_grpc_gateway/third_party/googleapis/",
+            "external/com_github_google_protobuf/src/",
+        ],
+
         grpc = struct(
             name = 'protoc-gen-grpc-gateway',
             file_extensions = [".pb.gw.go"],
             executable = "@com_github_grpc_ecosystem_grpc_gateway//:protoc-gen-grpc-gateway_bin",
             default_options = GO.grpc.default_options,
-            requires = GO.grpc.requires + [
+            requires = [
                 "com_github_grpc_ecosystem_grpc_gateway",
             ],
             compile_deps = GO.grpc.compile_deps + [
@@ -99,9 +105,8 @@ CLASS = struct(
             ],
         ),
 
-        build_protobuf_out = build_protobuf_out,
         implement_compile_attributes = implement_compile_attributes,
-
+        build_protobuf_out = build_protobuf_out,
         build_grpc_out = build_grpc_out,
         build_imports = build_imports,
         build_inputs = build_inputs,

bzl/grpc_gateway/rules.bzl

@@ -1,11 +1,12 @@
-load("//bzl:protoc.bzl", "EXECUTABLE", "implement")
+load("//bzl:protoc.bzl", "PROTOC", "implement")
 load("//bzl:go/class.bzl", GO = "CLASS")
 load("//bzl:grpc_gateway/class.bzl", GATEWAY = "CLASS")
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_binary")
 
-gateway_proto_compile = implement([GATEWAY.name, GO.name])
+grpc_gateway_proto_compile = implement([GO.name, GATEWAY.name])
 
-def gateway_proto_library(
+
+def grpc_gateway_proto_library(
     name,
     copy_protos_to_genfiles = False,
     deps = [],
@@ -15,12 +16,13 @@ def gateway_proto_library(
     lang = GATEWAY,
     protobuf_plugin_options = [],
     protobuf_plugin = None,
-    proto_compile = gateway_proto_compile,
-    protoc = EXECUTABLE,
+    proto_compile = grpc_gateway_proto_compile,
+    protoc = PROTOC,
     srcs = [],
     verbose = 0,
     visibility = None,
     go_deps = [],
+    go_rule = go_library,
     go_srcs = [],
 
     logtostderr = True,
@@ -65,9 +67,24 @@ def gateway_proto_library(
   deps += [str(Label(dep)) for dep in lang.grpc.compile_deps]
   deps = list(set(deps + go_deps))
 
-  go_library(
+  go_rule(
      name = name,
      srcs = go_srcs + [name + ".pb"],
      deps = deps,
      **kwargs
   )
+
+
+def grpc_gateway_binary(name, protolib_name = "go_default_library", srcs = [], deps = [], protos = [], proto_deps = [], **kwargs):
+  grpc_gateway_proto_library(
+    name = protolib_name,
+    srcs = protos,
+    deps = proto_deps,
+     **kwargs
+  )
+
+  go_binary(
+     name = name,
+     srcs = srcs,
+     deps = deps + [protolib_name] + GATEWAY.grpc.compile_deps,
+  )

bzl/java/rules.bzl

@@ -1,4 +1,4 @@
-load("//bzl:protoc.bzl", "EXECUTABLE", "implement")
+load("//bzl:protoc.bzl", "PROTOC", "implement")
 load("//bzl:java/class.bzl", JAVA = "CLASS")
 
 java_proto_compile = implement([JAVA.name])
@@ -14,7 +14,7 @@ def java_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = java_proto_compile,
-    protoc = EXECUTABLE,
+    protoc = PROTOC,
     srcs = [],
     verbose = 0,
     visibility = None,

bzl/protoc.bzl

@@ -1,7 +1,7 @@
 load("//bzl:util.bzl", "invoke")
 load("//bzl:classes.bzl", "CLASSES")
 
-EXECUTABLE = Label("@com_github_google_protobuf//:protoc")
+PROTOC = Label("//external:protoc")
 
 def _get_gendir(ctx):
   if ctx.attr.output_to_genfiles:
@@ -24,13 +24,13 @@ def _execute_rule(self):
   outputs = list(set(self["provides"] + ctx.outputs.outs))
 
   if ctx.attr.verbose:
-    print("protoc binary: " + ctx.executable.protoc.path)
+    print("protoc executable: " + ctx.executable.protoc.path)
     for i in range(len(arguments)):
       print(" > arg%s: %s" % (i, arguments[i]))
-    for i in inputs:
-      print(" > input: %s" % i)
-    for o in outputs:
-      print(" > output: %s" % o)
+    for i in range(len(inputs)):
+      print(" > input%s: %s" % (i, inputs[i]))
+    for i in range(len(outputs)):
+      print(" > output%s: %s" % (i, outputs[i]))
 
   ctx.action(
       mnemonic="ProtoCompile",
@@ -73,6 +73,7 @@ def _build_source_files(ctx, self):
   # workspace root.
   self["imports"] += ["."]
 
+
 def _protoc_rule_impl(ctx):
 
   if ctx.attr.verbose: