cleanup(bazel): convert googleapis system includes to normal ones

bazel/googleapis.modules.patch

@@ -1,31 +1,5 @@
 diff --git a/BUILD.bazel b/BUILD.bazel
 index 95e4c12e5..a901fd573 100644
---- a/BUILD.bazel
-+++ b/BUILD.bazel
-@@ -1,3 +1,7 @@
-+package(default_visibility = ["//visibility:public"])
-+
-+licenses(["notice"])  # Apache 2.0
-+
- genrule(
-   name = "build_gen",
-   outs = ["build_gen.sh"],
-@@ -16,3 +20,15 @@ EOD
-     fi
-   """,
- )
-+
-+# This build file overlays on top of the BUILD files for the googleapis repo,
-+# and it adds a target that lets us include their header files using
-+# angle-brackets, thus treating their headers as system includes. This allows
-+# us to dial-up the warnings in our own code, without seeing compiler warnings
-+# from their headers, which we do not own.
-+cc_library(
-+    name = "googleapis_system_includes",
-+    includes = [
-+        ".",
-+    ],
-+)
 diff --git a/MODULE.bazel b/MODULE.bazel
 new file mode 100644
 index 000000000..169133e43

ci/cloudbuild/notifiers/alerts/function/function.cc

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <google/cloud/functions/cloud_event.h>
-#include <google/cloud/functions/function.h>
+#include "google/cloud/functions/function.h"
+#include "google/cloud/functions/cloud_event.h"
 #include <cppcodec/base64_rfc4648.hpp>
 #include <curl/curl.h>
 #include <fmt/core.h>

ci/cloudbuild/notifiers/logs/function/function.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "google/cloud/functions/cloud_event.h"
+#include "google/cloud/storage/client.h"
 #include "generate_svg_badge.h"
-#include <google/cloud/functions/cloud_event.h>
-#include <google/cloud/storage/client.h>
 #include <cppcodec/base64_rfc4648.hpp>
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>

doc/cpp-style-guide.md

@@ -52,7 +52,7 @@ example:
 #include "google/cloud/x/bar.h"
 #include "google/cloud/y/baz.h"
 #include <grpcpp/blorg.h>
-#include <google/bigtable/blah.h>
+#include "google/bigtable/blah.h"
 #include <map>
 #include <vector>
 #include <unistd.h>

docfx/doxygen2syntax_test.cc

@@ -414,7 +414,7 @@ TEST(Doxygen2SyntaxContent, Constructor) {
 
 TEST(Doxygen2SyntaxContent, Struct) {
   auto constexpr kExpected =
-      R"""(// Found in #include <google/cloud/async_operation.h>
+      R"""(// Found in #include "google/cloud/async_operation.h"
 struct google::cloud::AsyncTimerResult { ... };)""";
   pugi::xml_document doc;
   doc.load_string(kStructXml);
@@ -427,7 +427,7 @@ struct google::cloud::AsyncTimerResult { ... };)""";
 
 TEST(Doxygen2SyntaxContent, Class) {
   auto constexpr kExpected =
-      R"""(// Found in #include <google/cloud/status.h>
+      R"""(// Found in #include "google/cloud/status.h"
 class google::cloud::RuntimeStatusError { ... };)""";
   pugi::xml_document doc;
   doc.load_string(kClassXml);
@@ -455,7 +455,7 @@ TEST(Doxygen2SyntaxContent, TemplateClass) {
   </compounddef>)xml";
 
   auto constexpr kExpected =
-      R"""(// Found in #include <google/cloud/status_or.h>
+      R"""(// Found in #include "google/cloud/status_or.h"
 template <
     typename T>
 class google::cloud::StatusOr { ... };)""";
@@ -485,7 +485,7 @@ TEST(Doxygen2SyntaxContent, TemplateStruct) {
   </compounddef>)xml";
 
   auto constexpr kExpected =
-      R"""(// Found in #include <google/cloud/status_or.h>
+      R"""(// Found in #include "google/cloud/status_or.h"
 template <
     typename T>
 struct google::cloud::StatusOr { ... };)""";
@@ -826,7 +826,7 @@ TEST(Doxygen2SyntaxContent, FunctionException) {
 TEST(Doxygen2Syntax, Class) {
   auto constexpr kExpected = R"yml(syntax:
   contents: |
-    // Found in #include <google/cloud/status.h>
+    // Found in #include "google/cloud/status.h"
     class google::cloud::RuntimeStatusError { ... };
   source:
     id: google::cloud::RuntimeStatusError
@@ -854,7 +854,7 @@ TEST(Doxygen2Syntax, Class) {
 TEST(Doxygen2Syntax, Struct) {
   auto constexpr kExpected = R"yml(syntax:
   contents: |
-    // Found in #include <google/cloud/async_operation.h>
+    // Found in #include "google/cloud/async_operation.h"
     struct google::cloud::AsyncTimerResult { ... };
   source:
     id: google::cloud::AsyncTimerResult

docfx/doxygen2yaml_test.cc

@@ -822,7 +822,7 @@ TEST(Doxygen2Yaml, InheritSectionDefSummary) {
       - cpp
     syntax:
       contents: |
-        // Found in #include <google/cloud/status_or.h>
+        // Found in #include "google/cloud/status_or.h"
         template <
             typename T>
         class google::cloud::StatusOr { ... };
@@ -1130,7 +1130,7 @@ TEST(Doxygen2Yaml, Class) {
       - cpp
     syntax:
       contents: |
-        // Found in #include <google/cloud/status.h>
+        // Found in #include "google/cloud/status.h"
         class google::cloud::RuntimeStatusError { ... };
       source:
         id: google::cloud::RuntimeStatusError
@@ -1223,7 +1223,7 @@ TEST(Doxygen2Yaml, Struct) {
       - cpp
     syntax:
       contents: |
-        // Found in #include <google/cloud/log.h>
+        // Found in #include "google/cloud/log.h"
         struct google::cloud::LogRecord { ... };
       source:
         id: google::cloud::LogRecord

examples/batch_logging.cc

@@ -28,7 +28,7 @@
 #include "google/cloud/internal/time_utils.h"
 #include "google/cloud/testing_util/example_driver.h"
 #include "absl/strings/match.h"
-#include <google/protobuf/text_format.h>
+#include "google/protobuf/text_format.h"
 #include <fstream>
 #include <iostream>
 #include <random>

examples/hello_world_http/hello_world_http.cc

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <google/cloud/functions/http_request.h>
-#include <google/cloud/functions/http_response.h>
+#include "google/cloud/functions/http_request.h"
+#include "google/cloud/functions/http_response.h"
 
 namespace gcf = ::google::cloud::functions;
 

generator/BUILD.bazel

@@ -37,7 +37,6 @@ cc_library(
         "@com_github_nlohmann_json//:json",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
-        "@com_google_googleapis//:googleapis_system_includes",
         "@com_google_googleapis//google/api:client_cc_proto",
         "@com_google_googleapis//google/api:field_info_cc_proto",
         "@com_google_googleapis//google/api:routing_cc_proto",

generator/generator.cc

@@ -22,7 +22,7 @@
 #include "google/cloud/internal/filesystem.h"
 #include "google/cloud/status_or.h"
 #include "absl/strings/str_split.h"
-#include <google/api/client.pb.h>
+#include "google/api/client.pb.h"
 #include <future>
 #include <string>
 #include <vector>

generator/generator.h

@@ -15,8 +15,8 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_GENERATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_GENERATOR_H
 
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
+#include "google/protobuf/compiler/code_generator.h"
+#include "google/protobuf/descriptor.h"
 #include <string>
 
 namespace google {

generator/generator_test.cc

@@ -17,10 +17,10 @@
 #include "generator/testing/error_collectors.h"
 #include "generator/testing/fake_source_tree.h"
 #include "generator/testing/printer_mocks.h"
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/zero_copy_stream.h>
+#include "google/protobuf/compiler/importer.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/descriptor.pb.h"
+#include "google/protobuf/io/zero_copy_stream.h"
 #include <gmock/gmock.h>
 
 namespace google {

generator/integration_tests/golden/v1/golden_kitchen_sink_client.h

@@ -25,7 +25,7 @@
 #include "google/cloud/polling_policy.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
-#include <google/protobuf/duration.pb.h>
+#include "google/protobuf/duration.pb.h"
 #include <map>
 #include <memory>
 #include <string>

generator/integration_tests/golden/v1/golden_thing_admin_client.h

@@ -28,7 +28,7 @@
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
 #include "google/cloud/iam_updater.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <string>
 

generator/integration_tests/golden/v1/golden_thing_admin_connection.h

@@ -32,7 +32,7 @@
 #include "google/cloud/version.h"
 #include <generator/integration_tests/backup.pb.h>
 #include <generator/integration_tests/test.pb.h>
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 
 namespace google {

generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h

@@ -22,7 +22,7 @@
 #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <set>
 #include <string>

generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h

@@ -32,7 +32,7 @@
 #include "google/cloud/status_or.h"
 #include "google/cloud/stream_range.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 
 namespace google {

generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h

@@ -22,7 +22,7 @@
 #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <set>
 #include <string>

generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h

@@ -22,7 +22,7 @@
 #include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <map>
 #include <memory>
 #include <string>

generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_connection_impl.h

@@ -30,7 +30,7 @@
 #include "google/cloud/status_or.h"
 #include "google/cloud/stream_range.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.pb.h>
+#include "google/longrunning/operations.pb.h"
 #include <memory>
 
 namespace google {

generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h

@@ -25,7 +25,7 @@
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
 #include <generator/integration_tests/test.pb.h>
-#include <google/longrunning/operations.pb.h>
+#include "google/longrunning/operations.pb.h"
 #include <memory>
 #include <set>
 #include <string>

generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h

@@ -24,7 +24,7 @@
 #include "google/cloud/rest_options.h"
 #include "google/cloud/version.h"
 #include <generator/integration_tests/test.pb.h>
-#include <google/longrunning/operations.pb.h>
+#include "google/longrunning/operations.pb.h"
 #include <memory>
 #include <string>
 

generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc

@@ -22,7 +22,7 @@
 #include "google/cloud/internal/rest_stub_helpers.h"
 #include "google/cloud/status_or.h"
 #include <generator/integration_tests/test.pb.h>
-#include <google/longrunning/operations.pb.h>
+#include "google/longrunning/operations.pb.h"
 #include <memory>
 #include <utility>
 

generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h

@@ -26,7 +26,7 @@
 #include "google/cloud/version.h"
 #include <generator/integration_tests/backup.pb.h>
 #include <generator/integration_tests/test.pb.h>
-#include <google/longrunning/operations.pb.h>
+#include "google/longrunning/operations.pb.h"
 #include <memory>
 
 namespace google {

generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc

@@ -20,7 +20,7 @@
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
 #include <generator/integration_tests/test.grpc.pb.h>
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <utility>
 

generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h

@@ -26,7 +26,7 @@
 #include "google/cloud/version.h"
 #include <generator/integration_tests/backup.pb.h>
 #include <generator/integration_tests/test.grpc.pb.h>
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <utility>
 

generator/integration_tests/golden/v1/internal/request_id_auth_decorator.h

@@ -22,7 +22,7 @@
 #include "generator/integration_tests/golden/v1/internal/request_id_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <set>
 #include <string>

generator/integration_tests/golden/v1/internal/request_id_connection_impl.h

@@ -33,7 +33,7 @@
 #include "google/cloud/status_or.h"
 #include "google/cloud/stream_range.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 
 namespace google {

generator/integration_tests/golden/v1/internal/request_id_logging_decorator.h

@@ -22,7 +22,7 @@
 #include "generator/integration_tests/golden/v1/internal/request_id_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <set>
 #include <string>

generator/integration_tests/golden/v1/internal/request_id_metadata_decorator.h

@@ -22,7 +22,7 @@
 #include "generator/integration_tests/golden/v1/internal/request_id_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <map>
 #include <memory>
 #include <string>

generator/integration_tests/golden/v1/internal/request_id_stub.cc

@@ -20,7 +20,7 @@
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
 #include <generator/integration_tests/test_request_id.grpc.pb.h>
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <utility>
 

generator/integration_tests/golden/v1/internal/request_id_stub.h

@@ -25,7 +25,7 @@
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
 #include <generator/integration_tests/test_request_id.grpc.pb.h>
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <utility>
 

generator/integration_tests/golden/v1/request_id_client.h

@@ -26,7 +26,7 @@
 #include "google/cloud/polling_policy.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 #include <string>