cleanup(spanner): move test protos (#14586)

coryan · web-flow · commit b7b065aa1663 · 2024-07-30T00:04:31.000-04:00
diff --git a/google/cloud/spanner/BUILD.bazel b/google/cloud/spanner/BUILD.bazel
@@ -91,23 +91,6 @@ cc_library(
     ],
 )
 
-proto_library(
-    name = "singer_proto",
-    srcs = [
-        "testing/singer.proto",
-    ],
-    visibility = ["//:__pkg__"],
-)
-
-cc_proto_library(
-    name = "singer_cc_proto",
-    visibility = [
-        ":__subpackages__",
-        "//:__pkg__",
-    ],
-    deps = [":singer_proto"],
-)
-
 cc_library(
     name = "spanner_client_testing_private",
     testonly = True,
@@ -119,9 +102,10 @@ cc_library(
     deps = [
         ":google_cloud_cpp_spanner",
         ":google_cloud_cpp_spanner_mocks",
-        ":singer_cc_proto",
         "//:common",
         "//google/cloud/testing_util:google_cloud_cpp_testing_private",
+        "//protos:system_includes",
+        "//protos/google/cloud/spanner/testing:singer_cc_proto",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
@@ -146,12 +130,13 @@ cc_library(
     deps = [
         ":google_cloud_cpp_spanner",
         ":google_cloud_cpp_spanner_mocks",
-        ":singer_cc_proto",
         ":spanner_client_testing_private",
         "//:common",
         "//google/cloud:google_cloud_cpp_mocks",
         "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private",
         "//google/cloud/testing_util:google_cloud_cpp_testing_private",
+        "//protos:system_includes",
+        "//protos/google/cloud/spanner/testing:singer_cc_proto",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_googletest//:gtest_main",
     ],
diff --git a/google/cloud/spanner/CMakeLists.txt b/google/cloud/spanner/CMakeLists.txt
@@ -399,10 +399,6 @@ function (spanner_client_define_tests)
     # the GTest::gmock target, and the target names are also weird.
     find_package(GTest CONFIG REQUIRED)
 
-    google_cloud_cpp_proto_library(
-        spanner_client_testing_protos testing/singer.proto
-        PROTO_PATH_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR})
-
     add_library(
         spanner_client_testing # cmake-format: sort
         testing/cleanup_stale_databases.cc
@@ -435,7 +431,7 @@ function (spanner_client_define_tests)
     target_link_libraries(
         spanner_client_testing
         PUBLIC google_cloud_cpp_testing
-               spanner_client_testing_protos
+               google_cloud_cpp_spanner_client_testing_protos
                google-cloud-cpp::spanner_mocks
                google-cloud-cpp::spanner
                GTest::gmock_main
diff --git a/google/cloud/spanner/integration_tests/BUILD.bazel b/google/cloud/spanner/integration_tests/BUILD.bazel
@@ -29,10 +29,11 @@ licenses(["notice"])  # Apache 2.0
         "//:common",
         "//:spanner",
         "//:spanner_mocks",
-        "//google/cloud/spanner:singer_cc_proto",
         "//google/cloud/spanner:spanner_client_testing_private",
         "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private",
         "//google/cloud/testing_util:google_cloud_cpp_testing_private",
+        "//protos:system_includes",
+        "//protos/google/cloud/spanner/testing:singer_cc_proto",
         "@com_google_googletest//:gtest_main",
     ],
 ) for test in spanner_client_integration_tests]
diff --git a/google/cloud/spanner/integration_tests/data_types_integration_test.cc b/google/cloud/spanner/integration_tests/data_types_integration_test.cc
@@ -17,10 +17,10 @@
 #include "google/cloud/spanner/database.h"
 #include "google/cloud/spanner/mutations.h"
 #include "google/cloud/spanner/testing/database_integration_test.h"
-#include "google/cloud/spanner/testing/singer.pb.h"
 #include "google/cloud/spanner/timestamp.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include "absl/time/time.h"
+#include <google/cloud/spanner/testing/singer.pb.h>
 #include <gmock/gmock.h>
 #include <cstdint>
 #include <string>
diff --git a/google/cloud/spanner/proto_enum_test.cc b/google/cloud/spanner/proto_enum_test.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "google/cloud/spanner/proto_enum.h"
-#include "google/cloud/spanner/testing/singer.pb.h"
+#include <google/cloud/spanner/testing/singer.pb.h>
 #include <gmock/gmock.h>
 #include <sstream>
 #include <string>
diff --git a/google/cloud/spanner/proto_message_test.cc b/google/cloud/spanner/proto_message_test.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "google/cloud/spanner/proto_message.h"
-#include "google/cloud/spanner/testing/singer.pb.h"
 #include "google/cloud/testing_util/is_proto_equal.h"
+#include <google/cloud/spanner/testing/singer.pb.h>
 #include <gmock/gmock.h>
 #include <sstream>
 
diff --git a/google/cloud/spanner/samples/BUILD.bazel b/google/cloud/spanner/samples/BUILD.bazel
@@ -31,9 +31,10 @@ licenses(["notice"])  # Apache 2.0
     deps = [
         "//:common",
         "//:spanner",
-        "//google/cloud/spanner:singer_cc_proto",
         "//google/cloud/spanner:spanner_client_testing_private",
         "//google/cloud/testing_util:google_cloud_cpp_testing_private",
+        "//protos:system_includes",
+        "//protos/google/cloud/spanner/testing:singer_cc_proto",
     ],
 ) for test in spanner_client_integration_samples]
 
