Skip to content

Commit 4000299

Browse files
devbwwdevbww
authored
feat(spanner): revert generated admin APIs (#7242)
Revert #7183, #7184, and #7188 prior to the monthly release, as they implement a partially-complete but user-visible feature. This will avoid any confusion about the availability of the feature.
1 parent 5578612 commit 4000299

47 files changed

Lines changed: 4 additions & 7403 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ci/cloudbuild/builds/cmake-install.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ expected_dirs=(
6464
./include/google/cloud/logging/mocks
6565
./include/google/cloud/pubsub/internal
6666
./include/google/cloud/pubsub/mocks
67-
./include/google/cloud/spanner/admin/internal
68-
./include/google/cloud/spanner/admin/mocks
6967
./include/google/cloud/spanner/internal
7068
./include/google/cloud/spanner/mocks
7169
./include/google/cloud/speech/v1

‎ci/cloudbuild/builds/generate-libraries.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ find google/cloud -path google/cloud/bigtable -prune -o \
4343
-path google/cloud/grpc_utils -prune -o \
4444
-path google/cloud/internal -prune -o \
4545
-path google/cloud/pubsub -prune -o \
46+
-path google/cloud/spanner -prune -o \
4647
-path google/cloud/storage -prune -o \
4748
-path google/cloud/testing_util -prune -o \
4849
\( -name '*.cc' -o -name '*.h' \) -exec clang-format -i {} \;

‎generator/generator_config.textproto‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,3 @@ service {
4141
product_path: "google/cloud/logging"
4242
initial_copyright_year: "2021"
4343
}
44-
45-
# Spanner
46-
service {
47-
service_proto_path: "google/spanner/admin/database/v1/spanner_database_admin.proto"
48-
product_path: "google/cloud/spanner/admin"
49-
initial_copyright_year: "2021"
50-
service_endpoint_env_var: "GOOGLE_CLOUD_CPP_SPANNER_DEFAULT_ENDPOINT"
51-
emulator_endpoint_env_var: "SPANNER_EMULATOR_HOST"
52-
}
53-
54-
service {
55-
service_proto_path: "google/spanner/admin/instance/v1/spanner_instance_admin.proto"
56-
product_path: "google/cloud/spanner/admin"
57-
initial_copyright_year: "2021"
58-
service_endpoint_env_var: "GOOGLE_CLOUD_CPP_SPANNER_DEFAULT_ENDPOINT"
59-
emulator_endpoint_env_var: "SPANNER_EMULATOR_HOST"
60-
}

‎google/cloud/spanner/CMakeLists.txt‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,6 @@ include(GoogleCloudCppCommon)
3434

3535
add_library(
3636
google_cloud_cpp_spanner # cmake-format: sort
37-
admin/database_admin_client.cc
38-
admin/database_admin_client.h
39-
admin/database_admin_connection.cc
40-
admin/database_admin_connection.h
41-
admin/database_admin_connection_idempotency_policy.cc
42-
admin/database_admin_connection_idempotency_policy.h
43-
admin/database_admin_options.h
44-
admin/instance_admin_client.cc
45-
admin/instance_admin_client.h
46-
admin/instance_admin_connection.cc
47-
admin/instance_admin_connection.h
48-
admin/instance_admin_connection_idempotency_policy.cc
49-
admin/instance_admin_connection_idempotency_policy.h
50-
admin/instance_admin_options.h
51-
admin/internal/database_admin_auth_decorator.cc
52-
admin/internal/database_admin_auth_decorator.h
53-
admin/internal/database_admin_logging_decorator.cc
54-
admin/internal/database_admin_logging_decorator.h
55-
admin/internal/database_admin_metadata_decorator.cc
56-
admin/internal/database_admin_metadata_decorator.h
57-
admin/internal/database_admin_option_defaults.cc
58-
admin/internal/database_admin_option_defaults.h
59-
admin/internal/database_admin_stub.cc
60-
admin/internal/database_admin_stub.h
61-
admin/internal/database_admin_stub_factory.cc
62-
admin/internal/database_admin_stub_factory.h
63-
admin/internal/instance_admin_auth_decorator.cc
64-
admin/internal/instance_admin_auth_decorator.h
65-
admin/internal/instance_admin_logging_decorator.cc
66-
admin/internal/instance_admin_logging_decorator.h
67-
admin/internal/instance_admin_metadata_decorator.cc
68-
admin/internal/instance_admin_metadata_decorator.h
69-
admin/internal/instance_admin_option_defaults.cc
70-
admin/internal/instance_admin_option_defaults.h
71-
admin/internal/instance_admin_stub.cc
72-
admin/internal/instance_admin_stub.h
73-
admin/internal/instance_admin_stub_factory.cc
74-
admin/internal/instance_admin_stub_factory.h
75-
admin/retry_traits.h
7637
backoff_policy.h
7738
backup.cc
7839
backup.h
@@ -222,12 +183,9 @@ create_bazel_config(google_cloud_cpp_spanner YEAR "2019")
222183
add_library(google_cloud_cpp_spanner_mocks INTERFACE)
223184
target_sources(
224185
google_cloud_cpp_spanner_mocks
225-
INTERFACE
226-
${CMAKE_CURRENT_SOURCE_DIR}/admin/mocks/mock_database_admin_connection.h
227-
${CMAKE_CURRENT_SOURCE_DIR}/admin/mocks/mock_instance_admin_connection.h
228-
${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_database_admin_connection.h
229-
${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_instance_admin_connection.h
230-
${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_spanner_connection.h)
186+
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_database_admin_connection.h
187+
${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_instance_admin_connection.h
188+
${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_spanner_connection.h)
231189
target_link_libraries(
232190
google_cloud_cpp_spanner_mocks
233191
INTERFACE google-cloud-cpp::spanner GTest::gmock_main GTest::gmock

‎google/cloud/spanner/admin/database_admin_client.cc‎

Lines changed: 0 additions & 276 deletions
This file was deleted.

0 commit comments

Comments
 (0)