protodoc: Don't use aspect

Builds docs an order of magnitude faster, removes code

Signed-off-by: Ryan Northey <ryan@synca.io>

Author: phlax

.bazelrc

@@ -31,6 +31,8 @@ build --action_env=PATH --host_action_env=PATH
 build --enable_platform_specific_config
 build --test_summary=terse
 
+build --experimental_proto_descriptor_sets_include_source_info
+
 # Allow tags to influence execution requirements
 common --experimental_allow_tags_propagation
 

api/BUILD

@@ -1,6 +1,6 @@
 # DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_descriptor_set", "proto_library")
 
 licenses(["notice"])  # Apache 2
 
@@ -322,3 +322,12 @@ filegroup(
     ],
     visibility = ["//visibility:public"],
 )
+
+proto_descriptor_set(
+    name = "v3_proto_set",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":v3_protos",
+        ":xds_protos",
+    ],
+)

docs/BUILD

@@ -4,6 +4,7 @@ load(
 )
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
 load("@rules_pkg//pkg:pkg.bzl", "pkg_tar")
+load("//tools/base:envoy_python.bzl", "envoy_genparallel", "envoy_pkg_filter")
 
 licenses(["notice"])  # Apache 2
 
@@ -43,6 +44,33 @@ filegroup(
     srcs = glob(["root/**/*.pb"]),
 )
 