diff --git a/google/cloud/spanner/samples/samples.cc b/google/cloud/spanner/samples/samples.cc
@@ -30,7 +30,6 @@
 #include "google/cloud/spanner/testing/random_backup_name.h"
 #include "google/cloud/spanner/testing/random_database_name.h"
 #include "google/cloud/spanner/testing/random_instance_name.h"
-#include "google/cloud/spanner/testing/singer.pb.h"
 #include "google/cloud/spanner/update_instance_request_builder.h"
 #include "google/cloud/internal/getenv.h"
 #include "google/cloud/internal/random.h"
@@ -42,6 +41,7 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
+#include <google/cloud/spanner/testing/singer.pb.h>
 #include <chrono>
 #include <iomanip>
 #include <iterator>
diff --git a/google/cloud/spanner/testing/database_integration_test.cc b/google/cloud/spanner/testing/database_integration_test.cc
@@ -17,10 +17,10 @@
 #include "google/cloud/spanner/testing/cleanup_stale_databases.h"
 #include "google/cloud/spanner/testing/pick_random_instance.h"
 #include "google/cloud/spanner/testing/random_database_name.h"
-#include "google/cloud/spanner/testing/singer.pb.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/getenv.h"
 #include "google/cloud/testing_util/status_matchers.h"
+#include <google/cloud/spanner/testing/singer.pb.h>
 #include <chrono>
 #include <iostream>
 
diff --git a/google/cloud/spanner/value_test.cc b/google/cloud/spanner/value_test.cc
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 #include "google/cloud/spanner/value.h"
-#include "google/cloud/spanner/testing/singer.pb.h"
 #include "google/cloud/internal/base64_transforms.h"
 #include "google/cloud/testing_util/is_proto_equal.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
+#include <google/cloud/spanner/testing/singer.pb.h>
 #include <google/protobuf/text_format.h>
 #include <gmock/gmock.h>
 #include <cmath>
diff --git a/protos/BUILD.bazel b/protos/BUILD.bazel
@@ -21,6 +21,7 @@ cc_library(
     includes = ["."],
     visibility = [
         "//google/cloud/compute:__pkg__",
+        "//google/cloud/spanner:__subpackages__",
         "//google/cloud/storage/tests:__pkg__",
     ],
 )
diff --git a/protos/google/cloud/spanner/CMakeLists.txt b/protos/google/cloud/spanner/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+add_subdirectory(testing)
diff --git a/protos/google/cloud/spanner/testing/BUILD.bazel b/protos/google/cloud/spanner/testing/BUILD.bazel
@@ -0,0 +1,33 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+package(default_visibility = ["//visibility:private"])
+
+licenses(["notice"])  # Apache 2.0
+
+proto_library(
+    name = "singer_proto",
+    srcs = [
+        "singer.proto",
+    ],
+    visibility = ["//:__pkg__"],
+)
+
+cc_proto_library(
+    name = "singer_cc_proto",
+    visibility = [
+        "//google/cloud/spanner:__subpackages__",
+    ],
+    deps = [":singer_proto"],
+)
diff --git a/protos/google/cloud/spanner/testing/CMakeLists.txt b/protos/google/cloud/spanner/testing/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+if (NOT BUILD_TESTING)
+    return()
+endif ()
+
+include(GoogleCloudCppCommon)
+find_package(Protobuf CONFIG QUIET)
+if (NOT Protobuf_FOUND)
+    find_package(Protobuf REQUIRED)
+endif ()
+
+# Generate protobuf code and library
+if (COMMAND protobuf_generate)
+    set(protobuf_PROTOC_EXE ${Protobuf_PROTOC_EXECUTABLE})
+    add_library(google_cloud_cpp_spanner_client_testing_protos)
+    protobuf_generate(
+        LANGUAGE cpp TARGET google_cloud_cpp_spanner_client_testing_protos
+        PROTOS singer.proto)
+elseif (COMMAND protobuf_generate_cpp)
+    protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS singer.proto)
+    add_library(google_cloud_cpp_spanner_client_testing_protos ${PROTO_HDRS}
+                                                               ${PROTO_SRCS})
+else ()
+    message(FATAL_ERROR "Missing protobuf_generate_cpp and protobuf_generate")
+endif ()
+
+target_link_libraries(google_cloud_cpp_spanner_client_testing_protos
+                      PUBLIC protobuf::libprotobuf)
+target_include_directories(google_cloud_cpp_spanner_client_testing_protos SYSTEM
+                           PUBLIC "${PROJECT_BINARY_DIR}/protos")
+google_cloud_cpp_add_common_options(
+    google_cloud_cpp_spanner_client_testing_protos NO_WARNINGS)
+set_target_properties(google_cloud_cpp_spanner_client_testing_protos
+                      PROPERTIES CXX_CLANG_TIDY "")
diff --git a/protos/google/cloud/spanner/testing/singer.proto b/protos/google/cloud/spanner/testing/singer.proto
