From 9a476f6816593436441b0c86d52487551716c169 Mon Sep 17 00:00:00 2001
From: Carlos O'Ryan <coryan@google.com>
Date: Sat, 8 Jan 2022 16:39:11 -0500
Subject: [PATCH] feat(generator): use globs for geneated BUILD file (#7855)

This eliminates a step in generating new libraries.
---
 .../howto-guide-adding-generated-libraries.md | 28 ++++-----------
 generator/internal/scaffold_generator.cc      | 34 ++++++++++++-------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/doc/contributor/howto-guide-adding-generated-libraries.md b/doc/contributor/howto-guide-adding-generated-libraries.md
index 3ab08ad6d57b9..5de1807303825 100644
--- a/doc/contributor/howto-guide-adding-generated-libraries.md
+++ b/doc/contributor/howto-guide-adding-generated-libraries.md
@@ -129,6 +129,13 @@ git add "google/cloud/${library}"
 ci/cloudbuild/build.sh -t checkers-pr
 ```
 
+## Commit all the generated files
+
+```shell
+git add external ci "google/cloud/${library}"
+git commit -m"Run generators and format their outputs"
+```
+
 ## Create any custom source files
 
 If the `generator/generator_config.textproto` entry for the service does not
@@ -139,27 +146,6 @@ Likewise, for services using streaming operations you may need to implement the
 streaming `*Updater` function. Use `google/cloud/bigquery/streaming.cc` for
 inspiration.
 
-## Validate and Generate the `*.bzl` files
-
-Run the `cmake-install-pr` build.  This is one of the builds that compiles all
-the libraries, including the library you just added. It will also generate the
-`*.bzl` files for Bazel-based builds.
-
-> :warning: It **will** fail on this run, because the `quickstart.cc` file is
-> not ready. you will fix that after creating a commit with all the generated
-> changes.
-
-```shell
-ci/cloudbuild/build.sh -t cmake-install-pr
-```
-
-## Commit all the generated files
-
-```shell
-git add external ci "google/cloud/${library}"
-git commit -m"Run generators and format their outputs"
-```
-
 ## Update the quickstart
 
 The generated quickstart will need some editing. Use a simple operation, maybe
diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc
index 6d0776d2745f9..f27b3d5838071 100644
--- a/generator/internal/scaffold_generator.cc
+++ b/generator/internal/scaffold_generator.cc
@@ -345,12 +345,24 @@ package(default_visibility = ["//visibility:private"])
 
 licenses(["notice"])  # Apache 2.0
 
-load(":google_cloud_cpp_$library$.bzl", "google_cloud_cpp_$library$_hdrs", "google_cloud_cpp_$library$_srcs")
+SOURCE_GLOB = "**/*.cc"
+
+MOCK_SOURCE_GLOB = "mocks/*.cc"
+
+HEADER_GLOB = "**/*.h"
+
+MOCK_HEADER_GLOB = "mocks/*.h"
 
 cc_library(
     name = "google_cloud_cpp_$library$",
-    srcs = google_cloud_cpp_$library$_srcs,
-    hdrs = google_cloud_cpp_$library$_hdrs,
+    srcs = glob(
+        include=[SOURCE_GLOB],
+        exclude=[MOCK_SOURCE_GLOB],
+    ),
+    hdrs = glob(
+        include=[HEADER_GLOB],
+        exclude=[MOCK_HEADER_GLOB],
+    ),
     visibility = ["//:__pkg__"],
     deps = [
         "//google/cloud:google_cloud_cpp_common",
@@ -359,12 +371,14 @@ cc_library(
     ],
 )
 
-load(":google_cloud_cpp_$library$_mocks.bzl", "google_cloud_cpp_$library$_mocks_hdrs", "google_cloud_cpp_$library$_mocks_srcs")
-
 cc_library(
     name = "google_cloud_cpp_$library$_mocks",
-    srcs = google_cloud_cpp_$library$_mocks_srcs,
-    hdrs = google_cloud_cpp_$library$_mocks_hdrs,
+    srcs = glob(
+        include=[MOCK_SOURCE_GLOB],
+    ),
+    hdrs = glob(
+        include=[MOCK_HEADER_GLOB],
+    ),
     visibility = ["//:__pkg__"],
     deps = [
         ":google_cloud_cpp_$library$",
@@ -455,11 +469,6 @@ target_compile_options(google_cloud_cpp_$library$
 
 add_library(google-cloud-cpp::experimental-$library$ ALIAS google_cloud_cpp_$library$)
 
-# To avoid maintaining the list of files for the library, export them to a .bzl
-# file.
-include(CreateBazelConfig)
-create_bazel_config(google_cloud_cpp_$library$ YEAR "2021")
-
 # Create a header-only library for the mocks. We use a CMake `INTERFACE` library
 # for these, a regular library would not work on macOS (where the library needs
 # at least one .o file). Unfortunately INTERFACE libraries are a bit weird in
@@ -481,7 +490,6 @@ target_link_libraries(
 set_target_properties(
     google_cloud_cpp_$library$_mocks
     PROPERTIES EXPORT_NAME google-cloud-cpp::experimental-$library$_mocks)
-create_bazel_config(google_cloud_cpp_$library$_mocks YEAR "$copyright_year$")
 target_include_directories(
     google_cloud_cpp_$library$_mocks
     INTERFACE $$<BUILD_INTERFACE:$${PROJECT_SOURCE_DIR}>