chore: update library generation for use with bzlmod (googleapis#16006)

Author: scotthart

MODULE.bazel

@@ -40,7 +40,7 @@ bazel_dep(name = "rules_apple", version = "4.3.2")
 bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
 
 bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_google_benchmark")
-bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp")
+bazel_dep(name = "yaml-cpp", version = "0.9.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp")
 bazel_dep(name = "pugixml", version = "1.15", dev_dependency = True, repo_name = "com_github_zeux_pugixml")
 
 # Pin this to fix a break in bazel/deps-cache.py

bazel/development0.bzl

@@ -69,8 +69,8 @@ def gl_cpp_development0(name = None):
         http_archive,
         name = "com_github_jbeder_yaml_cpp",
         urls = [
-            "https://github.com/jbeder/yaml-cpp/archive/0.8.0.tar.gz",
+            "https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.9.0.tar.gz",
         ],
-        sha256 = "fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16",
-        strip_prefix = "yaml-cpp-0.8.0",
+        sha256 = "25cb043240f828a8c51beb830569634bc7ac603978e0f69d6b63558dadefd49a",
+        strip_prefix = "yaml-cpp-yaml-cpp-0.9.0",
     )

ci/cloudbuild/builds/generate-libraries.sh

@@ -24,10 +24,8 @@ source module ci/lib/io.sh
 
 bazel_output_base="$(bazel info output_base)"
 
-# As we support both WORKSPACE and MODULE modes for bazel, we need to determine
-# the path to these dependencies dynamically.
-read -r protobuf_proto_path < <(find "${bazel_output_base}/external" -name "empty.proto" | sed -nE 's/(.+\/src)\/google\/protobuf\/empty.proto/\1/p')
-read -r googleapis_proto_path < <(find "${bazel_output_base}/external" -name "api-index-v1.json" | sed -nE 's/(.+)\/api-index-v1.json/\1/p')
+protobuf_proto_path="${bazel_output_base}/external/protobuf+/src"
+googleapis_proto_path="${bazel_output_base}/external/googleapis+"
 
 if [ -z "${UPDATED_DISCOVERY_DOCUMENT}" ]; then
   io::log_h2 "Removing previously generated golden files"

ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile

@@ -40,7 +40,7 @@ RUN dnf makecache && dnf install -y "dnf-command(debuginfo-install)"
 RUN dnf makecache && dnf debuginfo-install -y libstdc++
 
 # These are used by the docfx tool.
-RUN dnf makecache && dnf install -y pugixml-devel yaml-cpp-devel
+RUN dnf makecache && dnf install -y pugixml-devel
 
 RUN dnf install -y valgrind
 
@@ -50,6 +50,18 @@ RUN dnf install -y valgrind
 # the container's /etc/passwd file.
 RUN echo "root:cloudcxx" | chpasswd
 
+WORKDIR /var/tmp/build/
+RUN curl -fsSL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.9.0.tar.gz | \
+    tar -xzf - --strip-components=1 && \
+    cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_STANDARD=17 \
+        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_TESTING=OFF \
+        -S . -B cmake-out -GNinja && \
+    cmake --build cmake-out --target install && \
+    ldconfig && cd /var/tmp && rm -fr build
+
 # Fedora's version of `pkg-config` (https://github.com/pkgconf/pkgconf) is slow
 # when handling `.pc` files with lots of `Requires:` deps.  This problem is
 # triggered by the Abseil `.pc` files, which we use (indirectly) when testing

ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile

@@ -33,8 +33,7 @@ RUN dnf makecache && \
         libcurl-devel \
         openssl-devel \
         protobuf-devel \
-        pugixml-devel \
-        yaml-cpp-devel
+        pugixml-devel
 
 # This is used in the `publish-docs` build
 RUN dnf makecache && dnf install -y libxslt
@@ -45,6 +44,18 @@ RUN dnf makecache && dnf install -y libxslt
 # the container's /etc/passwd file.
 RUN echo 'root:cloudcxx' | chpasswd
 
+WORKDIR /var/tmp/build/
+RUN curl -fsSL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.9.0.tar.gz | \
+    tar -xzf - --strip-components=1 && \
+    cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_STANDARD=17 \
+        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_TESTING=OFF \
+        -S . -B cmake-out -GNinja && \
+    cmake --build cmake-out --target install && \
+    ldconfig && cd /var/tmp && rm -fr build
+
 # We would prefer to say `dnf install -y doxygen`, but Fedora 40 ships with
 # Doxygen 1.10.0 and we need fixes that were released in Doxygen 1.11.0. Also,
 # we cannot use the binary, as it was built with clang support, which does not

doc/contributor/howto-guide-adding-generated-libraries.md

@@ -42,6 +42,7 @@ cases:
 
 ```shell
 bazelisk --batch query --noshow_progress --noshow_loading_progress \
+    --enable_workspace --noenable_bzlmod  --incompatible_disallow_empty_glob=no \
     "kind(cc_library, @com_google_googleapis//${subdir}/...)"
 ```
 
@@ -150,8 +151,8 @@ Then run the micro-generator to create the scaffold and the C++ sources:
 ```shell
 bazelisk run \
   //generator:google-cloud-cpp-codegen -- \
-  --protobuf_proto_path="${bazel_output_base}"/external/protobuf~/src \
-  --googleapis_proto_path="${bazel_output_base}"/external/googleapis~ \
+  --protobuf_proto_path="${bazel_output_base}"/external/protobuf+/src \
+  --googleapis_proto_path="${bazel_output_base}"/external/googleapis+ \
   --discovery_proto_path="${PWD}/protos" \
   --output_path="${PWD}" \
   --config_file="${PWD}/generator/generator_config.textproto" \

docfx/CMakeLists.txt

@@ -72,13 +72,11 @@ add_library(
     toc_entry.cc
     toc_entry.h
     yaml_context.cc
-    yaml_context.h
-    yaml_emit.cc
-    yaml_emit.h)
+    yaml_context.h)
 google_cloud_cpp_add_common_options(docfx)
 target_include_directories(docfx PUBLIC "${PROJECT_SOURCE_DIR}")
 target_compile_features(docfx PUBLIC cxx_std_17)
-target_link_libraries(docfx PUBLIC pugixml::pugixml yaml-cpp
+target_link_libraries(docfx PUBLIC pugixml::pugixml yaml-cpp::yaml-cpp
                                    nlohmann_json::nlohmann_json)
 create_bazel_config(docfx YEAR "2023")
 

docfx/docfx.bzl

@@ -35,7 +35,6 @@ docfx_hdrs = [
     "public_docs.h",
     "toc_entry.h",
     "yaml_context.h",
-    "yaml_emit.h",
 ]
 
 docfx_srcs = [
@@ -56,5 +55,4 @@ docfx_srcs = [
     "public_docs.cc",
     "toc_entry.cc",
     "yaml_context.cc",
-    "yaml_emit.cc",
 ]

docfx/doxygen2children.cc

@@ -14,7 +14,6 @@
 
 #include "docfx/doxygen2children.h"
 #include "docfx/public_docs.h"
-#include "docfx/yaml_emit.h"
 #include <iterator>
 #include <string_view>
 

docfx/doxygen2references.cc

@@ -15,7 +15,6 @@
 #include "docfx/doxygen2references.h"
 #include "docfx/node_name.h"
 #include "docfx/public_docs.h"
-#include "docfx/yaml_emit.h"
 #include <iterator>
 
 namespace docfx {