+envoy_genparallel(
+    name = "protos_rst",
+    srcs = [":proto_names"],
+    outs = ["protos_rst.tar"],
+    args = [
+        "$(location @com_google_protobuf//:protoc)",
+        "--descriptor_set_in=$$(realpath $(location @envoy_api//:v3_proto_set))",
+        "--plugin=protoc-gen-api_proto_plugin=$(location //tools/protodoc)",
+        "--api_proto_plugin_out=$$OUTDIR",
+    ],
+    tools = [
+        "//tools/protodoc",
+        "@com_google_protobuf//:protoc",
+        "@envoy_api//:v3_proto_set",
+    ],
+    verbosity = "warn",
+)
+
+envoy_pkg_filter(
+    name = "api_rst",
+    srcs = [":protos_rst"],
+    matching = "*.rst",
+    merge_paths = {"contrib/envoy/extensions": "api-v3"},
+    remap_paths = {"envoy": "api-v3"},
+    strip_empty = True,
+)
+
 genrule(
     name = "extensions_security_rst",
     srcs = [
@@ -85,42 +113,26 @@ genquery(
 )
 
 genrule(
-    name = "empty_protos_rst",
-    srcs = [":empty_extensions.json"],
-    outs = ["empty_protos_rst.tar"],
-    cmd = """
-    $(location //tools/protodoc:generate_empty) \\
-        $(location empty_extensions.json) $@
-    """,
-    tools = ["//tools/protodoc:generate_empty"],
-)
-
-genrule(
-    name = "api_rst",
+    name = "proto_names",
     srcs = [
-        "//tools/protodoc:api_v3_protodoc",
         ":v3_proto_srcs",
+        ":xds_proto_srcs",
     ],
-    outs = ["api_rst.tar"],
+    outs = ["proto_names.txt"],
     cmd = """
-    $(location //tools/docs:generate_api_rst) \\
-        $(location v3_proto_srcs) $(locations //tools/protodoc:api_v3_protodoc) $@
+    cat $(SRCS) | cut -d/ -f3- | tr ':' '/' > $@
     """,
-    tools = ["//tools/docs:generate_api_rst"],
 )
 
 genrule(
-    name = "xds_rst",
-    srcs = [
-        "//tools/protodoc:xds_protodoc",
-        ":xds_proto_srcs",
-    ],
-    outs = ["xds_rst.tar"],
+    name = "empty_protos_rst",
+    srcs = [":empty_extensions.json"],
+    outs = ["empty_protos_rst.tar"],
     cmd = """
-    $(location //tools/docs:generate_api_rst) \\
-        $(location xds_proto_srcs) $(locations //tools/protodoc:xds_protodoc) $@
+    $(location //tools/protodoc:generate_empty) \\
+        $(location empty_extensions.json) $@
     """,
-    tools = ["//tools/docs:generate_api_rst"],
+    tools = ["//tools/protodoc:generate_empty"],
 )
 
 pkg_files(
@@ -206,7 +218,6 @@ pkg_tar(
         ":extensions_security_rst",
         ":external_deps_rst",
         ":version_history_rst",
-        ":xds_rst",
     ],
 )
 

tools/base/BUILD

@@ -1,5 +1,3 @@
-load("@rules_python//python:defs.bzl", "py_binary")
-load("@base_pip3//:requirements.bzl", "requirement")
 load("//bazel:envoy_build_system.bzl", "envoy_package")
 load("//tools/base:envoy_python.bzl", "envoy_entry_point")
 

tools/base/envoy_python.bzl

@@ -298,7 +298,7 @@ def envoy_genparallel(name, args, srcs, outs, verbosity = "info", tools = [], pa
             $$PARALLEL_TARGETS \
         && tar cf $@ -C $$OUTDIR . \
         && rm -rf $$OUTDIR
-        """ % (parralel, verbosity, " ".join(args)),
+        """ % (parallel, verbosity, " ".join(args)),
         tools = [parallel] + tools,
     )
 
@@ -347,15 +347,15 @@ def envoy_pkg_filter(
     commands = []
     deletable = []
     if matching:
-        deletable.append('! -name "%s"' % matching)
+        deletable.append('-type f ! -name "%s"' % matching)
     if prune:
         deletable.append('-name "%s"' % prune)
     if strip_dirs:
         deletable.append("-type d -empty")
     if strip_files:
         deletable.append("-type f -empty")
     if deletable:
-        commands.append("find $$OUTDIR %s" % (" -o ".join("%s -delete" for d in deletable)))
+        commands.append("find $$OUTDIR %s" % (" -o ".join(["%s -delete" % d for d in deletable])))
     for src, target in remap_paths.items():
         commands.append("mv $$OUTDIR/%s $$OUTDIR/%s" % (src, target))
     for src, target in merge_paths.items():

tools/docs/BUILD

@@ -24,13 +24,6 @@ py_binary(
     data = ["//bazel:all_repository_locations"],
 )
 
-py_binary(
-    name = "generate_api_rst",
-    srcs = [
-        "generate_api_rst.py",
-    ],
-)
-
 # The upstream lib is maintained here:
 #
 #    https://github.com/envoyproxy/pytooling/tree/main/envoy.docs.sphinx_runner

tools/docs/generate_api_rst.py

@@ -1,7 +1,6 @@
 load("@rules_python//python:defs.bzl", "py_binary")
 load("@base_pip3//:requirements.bzl", "requirement")
 load("//bazel:envoy_build_system.bzl", "envoy_package", "envoy_proto_library")
-load("//tools/protodoc:protodoc.bzl", "protodoc_rule")
 load("//tools/base:envoy_python.bzl", "envoy_jinja_env", "envoy_py_data")
 
 licenses(["notice"])  # Apache 2
@@ -57,6 +56,11 @@ genrule(
     tools = [":manifest_to_json"],
 )
 
+envoy_py_data(
+    name = "manifest_db",
+    src = ":manifest.json",
+)
+
 py_binary(
     name = "protodoc",
     srcs = ["protodoc.py"],
@@ -65,11 +69,8 @@ py_binary(
         ":contrib_extensions_db",
         ":extensions_db",
         ":jinja",
-        ":manifest_proto_py_proto",
-        ":protodoc_manifest_untyped",
+        ":manifest_db",
         "//tools/api_proto_plugin",
-        # Added temporarily, as config_validation is no longer an immediate dep...
-        "@bazel_tools//tools/python/runfiles",
         "@com_envoyproxy_protoc_gen_validate//validate:validate_py",
         "@com_github_cncf_udpa//udpa/annotations:pkg_py_proto",
         "@com_github_cncf_udpa//xds/annotations/v3:pkg_py_proto",
@@ -79,16 +80,6 @@ py_binary(
     ],
 )
 
-protodoc_rule(
-    name = "api_v3_protodoc",
-    deps = ["@envoy_api//:v3_protos"],
-)
-
-protodoc_rule(
-    name = "xds_protodoc",
-    deps = ["@envoy_api//:xds_protos"],
-)
-
 py_library(
     name = "rst_filters",
     srcs = ["rst_filters.py"],