From 00764bf0305724628b963f564f04bca0eed6039c Mon Sep 17 00:00:00 2001 From: Darren Bolduc Date: Fri, 16 Dec 2022 22:24:49 -0500 Subject: [PATCH] refactor: relocate golden files (#10454) --- ci/cloudbuild/builds/generate-libraries.sh | 6 +- generator/integration_tests/BUILD.bazel | 14 +- generator/integration_tests/CMakeLists.txt | 6 +- .../samples/golden_kitchen_sink_samples.cc | 59 -------- .../samples/golden_thing_admin_samples.cc | 59 -------- .../{ => v1}/golden_kitchen_sink_client.cc | 6 +- .../{ => v1}/golden_kitchen_sink_client.h | 12 +- .../golden_kitchen_sink_connection.cc | 20 +-- .../{ => v1}/golden_kitchen_sink_connection.h | 26 ++-- ...chen_sink_connection_idempotency_policy.cc | 6 +- ...tchen_sink_connection_idempotency_policy.h | 10 +- .../{ => v1}/golden_kitchen_sink_options.h | 14 +- .../{ => v1}/golden_thing_admin_client.cc | 8 +- .../{ => v1}/golden_thing_admin_client.h | 12 +- .../{ => v1}/golden_thing_admin_connection.cc | 20 +-- .../{ => v1}/golden_thing_admin_connection.h | 26 ++-- ...ing_admin_connection_idempotency_policy.cc | 6 +- ...hing_admin_connection_idempotency_policy.h | 10 +- .../{ => v1}/golden_thing_admin_options.h | 14 +- .../golden_kitchen_sink_auth_decorator.cc | 6 +- .../golden_kitchen_sink_auth_decorator.h | 12 +- .../golden_kitchen_sink_connection_impl.cc | 14 +- .../golden_kitchen_sink_connection_impl.h | 50 +++---- .../golden_kitchen_sink_logging_decorator.cc | 6 +- .../golden_kitchen_sink_logging_decorator.h | 12 +- .../golden_kitchen_sink_metadata_decorator.cc | 6 +- .../golden_kitchen_sink_metadata_decorator.h | 12 +- .../golden_kitchen_sink_option_defaults.cc | 26 ++-- .../golden_kitchen_sink_option_defaults.h | 10 +- ...den_kitchen_sink_rest_logging_decorator.cc | 6 +- ...lden_kitchen_sink_rest_logging_decorator.h | 12 +- ...en_kitchen_sink_rest_metadata_decorator.cc | 6 +- ...den_kitchen_sink_rest_metadata_decorator.h | 12 +- .../internal/golden_kitchen_sink_rest_stub.cc | 6 +- .../internal/golden_kitchen_sink_rest_stub.h | 10 +- .../golden_kitchen_sink_rest_stub_factory.cc | 12 +- .../golden_kitchen_sink_rest_stub_factory.h | 12 +- .../golden_kitchen_sink_retry_traits.h | 10 +- ...lden_kitchen_sink_round_robin_decorator.cc | 6 +- ...olden_kitchen_sink_round_robin_decorator.h | 12 +- .../internal/golden_kitchen_sink_stub.cc | 6 +- .../internal/golden_kitchen_sink_stub.h | 10 +- .../golden_kitchen_sink_stub_factory.cc | 14 +- .../golden_kitchen_sink_stub_factory.h | 12 +- .../golden_thing_admin_auth_decorator.cc | 6 +- .../golden_thing_admin_auth_decorator.h | 12 +- .../golden_thing_admin_connection_impl.cc | 18 +-- .../golden_thing_admin_connection_impl.h | 56 ++++---- .../golden_thing_admin_logging_decorator.cc | 6 +- .../golden_thing_admin_logging_decorator.h | 12 +- .../golden_thing_admin_metadata_decorator.cc | 6 +- .../golden_thing_admin_metadata_decorator.h | 12 +- .../golden_thing_admin_option_defaults.cc | 38 ++--- .../golden_thing_admin_option_defaults.h | 10 +- ...lden_thing_admin_rest_logging_decorator.cc | 6 +- ...olden_thing_admin_rest_logging_decorator.h | 12 +- ...den_thing_admin_rest_metadata_decorator.cc | 6 +- ...lden_thing_admin_rest_metadata_decorator.h | 12 +- .../internal/golden_thing_admin_rest_stub.cc | 6 +- .../internal/golden_thing_admin_rest_stub.h | 10 +- .../golden_thing_admin_rest_stub_factory.cc | 12 +- .../golden_thing_admin_rest_stub_factory.h | 12 +- .../golden_thing_admin_retry_traits.h | 10 +- ...olden_thing_admin_round_robin_decorator.cc | 6 +- ...golden_thing_admin_round_robin_decorator.h | 12 +- .../internal/golden_thing_admin_stub.cc | 6 +- .../internal/golden_thing_admin_stub.h | 10 +- .../golden_thing_admin_stub_factory.cc | 14 +- .../golden_thing_admin_stub_factory.h | 12 +- .../golden/{ => v1}/internal/streaming.cc | 8 +- .../mock_golden_kitchen_sink_connection.h | 14 +- .../mock_golden_thing_admin_connection.h | 14 +- .../golden_kitchen_sink_client_samples.cc | 12 +- .../golden_thing_admin_client_samples.cc | 12 +- .../integration_tests/golden_config.textproto | 2 +- ...golden_kitchen_sink_auth_decorator_test.cc | 8 +- .../tests/golden_kitchen_sink_client_test.cc | 35 +++-- .../golden_kitchen_sink_connection_test.cc | 35 ++--- ...en_kitchen_sink_idempotency_policy_test.cc | 12 +- ...den_kitchen_sink_logging_decorator_test.cc | 10 +- ...en_kitchen_sink_metadata_decorator_test.cc | 12 +- ...olden_kitchen_sink_option_defaults_test.cc | 6 +- ...itchen_sink_rest_logging_decorator_test.cc | 6 +- ...tchen_sink_rest_metadata_decorator_test.cc | 8 +- ...den_kitchen_sink_rest_stub_factory_test.cc | 6 +- .../golden_kitchen_sink_rest_stub_test.cc | 6 +- ...kitchen_sink_round_robin_decorator_test.cc | 6 +- .../golden_kitchen_sink_stub_factory_test.cc | 6 +- .../tests/golden_kitchen_sink_stub_test.cc | 6 +- .../golden_thing_admin_auth_decorator_test.cc | 6 +- .../tests/golden_thing_admin_client_test.cc | 134 +++++++++++------- .../golden_thing_admin_connection_test.cc | 33 ++--- ...den_thing_admin_idempotency_policy_test.cc | 12 +- ...lden_thing_admin_logging_decorator_test.cc | 6 +- ...den_thing_admin_metadata_decorator_test.cc | 8 +- ...golden_thing_admin_option_defaults_test.cc | 6 +- ...thing_admin_rest_logging_decorator_test.cc | 6 +- ...hing_admin_rest_metadata_decorator_test.cc | 8 +- ...lden_thing_admin_rest_stub_factory_test.cc | 6 +- .../golden_thing_admin_rest_stub_test.cc | 6 +- ..._thing_admin_round_robin_decorator_test.cc | 6 +- .../golden_thing_admin_stub_factory_test.cc | 6 +- .../tests/golden_thing_admin_stub_test.cc | 6 +- .../mock_golden_kitchen_sink_rest_stub.h | 6 +- .../tests/mock_golden_kitchen_sink_stub.h | 6 +- .../tests/mock_golden_thing_admin_rest_stub.h | 8 +- .../tests/mock_golden_thing_admin_stub.h | 8 +- .../integration_tests/tests/plumbing_test.cc | 30 ++-- 108 files changed, 705 insertions(+), 782 deletions(-) delete mode 100644 generator/integration_tests/golden/samples/golden_kitchen_sink_samples.cc delete mode 100644 generator/integration_tests/golden/samples/golden_thing_admin_samples.cc rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_client.cc (98%) rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_client.h (98%) rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_connection.cc (86%) rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_connection.h (83%) rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_connection_idempotency_policy.cc (95%) rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_connection_idempotency_policy.h (88%) rename generator/integration_tests/golden/{ => v1}/golden_kitchen_sink_options.h (81%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_client.cc (98%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_client.h (99%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_connection.cc (91%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_connection.h (87%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_connection_idempotency_policy.cc (97%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_connection_idempotency_policy.h (91%) rename generator/integration_tests/golden/{ => v1}/golden_thing_admin_options.h (83%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_auth_decorator.cc (97%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_auth_decorator.h (91%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_connection_impl.cc (93%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_connection_impl.h (65%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_logging_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_logging_decorator.h (90%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_metadata_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_metadata_decorator.h (90%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_option_defaults.cc (65%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_option_defaults.h (75%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_logging_decorator.cc (97%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_logging_decorator.h (88%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_metadata_decorator.cc (97%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_metadata_decorator.h (87%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_stub.cc (96%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_stub.h (93%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_stub_factory.cc (80%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_rest_stub_factory.h (71%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_retry_traits.h (79%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_round_robin_decorator.cc (96%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_round_robin_decorator.h (90%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_stub.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_stub.h (95%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_stub_factory.cc (81%) rename generator/integration_tests/golden/{ => v1}/internal/golden_kitchen_sink_stub_factory.h (74%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_auth_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_auth_decorator.h (93%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_connection_impl.cc (96%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_connection_impl.h (70%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_logging_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_logging_decorator.h (93%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_metadata_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_metadata_decorator.h (93%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_option_defaults.cc (57%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_option_defaults.h (75%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_logging_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_logging_decorator.h (92%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_metadata_decorator.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_metadata_decorator.h (92%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_stub.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_stub.h (96%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_stub_factory.cc (80%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_rest_stub_factory.h (72%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_retry_traits.h (79%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_round_robin_decorator.cc (97%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_round_robin_decorator.h (93%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_stub.cc (98%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_stub.h (97%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_stub_factory.cc (81%) rename generator/integration_tests/golden/{ => v1}/internal/golden_thing_admin_stub_factory.h (74%) rename generator/integration_tests/golden/{ => v1}/internal/streaming.cc (84%) rename generator/integration_tests/golden/{ => v1}/mocks/mock_golden_kitchen_sink_connection.h (87%) rename generator/integration_tests/golden/{ => v1}/mocks/mock_golden_thing_admin_connection.h (90%) rename generator/integration_tests/golden/{ => v1}/samples/golden_kitchen_sink_client_samples.cc (88%) rename generator/integration_tests/golden/{ => v1}/samples/golden_thing_admin_client_samples.cc (88%) diff --git a/ci/cloudbuild/builds/generate-libraries.sh b/ci/cloudbuild/builds/generate-libraries.sh index 7bd6967bd40c..bb765dc08328 100755 --- a/ci/cloudbuild/builds/generate-libraries.sh +++ b/ci/cloudbuild/builds/generate-libraries.sh @@ -53,9 +53,9 @@ if [ -z "${GENERATE_GOLDEN_ONLY}" ]; then else io::log_red "Only formatting generated golden code." git ls-files -z -- 'generator/integration_tests/golden/internal/*.h' \ - 'generator/integration_tests/golden/*.h' \ - 'generator/integration_tests/golden/internal/*.cc' \ - 'generator/integration_tests/golden/*.cc' | + 'generator/integration_tests/golden/v1/*.h' \ + 'generator/integration_tests/golden/v1/internal/*.cc' \ + 'generator/integration_tests/golden/v1/*.cc' | xargs -P "$(nproc)" -n 1 -0 clang-format -i fi diff --git a/generator/integration_tests/BUILD.bazel b/generator/integration_tests/BUILD.bazel index f6ea19392f4c..7ea7369d4261 100644 --- a/generator/integration_tests/BUILD.bazel +++ b/generator/integration_tests/BUILD.bazel @@ -65,17 +65,17 @@ cc_grpc_library( filegroup( name = "golden_srcs", srcs = glob([ - "golden/*.cc", - "golden/internal/*.cc", + "golden/v1/*.cc", + "golden/v1/internal/*.cc", ]), ) filegroup( name = "golden_hdrs", srcs = glob([ - "golden/*.h", - "golden/internal/*.h", - "golden/mocks/*.h", + "golden/v1/*.h", + "golden/v1/internal/*.h", + "golden/v1/mocks/*.h", ]), ) @@ -132,7 +132,7 @@ filegroup( ) for test in google_cloud_cpp_generator_golden_tests] [cc_test( - name = sample.replace(".cc", "").replace("_", "/"), + name = sample.replace("/", "_").replace(".cc", ""), srcs = [sample], copts = [ "-I$(BINDIR)", @@ -142,4 +142,4 @@ filegroup( ":google_cloud_cpp_generator_golden", "//google/cloud/testing_util:google_cloud_cpp_testing_private", ], -) for sample in glob(["golden/samples/*.cc"])] +) for sample in glob(["golden/v1/samples/*.cc"])] diff --git a/generator/integration_tests/CMakeLists.txt b/generator/integration_tests/CMakeLists.txt index 318bb8915eac..75550661d141 100644 --- a/generator/integration_tests/CMakeLists.txt +++ b/generator/integration_tests/CMakeLists.txt @@ -57,8 +57,8 @@ set_target_properties(google_cloud_cpp_generator_golden_protos file( GLOB google_cloud_cpp_generator_golden_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" - "golden/*.h" "golden/*.cc" "golden/internal/*.h" "golden/internal/*.cc" - "golden/mocks/*.h") + "golden/v1/*.h" "golden/v1/*.cc" "golden/v1/internal/*.h" + "golden/v1/internal/*.cc" "golden/v1/mocks/*.h") list(SORT google_cloud_cpp_generator_golden_files) # Create a library from the where the golden code was copied to. @@ -161,7 +161,7 @@ endforeach () file( GLOB RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" - "golden/samples/*.cc") + "golden/v1/samples/*.cc") foreach (fname IN LISTS samples_cc) google_cloud_cpp_add_executable(target "generator" "${fname}") target_link_libraries( diff --git a/generator/integration_tests/golden/samples/golden_kitchen_sink_samples.cc b/generator/integration_tests/golden/samples/golden_kitchen_sink_samples.cc deleted file mode 100644 index f7f2b10bd222..000000000000 --- a/generator/integration_tests/golden/samples/golden_kitchen_sink_samples.cc +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2022 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. - -// Generated by the Codegen C++ plugin. -// If you make any local changes, they will be lost. -// source: generator/integration_tests/test.proto - -#include "generator/integration_tests/golden/golden_kitchen_sink_client.h" -#include "google/cloud/common_options.h" -#include "google/cloud/testing_util/example_driver.h" -#include -#include -#include - -namespace { - -void SetClientEndpoint(std::vector const& argv) { - if (!argv.empty()) { - throw google::cloud::testing_util::Usage{"set-client-endpoint"}; - } - //! [set-client-endpoint] - // For illustration purposes, set the endpoint to the default value. In real - // applications you would use a different value, such as a - // `private.googleapis.com` for VPC-SC, or maybe a regional endpoint. - auto options = google::cloud::Options{}.set( - "goldenkitchensink.googleapis.com"); - auto client = google::cloud::golden::GoldenKitchenSinkClient( - google::cloud::golden::MakeGoldenKitchenSinkConnection(options)); - // Use the `client` object as usual - //! [set-client-endpoint] -} - -void AutoRun(std::vector const& argv) { - if (!argv.empty()) throw google::cloud::testing_util::Usage{"auto"}; - - std::cout << "\nRunning SetClientEndpoint() example" << std::endl; - SetClientEndpoint({}); -} - -} // namespace - -int main(int argc, char* argv[]) { // NOLINT(bugprone-exception-escape) - google::cloud::testing_util::Example example({ - {"set-client-endpoint", SetClientEndpoint}, - {"auto", AutoRun}, - }); - return example.Run(argc, argv); -} diff --git a/generator/integration_tests/golden/samples/golden_thing_admin_samples.cc b/generator/integration_tests/golden/samples/golden_thing_admin_samples.cc deleted file mode 100644 index 93620a50e3cc..000000000000 --- a/generator/integration_tests/golden/samples/golden_thing_admin_samples.cc +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2022 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. - -// Generated by the Codegen C++ plugin. -// If you make any local changes, they will be lost. -// source: generator/integration_tests/test.proto - -#include "generator/integration_tests/golden/golden_thing_admin_client.h" -#include "google/cloud/common_options.h" -#include "google/cloud/testing_util/example_driver.h" -#include -#include -#include - -namespace { - -void SetClientEndpoint(std::vector const& argv) { - if (!argv.empty()) { - throw google::cloud::testing_util::Usage{"set-client-endpoint"}; - } - //! [set-client-endpoint] - // For illustration purposes, set the endpoint to the default value. In real - // applications you would use a different value, such as a - // `private.googleapis.com` for VPC-SC, or maybe a regional endpoint. - auto options = google::cloud::Options{}.set( - "test.googleapis.com"); - auto client = google::cloud::golden::GoldenThingAdminClient( - google::cloud::golden::MakeGoldenThingAdminConnection(options)); - // Use the `client` object as usual - //! [set-client-endpoint] -} - -void AutoRun(std::vector const& argv) { - if (!argv.empty()) throw google::cloud::testing_util::Usage{"auto"}; - - std::cout << "\nRunning SetClientEndpoint() example" << std::endl; - SetClientEndpoint({}); -} - -} // namespace - -int main(int argc, char* argv[]) { // NOLINT(bugprone-exception-escape) - google::cloud::testing_util::Example example({ - {"set-client-endpoint", SetClientEndpoint}, - {"auto", AutoRun}, - }); - return example.Run(argc, argv); -} diff --git a/generator/integration_tests/golden/golden_kitchen_sink_client.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc similarity index 98% rename from generator/integration_tests/golden/golden_kitchen_sink_client.cc rename to generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc index 99644b1fe998..81be25b2d45c 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_client.cc +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc @@ -16,12 +16,12 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_kitchen_sink_client.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h" #include namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkClient::GoldenKitchenSinkClient( @@ -158,6 +158,6 @@ GoldenKitchenSinkClient::ExplicitRouting2(google::test::admin::database::v1::Exp } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/golden_kitchen_sink_client.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h similarity index 98% rename from generator/integration_tests/golden/golden_kitchen_sink_client.h rename to generator/integration_tests/golden/v1/golden_kitchen_sink_client.h index 32d6908f685c..a1e878056a92 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_client.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CLIENT_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CLIENT_H -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/polling_policy.h" @@ -31,7 +31,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /// @@ -410,8 +410,8 @@ class GoldenKitchenSinkClient { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CLIENT_H diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc similarity index 86% rename from generator/integration_tests/golden/golden_kitchen_sink_connection.cc rename to generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc index 229e247125e0..ef7081316523 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_connection.cc +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_options.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h" #include "google/cloud/background_threads.h" #include "google/cloud/common_options.h" #include "google/cloud/credentials.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkConnection::~GoldenKitchenSinkConnection() = default; @@ -109,16 +109,16 @@ std::shared_ptr MakeGoldenKitchenSinkConnection( internal::CheckExpectedOptions(options, __func__); - options = golden_internal::GoldenKitchenSinkDefaultOptions( + options = golden_v1_internal::GoldenKitchenSinkDefaultOptions( std::move(options)); auto background = internal::MakeBackgroundThreadsFactory(options)(); - auto stub = golden_internal::CreateDefaultGoldenKitchenSinkStub( + auto stub = golden_v1_internal::CreateDefaultGoldenKitchenSinkStub( background->cq(), options); - return std::make_shared( + return std::make_shared( std::move(background), std::move(stub), std::move(options)); } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h similarity index 83% rename from generator/integration_tests/golden/golden_kitchen_sink_connection.h rename to generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h index 39875f76ddd7..94e1ae098aa6 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_connection.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h @@ -16,12 +16,12 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_H -#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_retry_traits.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/internal/async_read_write_stream_impl.h" #include "google/cloud/options.h" @@ -32,18 +32,18 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN using GoldenKitchenSinkRetryPolicy = ::google::cloud::internal::TraitBasedRetryPolicy< - golden_internal::GoldenKitchenSinkRetryTraits>; + golden_v1_internal::GoldenKitchenSinkRetryTraits>; using GoldenKitchenSinkLimitedTimeRetryPolicy = ::google::cloud::internal::LimitedTimeRetryPolicy< - golden_internal::GoldenKitchenSinkRetryTraits>; + golden_v1_internal::GoldenKitchenSinkRetryTraits>; using GoldenKitchenSinkLimitedErrorCountRetryPolicy = ::google::cloud::internal::LimitedErrorCountRetryPolicy< - golden_internal::GoldenKitchenSinkRetryTraits>; + golden_v1_internal::GoldenKitchenSinkRetryTraits>; /** * The `GoldenKitchenSinkConnection` object for `GoldenKitchenSinkClient`. @@ -55,7 +55,7 @@ using GoldenKitchenSinkLimitedErrorCountRetryPolicy = * * To create a concrete instance, see `MakeGoldenKitchenSinkConnection()`. * - * For mocking, see `golden_mocks::MockGoldenKitchenSinkConnection`. + * For mocking, see `golden_v1_mocks::MockGoldenKitchenSinkConnection`. */ class GoldenKitchenSinkConnection { public: @@ -109,7 +109,7 @@ class GoldenKitchenSinkConnection { * - `google::cloud::CommonOptionList` * - `google::cloud::GrpcOptionList` * - `google::cloud::UnifiedCredentialsOptionList` - * - `google::cloud::golden::GoldenKitchenSinkPolicyOptionList` + * - `google::cloud::golden_v1::GoldenKitchenSinkPolicyOptionList` * * @note Unexpected options will be ignored. To log unexpected options instead, * set `GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes` in the environment. @@ -121,8 +121,8 @@ std::shared_ptr MakeGoldenKitchenSinkConnection( Options options = {}); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_H diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc similarity index 95% rename from generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.cc rename to generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc index 5eac45dd4362..2d8aa89a9c31 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.cc +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc @@ -16,13 +16,13 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h" #include "absl/memory/memory.h" #include namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN using ::google::cloud::Idempotency; @@ -72,6 +72,6 @@ std::unique_ptr } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h similarity index 88% rename from generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h rename to generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h index a7fec26696bb..278dcf1dbfdf 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H #include "google/cloud/idempotency.h" #include "google/cloud/internal/retry_policy.h" @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkConnectionIdempotencyPolicy { @@ -66,8 +66,8 @@ std::unique_ptr MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy(); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H diff --git a/generator/integration_tests/golden/golden_kitchen_sink_options.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_options.h similarity index 81% rename from generator/integration_tests/golden/golden_kitchen_sink_options.h rename to generator/integration_tests/golden/v1/golden_kitchen_sink_options.h index 7d9ea06d5635..c070f8e825bf 100644 --- a/generator/integration_tests/golden/golden_kitchen_sink_options.h +++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_options.h @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_OPTIONS_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_OPTIONS_H -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/version.h" @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /** @@ -69,8 +69,8 @@ using GoldenKitchenSinkPolicyOptionList = GoldenKitchenSinkConnectionIdempotencyPolicyOption>; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_OPTIONS_H diff --git a/generator/integration_tests/golden/golden_thing_admin_client.cc b/generator/integration_tests/golden/v1/golden_thing_admin_client.cc similarity index 98% rename from generator/integration_tests/golden/golden_thing_admin_client.cc rename to generator/integration_tests/golden/v1/golden_thing_admin_client.cc index 3fdbec9c073b..111c671acec1 100644 --- a/generator/integration_tests/golden/golden_thing_admin_client.cc +++ b/generator/integration_tests/golden/v1/golden_thing_admin_client.cc @@ -16,14 +16,14 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_thing_admin_client.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_client.h" #include -#include "generator/integration_tests/golden/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" #include namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminClient::GoldenThingAdminClient( @@ -347,6 +347,6 @@ GoldenThingAdminClient::AsyncDropDatabase(google::test::admin::database::v1::Dro } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/golden_thing_admin_client.h b/generator/integration_tests/golden/v1/golden_thing_admin_client.h similarity index 99% rename from generator/integration_tests/golden/golden_thing_admin_client.h rename to generator/integration_tests/golden/v1/golden_thing_admin_client.h index ade8aa5bc114..8b843702577f 100644 --- a/generator/integration_tests/golden/golden_thing_admin_client.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_client.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CLIENT_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CLIENT_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CLIENT_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CLIENT_H -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" #include "google/cloud/future.h" #include "google/cloud/options.h" #include "google/cloud/polling_policy.h" @@ -31,7 +31,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /// @@ -878,8 +878,8 @@ class GoldenThingAdminClient { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CLIENT_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CLIENT_H diff --git a/generator/integration_tests/golden/golden_thing_admin_connection.cc b/generator/integration_tests/golden/v1/golden_thing_admin_connection.cc similarity index 91% rename from generator/integration_tests/golden/golden_thing_admin_connection.cc rename to generator/integration_tests/golden/v1/golden_thing_admin_connection.cc index f997173888fa..fa608ccaf071 100644 --- a/generator/integration_tests/golden/golden_thing_admin_connection.cc +++ b/generator/integration_tests/golden/v1/golden_thing_admin_connection.cc @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" -#include "generator/integration_tests/golden/golden_thing_admin_options.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.h" #include "google/cloud/background_threads.h" #include "google/cloud/common_options.h" #include "google/cloud/credentials.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminConnection::~GoldenThingAdminConnection() = default; @@ -173,16 +173,16 @@ std::shared_ptr MakeGoldenThingAdminConnection( internal::CheckExpectedOptions(options, __func__); - options = golden_internal::GoldenThingAdminDefaultOptions( + options = golden_v1_internal::GoldenThingAdminDefaultOptions( std::move(options)); auto background = internal::MakeBackgroundThreadsFactory(options)(); - auto stub = golden_internal::CreateDefaultGoldenThingAdminStub( + auto stub = golden_v1_internal::CreateDefaultGoldenThingAdminStub( background->cq(), options); - return std::make_shared( + return std::make_shared( std::move(background), std::move(stub), std::move(options)); } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/golden_thing_admin_connection.h b/generator/integration_tests/golden/v1/golden_thing_admin_connection.h similarity index 87% rename from generator/integration_tests/golden/golden_thing_admin_connection.h rename to generator/integration_tests/golden/v1/golden_thing_admin_connection.h index 41a3d5bc2b7e..3052d68dd2ba 100644 --- a/generator/integration_tests/golden/golden_thing_admin_connection.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_connection.h @@ -16,12 +16,12 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CONNECTION_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CONNECTION_H -#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_retry_traits.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_retry_traits.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" #include "google/cloud/options.h" @@ -34,18 +34,18 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN using GoldenThingAdminRetryPolicy = ::google::cloud::internal::TraitBasedRetryPolicy< - golden_internal::GoldenThingAdminRetryTraits>; + golden_v1_internal::GoldenThingAdminRetryTraits>; using GoldenThingAdminLimitedTimeRetryPolicy = ::google::cloud::internal::LimitedTimeRetryPolicy< - golden_internal::GoldenThingAdminRetryTraits>; + golden_v1_internal::GoldenThingAdminRetryTraits>; using GoldenThingAdminLimitedErrorCountRetryPolicy = ::google::cloud::internal::LimitedErrorCountRetryPolicy< - golden_internal::GoldenThingAdminRetryTraits>; + golden_v1_internal::GoldenThingAdminRetryTraits>; /** * The `GoldenThingAdminConnection` object for `GoldenThingAdminClient`. @@ -57,7 +57,7 @@ using GoldenThingAdminLimitedErrorCountRetryPolicy = * * To create a concrete instance, see `MakeGoldenThingAdminConnection()`. * - * For mocking, see `golden_mocks::MockGoldenThingAdminConnection`. + * For mocking, see `golden_v1_mocks::MockGoldenThingAdminConnection`. */ class GoldenThingAdminConnection { public: @@ -139,7 +139,7 @@ class GoldenThingAdminConnection { * - `google::cloud::CommonOptionList` * - `google::cloud::GrpcOptionList` * - `google::cloud::UnifiedCredentialsOptionList` - * - `google::cloud::golden::GoldenThingAdminPolicyOptionList` + * - `google::cloud::golden_v1::GoldenThingAdminPolicyOptionList` * * @note Unexpected options will be ignored. To log unexpected options instead, * set `GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes` in the environment. @@ -151,8 +151,8 @@ std::shared_ptr MakeGoldenThingAdminConnection( Options options = {}); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CONNECTION_H diff --git a/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.cc b/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.cc similarity index 97% rename from generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.cc rename to generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.cc index e6c1189c14c3..14f42a8f85fd 100644 --- a/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.cc +++ b/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.cc @@ -16,13 +16,13 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h" #include "absl/memory/memory.h" #include namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN using ::google::cloud::Idempotency; @@ -114,6 +114,6 @@ std::unique_ptr } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h similarity index 91% rename from generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h rename to generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h index bf2eec78ef28..b5d1d2059c93 100644 --- a/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H #include "google/cloud/idempotency.h" #include "google/cloud/internal/retry_policy.h" @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminConnectionIdempotencyPolicy { @@ -96,8 +96,8 @@ std::unique_ptr MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy(); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H diff --git a/generator/integration_tests/golden/golden_thing_admin_options.h b/generator/integration_tests/golden/v1/golden_thing_admin_options.h similarity index 83% rename from generator/integration_tests/golden/golden_thing_admin_options.h rename to generator/integration_tests/golden/v1/golden_thing_admin_options.h index 25bfa42a1dc9..74f22d2f0263 100644 --- a/generator/integration_tests/golden/golden_thing_admin_options.h +++ b/generator/integration_tests/golden/v1/golden_thing_admin_options.h @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_OPTIONS_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_OPTIONS_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_OPTIONS_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_OPTIONS_H -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" -#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/options.h" #include "google/cloud/version.h" @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /** @@ -80,8 +80,8 @@ using GoldenThingAdminPolicyOptionList = GoldenThingAdminConnectionIdempotencyPolicyOption>; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_OPTIONS_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_THING_ADMIN_OPTIONS_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc similarity index 97% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc index 50660e1fcd7d..7322a476ea32 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h" #include "google/cloud/internal/async_read_write_stream_auth.h" #include "google/cloud/internal/async_streaming_read_rpc_auth.h" #include "google/cloud/internal/async_streaming_write_rpc_auth.h" @@ -26,7 +26,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkAuth::GoldenKitchenSinkAuth( @@ -172,6 +172,6 @@ GoldenKitchenSinkAuth::AsyncStreamingWrite( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h similarity index 91% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h index 1a2a05e62852..b60ff10f2368 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/internal/unified_grpc_credentials.h" #include "google/cloud/version.h" #include @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkAuth : public GoldenKitchenSinkStub { @@ -106,8 +106,8 @@ class GoldenKitchenSinkAuth : public GoldenKitchenSinkStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc similarity index 93% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc index a88f3fb54900..88bf8bd1954b 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h" #include "google/cloud/background_threads.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" @@ -30,12 +30,12 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkConnectionImpl::GoldenKitchenSinkConnectionImpl( std::unique_ptr background, - std::shared_ptr stub, + std::shared_ptr stub, Options options) : background_(std::move(background)), stub_(std::move(stub)), options_(internal::MergeOptions( @@ -82,7 +82,7 @@ StreamRange GoldenKitchenSinkConnectionImpl::ListLogs(google::test::admin::database::v1::ListLogsRequest request) { request.clear_page_token(); auto& stub = stub_; - auto retry = std::shared_ptr(retry_policy()); + auto retry = std::shared_ptr(retry_policy()); auto backoff = std::shared_ptr(backoff_policy()); auto idempotency = idempotency_policy()->ListLogs(request); char const* function_name = __func__; @@ -132,7 +132,7 @@ GoldenKitchenSinkConnectionImpl::DoNothing(google::protobuf::Empty const& reques StreamRange GoldenKitchenSinkConnectionImpl::StreamingRead(google::test::admin::database::v1::Request const& request) { auto& stub = stub_; - auto retry = std::shared_ptr(retry_policy()); + auto retry = std::shared_ptr(retry_policy()); auto backoff = std::shared_ptr(backoff_policy()); auto factory = [stub](google::test::admin::database::v1::Request const& request) { @@ -172,6 +172,6 @@ GoldenKitchenSinkConnectionImpl::ExplicitRouting2(google::test::admin::database: } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h similarity index 65% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h index f56e2057b908..36c4db4f44d6 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h @@ -16,14 +16,14 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H - -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_options.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_retry_traits.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H + +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" @@ -35,7 +35,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN void GoldenKitchenSinkStreamingReadStreamingUpdater( @@ -43,13 +43,13 @@ void GoldenKitchenSinkStreamingReadStreamingUpdater( google::test::admin::database::v1::Request& request); class GoldenKitchenSinkConnectionImpl - : public golden::GoldenKitchenSinkConnection { + : public golden_v1::GoldenKitchenSinkConnection { public: ~GoldenKitchenSinkConnectionImpl() override = default; GoldenKitchenSinkConnectionImpl( std::unique_ptr background, - std::shared_ptr stub, + std::shared_ptr stub, Options options); Options options() override { return options_; } @@ -87,39 +87,39 @@ class GoldenKitchenSinkConnectionImpl ExplicitRouting2(google::test::admin::database::v1::ExplicitRoutingRequest const& request) override; private: - std::unique_ptr retry_policy() { + std::unique_ptr retry_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()->clone(); + return options_.get()->clone(); } std::unique_ptr backoff_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()->clone(); + return options_.get()->clone(); } - std::unique_ptr idempotency_policy() { + std::unique_ptr idempotency_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()-> + return options_.get()-> clone(); } std::unique_ptr background_; - std::shared_ptr stub_; + std::shared_ptr stub_; Options options_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc index cc1c90b6bc74..a0e39ae23a6b 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h" #include "google/cloud/internal/async_read_write_stream_logging.h" #include "google/cloud/internal/async_streaming_read_rpc_logging.h" #include "google/cloud/internal/async_streaming_write_rpc_logging.h" @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkLogging::GoldenKitchenSinkLogging( @@ -231,6 +231,6 @@ GoldenKitchenSinkLogging::AsyncStreamingWrite( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h similarity index 90% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h index 55e6a4182104..6a6ac13eeadf 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkLogging : public GoldenKitchenSinkStub { @@ -108,8 +108,8 @@ class GoldenKitchenSinkLogging : public GoldenKitchenSinkStub { }; // GoldenKitchenSinkLogging GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc index f6a3d530ccba..ea0132a6af38 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_join_quiet.h" #include "google/cloud/internal/api_client_header.h" @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkMetadata::GoldenKitchenSinkMetadata( @@ -223,6 +223,6 @@ void GoldenKitchenSinkMetadata::SetMetadata(grpc::ClientContext& context) { } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h similarity index 90% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h index f84c3db9c599..3f6c546b03d9 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h @@ -16,17 +16,17 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/version.h" #include #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkMetadata : public GoldenKitchenSinkStub { @@ -107,8 +107,8 @@ class GoldenKitchenSinkMetadata : public GoldenKitchenSinkStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc similarity index 65% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc index 0bc631aa8040..9dc3db75b5c1 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc @@ -16,16 +16,16 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h" #include "google/cloud/internal/populate_common_options.h" #include "google/cloud/internal/populate_grpc_options.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -39,25 +39,25 @@ Options GoldenKitchenSinkDefaultOptions(Options options) { "goldenkitchensink.googleapis.com"); options = google::cloud::internal::PopulateGrpcOptions( std::move(options), "GOLDEN_KITCHEN_SINK_EMULATOR_HOST"); - if (!options.has()) { - options.set( - golden::GoldenKitchenSinkLimitedTimeRetryPolicy( + if (!options.has()) { + options.set( + golden_v1::GoldenKitchenSinkLimitedTimeRetryPolicy( std::chrono::minutes(30)).clone()); } - if (!options.has()) { - options.set( + if (!options.has()) { + options.set( ExponentialBackoffPolicy(std::chrono::seconds(1), std::chrono::minutes(5), kBackoffScaling).clone()); } - if (!options.has()) { - options.set( - golden::MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy()); + if (!options.has()) { + options.set( + golden_v1::MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy()); } return options; } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h similarity index 75% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h index 41bf38406eeb..020850fe00b8 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h @@ -16,22 +16,22 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H #include "google/cloud/options.h" #include "google/cloud/version.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN Options GoldenKitchenSinkDefaultOptions(Options options); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc similarity index 97% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc index 02284c160c8c..85d1da86ab2c 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc @@ -16,14 +16,14 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkRestLogging::GoldenKitchenSinkRestLogging( @@ -130,6 +130,6 @@ GoldenKitchenSinkRestLogging::ExplicitRouting2( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h similarity index 88% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h index 98b3a30f22eb..87b7ee4c4e56 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkRestLogging : public GoldenKitchenSinkRestStub { @@ -79,8 +79,8 @@ class GoldenKitchenSinkRestLogging : public GoldenKitchenSinkRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc similarity index 97% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc index 71365c96ea54..eda6cb53c40a 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc @@ -17,7 +17,7 @@ // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h" #include "absl/strings/str_format.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkRestMetadata::GoldenKitchenSinkRestMetadata( @@ -180,6 +180,6 @@ void GoldenKitchenSinkRestMetadata::SetMetadata( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h similarity index 87% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h index e75f2e4ea9a5..4fc0cb4e1956 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" #include @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkRestMetadata : public GoldenKitchenSinkRestStub { @@ -77,8 +77,8 @@ class GoldenKitchenSinkRestMetadata : public GoldenKitchenSinkRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc similarity index 96% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc index 827865e5e037..920cd5bd4485 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" @@ -26,7 +26,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN DefaultGoldenKitchenSinkRestStub::DefaultGoldenKitchenSinkRestStub(Options options) @@ -110,6 +110,6 @@ Status DefaultGoldenKitchenSinkRestStub::ExplicitRouting2( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h similarity index 93% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h index c5763ba3dc30..8d8cea23348b 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkRestStub { @@ -116,8 +116,8 @@ class DefaultGoldenKitchenSinkRestStub : public GoldenKitchenSinkRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc similarity index 80% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc index af7c674835c4..332353325faf 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include "google/cloud/common_options.h" #include "google/cloud/credentials.h" #include "google/cloud/internal/algorithm.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr @@ -54,6 +54,6 @@ CreateDefaultGoldenKitchenSinkRestStub(Options const& options) { } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h similarity index 71% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h index 42d4390918be..0fc7c30040b8 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h @@ -16,25 +16,25 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr CreateDefaultGoldenKitchenSinkRestStub( Options const& options); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_retry_traits.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h similarity index 79% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_retry_traits.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h index 7ef82d27f05d..182b21866b4b 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_retry_traits.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h @@ -16,15 +16,15 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H #include "google/cloud/status.h" #include "google/cloud/version.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /// Define the gRPC status code semantics for retrying requests. @@ -35,8 +35,8 @@ struct GoldenKitchenSinkRetryTraits { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc similarity index 96% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc index b81b4971142a..82220c955826 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkRoundRobin::GoldenKitchenSinkRoundRobin( @@ -126,6 +126,6 @@ GoldenKitchenSinkRoundRobin::Child() { } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h similarity index 90% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h index 3e83ef6ee45e..b2ac93814dba 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/version.h" #include #include @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkRoundRobin : public GoldenKitchenSinkStub { @@ -109,8 +109,8 @@ class GoldenKitchenSinkRoundRobin : public GoldenKitchenSinkStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_stub.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc index 12ea0bf119be..050924449e30 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "absl/memory/memory.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/internal/async_read_write_stream_impl.h" @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenKitchenSinkStub::~GoldenKitchenSinkStub() = default; @@ -199,6 +199,6 @@ DefaultGoldenKitchenSinkStub::AsyncStreamingWrite( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h similarity index 95% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h index 79262bc655c5..3f740b00f869 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H #include "google/cloud/async_streaming_read_write_rpc.h" #include "google/cloud/completion_queue.h" @@ -34,7 +34,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenKitchenSinkStub { @@ -187,8 +187,8 @@ class DefaultGoldenKitchenSinkStub : public GoldenKitchenSinkStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc similarity index 81% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.cc rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc index 83a8931f758a..c441d7112904 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/algorithm.h" @@ -31,7 +31,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr @@ -62,6 +62,6 @@ CreateDefaultGoldenKitchenSinkStub( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h similarity index 74% rename from generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.h rename to generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h index 9a9abf1a099f..d2ead176fa02 100644 --- a/generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.h +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/completion_queue.h" #include "google/cloud/credentials.h" #include "google/cloud/internal/unified_grpc_credentials.h" @@ -28,15 +28,15 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr CreateDefaultGoldenKitchenSinkStub( google::cloud::CompletionQueue cq, Options const& options); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc index cc0e6f37dcc6..e3a88faa1704 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.cc @@ -16,13 +16,13 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h" #include #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminAuth::GoldenThingAdminAuth( @@ -288,6 +288,6 @@ future GoldenThingAdminAuth::AsyncCancelOperation( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h similarity index 93% rename from generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h index 116fb02a7f97..c60dae21ffe8 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_AUTH_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_AUTH_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_AUTH_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_AUTH_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#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 @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminAuth : public GoldenThingAdminStub { @@ -141,8 +141,8 @@ class GoldenThingAdminAuth : public GoldenThingAdminStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_AUTH_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_AUTH_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.cc similarity index 96% rename from generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.cc index 68915a2013c6..f2acb2d27897 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.cc @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" #include "google/cloud/background_threads.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" @@ -29,12 +29,12 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminConnectionImpl::GoldenThingAdminConnectionImpl( std::unique_ptr background, - std::shared_ptr stub, + std::shared_ptr stub, Options options) : background_(std::move(background)), stub_(std::move(stub)), options_(internal::MergeOptions( @@ -45,7 +45,7 @@ StreamRange GoldenThingAdminConnectionImpl::ListDatabases(google::test::admin::database::v1::ListDatabasesRequest request) { request.clear_page_token(); auto& stub = stub_; - auto retry = std::shared_ptr(retry_policy()); + auto retry = std::shared_ptr(retry_policy()); auto backoff = std::shared_ptr(backoff_policy()); auto idempotency = idempotency_policy()->ListDatabases(request); char const* function_name = __func__; @@ -261,7 +261,7 @@ StreamRange GoldenThingAdminConnectionImpl::ListBackups(google::test::admin::database::v1::ListBackupsRequest request) { request.clear_page_token(); auto& stub = stub_; - auto retry = std::shared_ptr(retry_policy()); + auto retry = std::shared_ptr(retry_policy()); auto backoff = std::shared_ptr(backoff_policy()); auto idempotency = idempotency_policy()->ListBackups(request); char const* function_name = __func__; @@ -315,7 +315,7 @@ StreamRange GoldenThingAdminConnectionImpl::ListDatabaseOperations(google::test::admin::database::v1::ListDatabaseOperationsRequest request) { request.clear_page_token(); auto& stub = stub_; - auto retry = std::shared_ptr(retry_policy()); + auto retry = std::shared_ptr(retry_policy()); auto backoff = std::shared_ptr(backoff_policy()); auto idempotency = idempotency_policy()->ListDatabaseOperations(request); char const* function_name = __func__; @@ -342,7 +342,7 @@ StreamRange GoldenThingAdminConnectionImpl::ListBackupOperations(google::test::admin::database::v1::ListBackupOperationsRequest request) { request.clear_page_token(); auto& stub = stub_; - auto retry = std::shared_ptr(retry_policy()); + auto retry = std::shared_ptr(retry_policy()); auto backoff = std::shared_ptr(backoff_policy()); auto idempotency = idempotency_policy()->ListBackupOperations(request); char const* function_name = __func__; @@ -423,6 +423,6 @@ GoldenThingAdminConnectionImpl::AsyncDropDatabase(google::test::admin::database: } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h similarity index 70% rename from generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h index 9787a066c7c3..e75a18c19b4d 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h @@ -16,14 +16,14 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_CONNECTION_IMPL_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_CONNECTION_IMPL_H - -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" -#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h" -#include "generator/integration_tests/golden/golden_thing_admin_options.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_retry_traits.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_CONNECTION_IMPL_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_CONNECTION_IMPL_H + +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_retry_traits.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/background_threads.h" #include "google/cloud/backoff_policy.h" #include "google/cloud/future.h" @@ -37,17 +37,17 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminConnectionImpl - : public golden::GoldenThingAdminConnection { + : public golden_v1::GoldenThingAdminConnection { public: ~GoldenThingAdminConnectionImpl() override = default; GoldenThingAdminConnectionImpl( std::unique_ptr background, - std::shared_ptr stub, + std::shared_ptr stub, Options options); Options options() override { return options_; } @@ -113,47 +113,47 @@ class GoldenThingAdminConnectionImpl AsyncDropDatabase(google::test::admin::database::v1::DropDatabaseRequest const& request) override; private: - std::unique_ptr retry_policy() { + std::unique_ptr retry_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()->clone(); + return options_.get()->clone(); } std::unique_ptr backoff_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()->clone(); + return options_.get()->clone(); } - std::unique_ptr idempotency_policy() { + std::unique_ptr idempotency_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()-> + return options_.get()-> clone(); } std::unique_ptr polling_policy() { auto const& options = internal::CurrentOptions(); - if (options.has()) { - return options.get()->clone(); + if (options.has()) { + return options.get()->clone(); } - return options_.get()->clone(); + return options_.get()->clone(); } std::unique_ptr background_; - std::shared_ptr stub_; + std::shared_ptr stub_; Options options_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_CONNECTION_IMPL_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_CONNECTION_IMPL_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc index 248318e289aa..ae201b4dd249 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" #include @@ -24,7 +24,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminLogging::GoldenThingAdminLogging( @@ -316,6 +316,6 @@ future GoldenThingAdminLogging::AsyncCancelOperation( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h similarity index 93% rename from generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h index c71ed5fd5a68..32fdc972d036 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_LOGGING_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_LOGGING_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_LOGGING_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_LOGGING_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminLogging : public GoldenThingAdminStub { @@ -143,8 +143,8 @@ class GoldenThingAdminLogging : public GoldenThingAdminStub { }; // GoldenThingAdminLogging GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_LOGGING_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_LOGGING_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc index 172c9dee190d..f424df839ce9 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_join_quiet.h" #include "google/cloud/internal/api_client_header.h" @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminMetadata::GoldenThingAdminMetadata( @@ -317,6 +317,6 @@ void GoldenThingAdminMetadata::SetMetadata(grpc::ClientContext& context) { } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h similarity index 93% rename from generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h index fefb712f8a71..41c80b34c932 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_METADATA_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_METADATA_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_METADATA_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_METADATA_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/version.h" #include #include @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminMetadata : public GoldenThingAdminStub { @@ -142,8 +142,8 @@ class GoldenThingAdminMetadata : public GoldenThingAdminStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_METADATA_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_METADATA_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.cc similarity index 57% rename from generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.cc index 70572ff5c7f7..3d850e103f58 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.cc @@ -16,16 +16,16 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" -#include "generator/integration_tests/golden/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" #include "google/cloud/internal/populate_common_options.h" #include "google/cloud/internal/populate_grpc_options.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -39,34 +39,34 @@ Options GoldenThingAdminDefaultOptions(Options options) { "test.googleapis.com"); options = google::cloud::internal::PopulateGrpcOptions( std::move(options), "GOLDEN_KITCHEN_SINK_EMULATOR_HOST"); - if (!options.has()) { - options.set( - golden::GoldenThingAdminLimitedTimeRetryPolicy( + if (!options.has()) { + options.set( + golden_v1::GoldenThingAdminLimitedTimeRetryPolicy( std::chrono::minutes(30)).clone()); } - if (!options.has()) { - options.set( + if (!options.has()) { + options.set( ExponentialBackoffPolicy(std::chrono::seconds(1), std::chrono::minutes(5), kBackoffScaling).clone()); } - if (!options.has()) { - options.set( + if (!options.has()) { + options.set( GenericPollingPolicy< - golden::GoldenThingAdminRetryPolicyOption::Type, - golden::GoldenThingAdminBackoffPolicyOption::Type>( - options.get()->clone(), - options.get()->clone()) + golden_v1::GoldenThingAdminRetryPolicyOption::Type, + golden_v1::GoldenThingAdminBackoffPolicyOption::Type>( + options.get()->clone(), + options.get()->clone()) .clone()); } - if (!options.has()) { - options.set( - golden::MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy()); + if (!options.has()) { + options.set( + golden_v1::MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy()); } return options; } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h similarity index 75% rename from generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h index 3bab6577f545..44cb0c46df87 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h @@ -16,22 +16,22 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_OPTION_DEFAULTS_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_OPTION_DEFAULTS_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_OPTION_DEFAULTS_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_OPTION_DEFAULTS_H #include "google/cloud/options.h" #include "google/cloud/version.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN Options GoldenThingAdminDefaultOptions(Options options); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_OPTION_DEFAULTS_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_OPTION_DEFAULTS_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.cc index f84b137b84a1..a7a6ac24d498 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.cc @@ -16,14 +16,14 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h" #include "google/cloud/internal/log_wrapper.h" #include "google/cloud/status_or.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminRestLogging::GoldenThingAdminRestLogging( @@ -238,6 +238,6 @@ GoldenThingAdminRestLogging::ListBackupOperations( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h similarity index 92% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h index 8f110f68ef20..2eb04e763317 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_LOGGING_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_LOGGING_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_LOGGING_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_LOGGING_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" @@ -31,7 +31,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminRestLogging : public GoldenThingAdminRestStub { @@ -116,8 +116,8 @@ class GoldenThingAdminRestLogging : public GoldenThingAdminRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_LOGGING_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_LOGGING_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.cc index 722909928dae..4a4b906eb380 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.cc @@ -17,7 +17,7 @@ // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h" #include "absl/strings/str_format.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_join_quiet.h" @@ -28,7 +28,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminRestMetadata::GoldenThingAdminRestMetadata( @@ -235,6 +235,6 @@ void GoldenThingAdminRestMetadata::SetMetadata( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h similarity index 92% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h index db02e27cda9e..17ee245f3ec9 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_METADATA_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_METADATA_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_METADATA_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_METADATA_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include "google/cloud/rest_options.h" #include "google/cloud/version.h" #include @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminRestMetadata : public GoldenThingAdminRestStub { @@ -114,8 +114,8 @@ class GoldenThingAdminRestMetadata : public GoldenThingAdminRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_METADATA_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_METADATA_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc index 3973894e457c..2eaa2ad865ed 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/absl_str_cat_quiet.h" #include "google/cloud/internal/rest_stub_helpers.h" @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN DefaultGoldenThingAdminRestStub::DefaultGoldenThingAdminRestStub(Options options) @@ -202,6 +202,6 @@ DefaultGoldenThingAdminRestStub::ListBackupOperations( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h similarity index 96% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h index d6a1a67164da..0908920e9fa1 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_H #include "google/cloud/internal/rest_client.h" #include "google/cloud/internal/rest_context.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminRestStub { @@ -189,8 +189,8 @@ class DefaultGoldenThingAdminRestStub : public GoldenThingAdminRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.cc similarity index 80% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.cc index 40ca1c07fc70..e6b3dd96e666 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.cc @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include "google/cloud/common_options.h" #include "google/cloud/credentials.h" #include "google/cloud/internal/algorithm.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr @@ -54,6 +54,6 @@ CreateDefaultGoldenThingAdminRestStub(Options const& options) { } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.h similarity index 72% rename from generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.h index d5edf5ad8331..11c88dddba36 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.h @@ -16,25 +16,25 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_FACTORY_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_FACTORY_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_FACTORY_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_FACTORY_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include "google/cloud/options.h" #include "google/cloud/version.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr CreateDefaultGoldenThingAdminRestStub( Options const& options); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_FACTORY_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_REST_STUB_FACTORY_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_retry_traits.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_retry_traits.h similarity index 79% rename from generator/integration_tests/golden/internal/golden_thing_admin_retry_traits.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_retry_traits.h index b7d5c9480e06..18156b0d65ba 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_retry_traits.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_retry_traits.h @@ -16,15 +16,15 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_RETRY_TRAITS_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_RETRY_TRAITS_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_RETRY_TRAITS_H #include "google/cloud/status.h" #include "google/cloud/version.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /// Define the gRPC status code semantics for retrying requests. @@ -35,8 +35,8 @@ struct GoldenThingAdminRetryTraits { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_RETRY_TRAITS_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_RETRY_TRAITS_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.cc similarity index 97% rename from generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.cc index 4aef109bab13..b11d4b676d4e 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.cc @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminRoundRobin::GoldenThingAdminRoundRobin( @@ -187,6 +187,6 @@ GoldenThingAdminRoundRobin::Child() { } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.h similarity index 93% rename from generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.h index 55d821fe5e66..6a31415f2c62 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_ROUND_ROBIN_DECORATOR_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_ROUND_ROBIN_DECORATOR_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_ROUND_ROBIN_DECORATOR_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_ROUND_ROBIN_DECORATOR_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/version.h" #include #include @@ -27,7 +27,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminRoundRobin : public GoldenThingAdminStub { @@ -142,8 +142,8 @@ future> AsyncGetDatabase( }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_ROUND_ROBIN_DECORATOR_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_ROUND_ROBIN_DECORATOR_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc similarity index 98% rename from generator/integration_tests/golden/internal/golden_thing_admin_stub.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc index ad75823ee3b8..797a086508fc 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/grpc_error_delegate.h" #include "google/cloud/status_or.h" #include @@ -25,7 +25,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN GoldenThingAdminStub::~GoldenThingAdminStub() = default; @@ -331,6 +331,6 @@ future DefaultGoldenThingAdminStub::AsyncCancelOperation( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_stub.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h similarity index 97% rename from generator/integration_tests/golden/internal/golden_thing_admin_stub.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h index bf94c4436b7b..223c369e94a2 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h @@ -16,8 +16,8 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_STUB_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_STUB_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_STUB_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_STUB_H #include "google/cloud/completion_queue.h" #include "google/cloud/future.h" @@ -30,7 +30,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class GoldenThingAdminStub { @@ -263,8 +263,8 @@ class DefaultGoldenThingAdminStub : public GoldenThingAdminStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_STUB_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_STUB_H diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc similarity index 81% rename from generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.cc rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc index 90fb156a2b3c..6ff7ea9dbb8f 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc @@ -16,11 +16,11 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/algorithm.h" @@ -31,7 +31,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr @@ -64,6 +64,6 @@ CreateDefaultGoldenThingAdminStub( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.h similarity index 74% rename from generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.h rename to generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.h index 4c5bd98cb99f..ad99498e761f 100644 --- a/generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.h @@ -16,10 +16,10 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_STUB_FACTORY_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_STUB_FACTORY_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_STUB_FACTORY_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_STUB_FACTORY_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/completion_queue.h" #include "google/cloud/credentials.h" #include "google/cloud/internal/unified_grpc_credentials.h" @@ -28,15 +28,15 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::shared_ptr CreateDefaultGoldenThingAdminStub( google::cloud::CompletionQueue cq, Options const& options); GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_INTERNAL_GOLDEN_THING_ADMIN_STUB_FACTORY_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_THING_ADMIN_STUB_FACTORY_H diff --git a/generator/integration_tests/golden/internal/streaming.cc b/generator/integration_tests/golden/v1/internal/streaming.cc similarity index 84% rename from generator/integration_tests/golden/internal/streaming.cc rename to generator/integration_tests/golden/v1/internal/streaming.cc index bb82f8ba20c0..8fa614d4253c 100644 --- a/generator/integration_tests/golden/internal/streaming.cc +++ b/generator/integration_tests/golden/v1/internal/streaming.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h" #include "google/cloud/version.h" namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc< @@ -36,6 +36,6 @@ void GoldenKitchenSinkStreamingReadStreamingUpdater( } GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h b/generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h similarity index 87% rename from generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h rename to generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h index fd1800bf9a8b..e5f13fdb83ca 100644 --- a/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h +++ b/generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h @@ -16,15 +16,15 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" #include namespace google { namespace cloud { -namespace golden_mocks { +namespace golden_v1_mocks { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /** @@ -42,7 +42,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN * * [bq-mock]: @googleapis_dev_link{bigquery,bigquery-read-mock.html} */ -class MockGoldenKitchenSinkConnection : public golden::GoldenKitchenSinkConnection { +class MockGoldenKitchenSinkConnection : public golden_v1::GoldenKitchenSinkConnection { public: MOCK_METHOD(Options, options, (), (override)); @@ -89,8 +89,8 @@ class MockGoldenKitchenSinkConnection : public golden::GoldenKitchenSinkConnecti }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_mocks +} // namespace golden_v1_mocks } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H diff --git a/generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h b/generator/integration_tests/golden/v1/mocks/mock_golden_thing_admin_connection.h similarity index 90% rename from generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h rename to generator/integration_tests/golden/v1/mocks/mock_golden_thing_admin_connection.h index 4de48fbf8408..2b50083e1ef5 100644 --- a/generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h +++ b/generator/integration_tests/golden/v1/mocks/mock_golden_thing_admin_connection.h @@ -16,15 +16,15 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H -#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H +#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H +#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" #include namespace google { namespace cloud { -namespace golden_mocks { +namespace golden_v1_mocks { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN /** @@ -42,7 +42,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN * * [bq-mock]: @googleapis_dev_link{bigquery,bigquery-read-mock.html} */ -class MockGoldenThingAdminConnection : public golden::GoldenThingAdminConnection { +class MockGoldenThingAdminConnection : public golden_v1::GoldenThingAdminConnection { public: MOCK_METHOD(Options, options, (), (override)); @@ -128,8 +128,8 @@ class MockGoldenThingAdminConnection : public golden::GoldenThingAdminConnection }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_mocks +} // namespace golden_v1_mocks } // namespace cloud } // namespace google -#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H +#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H diff --git a/generator/integration_tests/golden/samples/golden_kitchen_sink_client_samples.cc b/generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc similarity index 88% rename from generator/integration_tests/golden/samples/golden_kitchen_sink_client_samples.cc rename to generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc index 6f4ba065b7ac..86c1e59bb5e2 100644 --- a/generator/integration_tests/golden/samples/golden_kitchen_sink_client_samples.cc +++ b/generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_kitchen_sink_client.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h" #include "google/cloud/common_options.h" #include "google/cloud/credentials.h" #include "google/cloud/internal/getenv.h" @@ -26,7 +26,7 @@ #include #include -// main-dox-marker: golden::GoldenKitchenSinkClient +// main-dox-marker: golden_v1::GoldenKitchenSinkClient namespace { void SetClientEndpoint(std::vector const& argv) { @@ -38,8 +38,8 @@ void SetClientEndpoint(std::vector const& argv) { // https://cloud.google.com/vpc/docs/private-google-access auto options = google::cloud::Options{}.set( "private.googleapis.com"); - auto client = google::cloud::golden::GoldenKitchenSinkClient( - google::cloud::golden::MakeGoldenKitchenSinkConnection(options)); + auto client = google::cloud::golden_v1::GoldenKitchenSinkClient( + google::cloud::golden_v1::MakeGoldenKitchenSinkConnection(options)); //! [set-client-endpoint] } @@ -55,8 +55,8 @@ void WithServiceAccount(std::vector const& argv) { auto options = google::cloud::Options{}.set( google::cloud::MakeServiceAccountCredentials(contents)); - return google::cloud::golden::GoldenKitchenSinkClient( - google::cloud::golden::MakeGoldenKitchenSinkConnection(options)); + return google::cloud::golden_v1::GoldenKitchenSinkClient( + google::cloud::golden_v1::MakeGoldenKitchenSinkConnection(options)); } //! [with-service-account] (argv.at(0)); diff --git a/generator/integration_tests/golden/samples/golden_thing_admin_client_samples.cc b/generator/integration_tests/golden/v1/samples/golden_thing_admin_client_samples.cc similarity index 88% rename from generator/integration_tests/golden/samples/golden_thing_admin_client_samples.cc rename to generator/integration_tests/golden/v1/samples/golden_thing_admin_client_samples.cc index 3116e1556392..852f115d4fe4 100644 --- a/generator/integration_tests/golden/samples/golden_thing_admin_client_samples.cc +++ b/generator/integration_tests/golden/v1/samples/golden_thing_admin_client_samples.cc @@ -16,7 +16,7 @@ // If you make any local changes, they will be lost. // source: generator/integration_tests/test.proto -#include "generator/integration_tests/golden/golden_thing_admin_client.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_client.h" #include "google/cloud/common_options.h" #include "google/cloud/credentials.h" #include "google/cloud/internal/getenv.h" @@ -26,7 +26,7 @@ #include #include -// main-dox-marker: golden::GoldenThingAdminClient +// main-dox-marker: golden_v1::GoldenThingAdminClient namespace { void SetClientEndpoint(std::vector const& argv) { @@ -38,8 +38,8 @@ void SetClientEndpoint(std::vector const& argv) { // https://cloud.google.com/vpc/docs/private-google-access auto options = google::cloud::Options{}.set( "private.googleapis.com"); - auto client = google::cloud::golden::GoldenThingAdminClient( - google::cloud::golden::MakeGoldenThingAdminConnection(options)); + auto client = google::cloud::golden_v1::GoldenThingAdminClient( + google::cloud::golden_v1::MakeGoldenThingAdminConnection(options)); //! [set-client-endpoint] } @@ -55,8 +55,8 @@ void WithServiceAccount(std::vector const& argv) { auto options = google::cloud::Options{}.set( google::cloud::MakeServiceAccountCredentials(contents)); - return google::cloud::golden::GoldenThingAdminClient( - google::cloud::golden::MakeGoldenThingAdminConnection(options)); + return google::cloud::golden_v1::GoldenThingAdminClient( + google::cloud::golden_v1::MakeGoldenThingAdminConnection(options)); } //! [with-service-account] (argv.at(0)); diff --git a/generator/integration_tests/golden_config.textproto b/generator/integration_tests/golden_config.textproto index 48a0e85dbd81..1869f6730b26 100644 --- a/generator/integration_tests/golden_config.textproto +++ b/generator/integration_tests/golden_config.textproto @@ -17,7 +17,7 @@ service { service_proto_path: "generator/integration_tests/test.proto" additional_proto_files: "generator/integration_tests/backup.proto" - product_path: "generator/integration_tests/golden" + product_path: "generator/integration_tests/golden/v1" initial_copyright_year: "2022" omitted_rpcs: ["Omitted1", "GoldenKitchenSink.Omitted2"] service_endpoint_env_var: "GOLDEN_KITCHEN_SINK_ENDPOINT" diff --git a/generator/integration_tests/tests/golden_kitchen_sink_auth_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_auth_decorator_test.cc index 9f59ba80e667..69221de78236 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_auth_decorator_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_auth_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_auth_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h" #include "google/cloud/internal/async_streaming_read_rpc_impl.h" #include "google/cloud/internal/async_streaming_write_rpc_impl.h" #include "google/cloud/internal/streaming_read_rpc.h" @@ -25,11 +25,11 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockStreamingWriteRpc; +using ::google::cloud::golden_v1_internal::MockStreamingWriteRpc; using ::google::cloud::internal::StreamingReadRpcError; using ::google::cloud::testing_util::MakeTypicalAsyncMockAuth; using ::google::cloud::testing_util::MakeTypicalMockAuth; @@ -242,6 +242,6 @@ TEST(GoldenKitchenSinkAuthDecoratorTest, AsyncStreamingWrite) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc index 11442387a8e4..9634f10c7d8c 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_client_test.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_kitchen_sink_client.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/pagination_range.h" #include "google/cloud/internal/time_utils.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include "generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h" #include "generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h" #include #include @@ -28,11 +28,11 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockAsyncStreamingReadWriteRpc; +using ::google::cloud::golden_v1_internal::MockAsyncStreamingReadWriteRpc; using ::google::cloud::testing_util::IsProtoEqual; using ::google::cloud::testing_util::StatusIs; using ::google::test::admin::database::v1::Request; @@ -43,9 +43,9 @@ using ::testing::UnorderedElementsAreArray; TEST(GoldenKitchenSinkClientTest, CopyMoveEquality) { auto conn1 = - std::make_shared(); + std::make_shared(); auto conn2 = - std::make_shared(); + std::make_shared(); EXPECT_CALL(*conn1, options); EXPECT_CALL(*conn2, options); @@ -72,7 +72,8 @@ TEST(GoldenKitchenSinkClientTest, CopyMoveEquality) { } TEST(GoldenKitchenSinkClientTest, GenerateAccessToken) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options); std::string expected_name = "/projects/-/serviceAccounts/foo@bar.com"; @@ -109,7 +110,8 @@ TEST(GoldenKitchenSinkClientTest, GenerateAccessToken) { } TEST(GoldenKitchenSinkClientTest, GenerateIdToken) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options); std::string expected_name = "/projects/-/serviceAccounts/foo@bar.com"; @@ -146,7 +148,8 @@ TEST(GoldenKitchenSinkClientTest, GenerateIdToken) { } TEST(GoldenKitchenSinkClientTest, WriteLogEntries) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options); std::string expected_log_name = "projects/my_project/logs/my_log"; @@ -175,7 +178,8 @@ TEST(GoldenKitchenSinkClientTest, WriteLogEntries) { } TEST(GoldenKitchenSinkClientTest, ListLogs) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options); std::string expected_parent = "projects/my-project"; @@ -210,7 +214,8 @@ TEST(GoldenKitchenSinkClientTest, ListLogs) { } TEST(GoldenKitchenSinkClientTest, StreamingRead) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options).WillRepeatedly([] { return Options{} .set( @@ -256,7 +261,8 @@ TEST(GoldenKitchenSinkClientTest, StreamingRead) { } TEST(GoldenKitchenSinkClientTest, ListServiceAccountKeys) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options); std::string expected_name = @@ -290,7 +296,8 @@ TEST(GoldenKitchenSinkClientTest, ListServiceAccountKeys) { } TEST(GoldenKitchenSinkClientTest, AsyncStreamingReadWrite) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); EXPECT_CALL(*mock, options).WillRepeatedly([] { return Options{} .set( @@ -353,6 +360,6 @@ TEST(GoldenKitchenSinkClientTest, AsyncStreamingReadWrite) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc index 7c43f00a1865..fe4f9e3fac29 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc @@ -12,29 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h" #include "google/cloud/grpc_options.h" #include "google/cloud/polling_policy.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" -#include "generator/integration_tests/golden/golden_kitchen_sink_options.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h" #include "generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h" #include #include namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::GoldenKitchenSinkConnectionImpl; -using ::google::cloud::golden_internal::GoldenKitchenSinkDefaultOptions; -using ::google::cloud::golden_internal::GoldenKitchenSinkStub; -using ::google::cloud::golden_internal::MockGoldenKitchenSinkStub; -using ::google::cloud::golden_internal::MockStreamingReadRpc; +using ::google::cloud::golden_v1_internal::GoldenKitchenSinkConnectionImpl; +using ::google::cloud::golden_v1_internal::GoldenKitchenSinkDefaultOptions; +using ::google::cloud::golden_v1_internal::GoldenKitchenSinkStub; +using ::google::cloud::golden_v1_internal::MockGoldenKitchenSinkStub; +using ::google::cloud::golden_v1_internal::MockStreamingReadRpc; using ::google::cloud::testing_util::StatusIs; using ::google::test::admin::database::v1::Request; using ::google::test::admin::database::v1::Response; @@ -45,23 +45,24 @@ using ::testing::ContainsRegex; using ::testing::ElementsAre; using ::testing::Return; -std::shared_ptr CreateTestingConnection( +std::shared_ptr CreateTestingConnection( std::shared_ptr mock) { - golden::GoldenKitchenSinkLimitedErrorCountRetryPolicy retry( + golden_v1::GoldenKitchenSinkLimitedErrorCountRetryPolicy retry( /*maximum_failures=*/2); ExponentialBackoffPolicy backoff( /*initial_delay=*/std::chrono::microseconds(1), /*maximum_delay=*/std::chrono::microseconds(1), /*scaling=*/2.0); - GenericPollingPolicy polling(retry, backoff); auto options = GoldenKitchenSinkDefaultOptions( Options{} - .set(retry.clone()) - .set(backoff.clone())); + .set(retry.clone()) + .set( + backoff.clone())); auto background = internal::MakeBackgroundThreadsFactory(options)(); - return std::make_shared( + return std::make_shared( std::move(background), std::move(mock), std::move(options)); } @@ -335,6 +336,6 @@ TEST(GoldenKitchenSinkConnectionTest, CheckExpectedOptions) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_idempotency_policy_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_idempotency_policy_test.cc index a9066c3bbf4e..8ac71daad09a 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_idempotency_policy_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_idempotency_policy_test.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h" #include #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -27,10 +27,12 @@ using ::google::cloud::Idempotency; class GoldenKitchenSinkIdempotencyPolicyTest : public ::testing::Test { protected: void SetUp() override { - policy_ = golden::MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy(); + policy_ = + golden_v1::MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy(); } - std::unique_ptr policy_; + std::unique_ptr + policy_; }; TEST_F(GoldenKitchenSinkIdempotencyPolicyTest, GenerateAccessToken) { @@ -60,6 +62,6 @@ TEST_F(GoldenKitchenSinkIdempotencyPolicyTest, ListServiceAccountKeys) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_logging_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_logging_decorator_test.cc index 26d368d58540..4e53b19e8a51 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_logging_decorator_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_logging_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h" #include "google/cloud/internal/async_streaming_read_rpc_impl.h" #include "google/cloud/internal/async_streaming_write_rpc_impl.h" #include "google/cloud/log.h" @@ -25,12 +25,12 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockStreamingReadRpc; -using ::google::cloud::golden_internal::MockStreamingWriteRpc; +using ::google::cloud::golden_v1_internal::MockStreamingReadRpc; +using ::google::cloud::golden_v1_internal::MockStreamingWriteRpc; using ::google::cloud::testing_util::IsOk; using ::google::cloud::testing_util::StatusIs; using ::google::test::admin::database::v1::Request; @@ -325,6 +325,6 @@ TEST_F(LoggingDecoratorTest, AsyncStreamingWrite) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_metadata_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_metadata_decorator_test.cc index c63b80f80398..c8ffeb6059c5 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_metadata_decorator_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_metadata_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/api_client_header.h" #include "google/cloud/internal/async_streaming_read_rpc_impl.h" @@ -27,13 +27,13 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockGoldenKitchenSinkStub; -using ::google::cloud::golden_internal::MockStreamingReadRpc; -using ::google::cloud::golden_internal::MockStreamingWriteRpc; +using ::google::cloud::golden_v1_internal::MockGoldenKitchenSinkStub; +using ::google::cloud::golden_v1_internal::MockStreamingReadRpc; +using ::google::cloud::golden_v1_internal::MockStreamingWriteRpc; using ::google::cloud::testing_util::IsOk; using ::google::cloud::testing_util::StatusIs; using ::google::cloud::testing_util::ValidateMetadataFixture; @@ -475,6 +475,6 @@ TEST_F(MetadataDecoratorTest, ExplicitRoutingNestedField) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_option_defaults_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_option_defaults_test.cc index 2c3a357d2937..9a4e445bbb64 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_option_defaults_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_option_defaults_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/testing_util/scoped_environment.h" @@ -21,7 +21,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -82,6 +82,6 @@ TEST(GoldenKitchenSinkDefaultOptions, UserProjectOptionAndEnvVar) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_rest_logging_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_rest_logging_decorator_test.cc index 95152fd63199..18d40a8fd38c 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_rest_logging_decorator_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_rest_logging_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -23,7 +23,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -274,6 +274,6 @@ TEST(LoggingDecoratorRestTest, ExplicitRouting2Error) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_rest_metadata_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_rest_metadata_decorator_test.cc index f0b631b0ed1d..eb1bc9a9dd24 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_rest_metadata_decorator_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_rest_metadata_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/api_client_header.h" #include "google/cloud/testing_util/status_matchers.h" @@ -23,11 +23,11 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockGoldenKitchenSinkRestStub; +using ::google::cloud::golden_v1_internal::MockGoldenKitchenSinkRestStub; using ::testing::AnyOf; using ::testing::Contains; using ::testing::IsEmpty; @@ -348,6 +348,6 @@ TEST(KitchenSinkRestMetadataDecoratorTest, ExplicitRoutingNestedField) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc index 02828654ee11..320cbb660f42 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h" #include "google/cloud/common_options.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -22,7 +22,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -48,6 +48,6 @@ TEST(GoldenKitchenSinkRestStubFactoryTest, DefaultStubWithLogging) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_test.cc index 1bd52fac5d31..5ded69c1c2c7 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_rest_stub_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/testing_util/mock_http_payload.h" #include "google/cloud/testing_util/mock_rest_client.h" @@ -24,7 +24,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -269,6 +269,6 @@ TEST(GoldenKitchenSinkRestStubTest, ExplicitRouting2) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_round_robin_decorator_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_round_robin_decorator_test.cc index c3326976ccf2..052d9a18a18a 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_round_robin_decorator_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_round_robin_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_round_robin_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h" #include "google/cloud/testing_util/status_matchers.h" #include "generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h" #include @@ -20,7 +20,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -167,6 +167,6 @@ TEST(GoldenKitchenSinkRoundRobinDecoratorTest, AsyncStreamingWrite) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc index a890ac79985a..bdfd04ed8ea7 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h" #include "google/cloud/common_options.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -21,7 +21,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -68,6 +68,6 @@ TEST_F(GoldenKitchenSinkStubFactoryTest, DefaultStubWithAuth) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_kitchen_sink_stub_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_stub_test.cc index cd082af29db6..d8a5198390c2 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_stub_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_stub_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" #include "absl/memory/memory.h" @@ -23,7 +23,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -661,6 +661,6 @@ TEST_F(GoldenKitchenSinkStubTest, AsyncStreamingWrite) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_auth_decorator_test.cc b/generator/integration_tests/tests/golden_thing_admin_auth_decorator_test.cc index 4abf17c63c79..0387928aa9bf 100644 --- a/generator/integration_tests/tests/golden_thing_admin_auth_decorator_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_auth_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_auth_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h" #include "google/cloud/testing_util/mock_grpc_authentication_strategy.h" #include "google/cloud/testing_util/status_matchers.h" #include "generator/integration_tests/test.pb.h" @@ -22,7 +22,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -404,6 +404,6 @@ TEST(GoldenThingAdminAuthDecoratorTest, AsyncCancelOperation) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_client_test.cc b/generator/integration_tests/tests/golden_thing_admin_client_test.cc index 7c183e3cfdb0..ae16c3d29db4 100644 --- a/generator/integration_tests/tests/golden_thing_admin_client_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_client_test.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_thing_admin_client.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_client.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/internal/pagination_range.h" #include "google/cloud/internal/time_utils.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/status_matchers.h" -#include "generator/integration_tests/golden/golden_thing_admin_options.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" -#include "generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/mocks/mock_golden_thing_admin_connection.h" #include #include #include @@ -29,7 +29,7 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -42,13 +42,15 @@ using ::testing::HasSubstr; using ::testing::Not; TEST(GoldenThingAdminClientTest, CopyMoveEquality) { - auto conn1 = std::make_shared(); + auto conn1 = + std::make_shared(); EXPECT_CALL(*conn1, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); - auto conn2 = std::make_shared(); + auto conn2 = + std::make_shared(); EXPECT_CALL(*conn2, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); GoldenThingAdminClient c1(conn1); @@ -74,7 +76,8 @@ TEST(GoldenThingAdminClientTest, CopyMoveEquality) { } TEST(GoldenThingAdminClientTest, ListDatabases) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; EXPECT_CALL(*mock, options).WillRepeatedly([] { @@ -134,7 +137,8 @@ TEST(GoldenThingAdminClientTest, ListDatabases) { } TEST(GoldenThingAdminClientTest, CreateDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; std::string expected_database = @@ -197,7 +201,8 @@ TEST(GoldenThingAdminClientTest, CreateDatabase) { } TEST(GoldenThingAdminClientTest, GetDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { @@ -244,11 +249,12 @@ TEST(GoldenThingAdminClientTest, GetDatabase) { } TEST(GoldenThingAdminClientTest, UpdateDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, UpdateDatabaseDdl) .Times(2) @@ -279,11 +285,12 @@ TEST(GoldenThingAdminClientTest, UpdateDatabase) { } TEST(GoldenThingAdminClientTest, DropDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, DropDatabase) .Times(2) @@ -304,11 +311,12 @@ TEST(GoldenThingAdminClientTest, DropDatabase) { } TEST(GoldenThingAdminClientTest, GetDatabaseDdl) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetDatabaseDdl) .Times(2) @@ -333,11 +341,12 @@ TEST(GoldenThingAdminClientTest, GetDatabaseDdl) { } TEST(GoldenThingAdminClientTest, SetIamPolicy) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, SetIamPolicy) .Times(2) @@ -358,13 +367,14 @@ TEST(GoldenThingAdminClientTest, SetIamPolicy) { } TEST(GoldenThingAdminClientTest, SetIamPolicyUpdater) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; std::string etag_old = "\007\005\313\113\361\351\232\005"; std::string etag_new = "\007\005\313\113\366\143\244\343"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions( + return golden_v1_internal::GoldenThingAdminDefaultOptions( Options{} .set(TracingOptions().SetOptions( "truncate_string_field_longer_than=64")) @@ -424,11 +434,12 @@ TEST(GoldenThingAdminClientTest, SetIamPolicyUpdater) { } TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterGetFailure) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetIamPolicy) .WillOnce( @@ -448,12 +459,13 @@ TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterGetFailure) { } TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterCancelled) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; std::string etag_old = "\007\005\313\113\374\306\126\007"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetIamPolicy) .WillOnce([expected_database, @@ -474,12 +486,13 @@ TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterCancelled) { } TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterSetFailure) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; std::string etag_old = "\007\005\313\113\377\272\224\367"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetIamPolicy) .WillOnce([expected_database, @@ -508,14 +521,15 @@ TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterSetFailure) { } TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterRerun) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; std::string etag_old = "\007\005\313\114\002\240\006\225"; std::string etag_new = "\007\005\313\114\005\046\113\243"; std::string etag_rerun = "\007\005\313\114\007\252\023\045"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetIamPolicy) .WillOnce([expected_database, @@ -564,13 +578,14 @@ TEST(GoldenThingAdminClientTest, SetIamPolicyUpdaterRerun) { } TEST(GoldenThingAdminClientTest, GetIamPolicy) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; std::string const expected_role = "roles/spanner.databaseReader"; std::string const expected_member = "user:foobar@example.com"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetIamPolicy) .Times(2) @@ -601,12 +616,13 @@ TEST(GoldenThingAdminClientTest, GetIamPolicy) { } TEST(GoldenThingAdminClientTest, TestIamPermissions) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; std::string expected_permission = "spanner.databases.read"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, TestIamPermissions) .Times(2) @@ -636,7 +652,8 @@ TEST(GoldenThingAdminClientTest, TestIamPermissions) { } TEST(GoldenThingAdminClientTest, CreateBackup) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; std::string expected_database = @@ -647,7 +664,7 @@ TEST(GoldenThingAdminClientTest, CreateBackup) { std::chrono::system_clock::time_point expire_time = std::chrono::system_clock::now() + std::chrono::hours(7); EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, CreateBackup) .Times(2) @@ -690,11 +707,12 @@ TEST(GoldenThingAdminClientTest, CreateBackup) { } TEST(GoldenThingAdminClientTest, GetBackup) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_backup_name = "/projects/test-project/instances/test-instance/backups/test-backup"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, GetBackup) .Times(2) @@ -724,7 +742,8 @@ TEST(GoldenThingAdminClientTest, GetBackup) { } TEST(GoldenThingAdminClientTest, UpdateBackupExpireTime) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_backup_name = "/projects/test-project/instances/test-instance/backups/test-backup"; std::chrono::system_clock::time_point expire_time = @@ -732,7 +751,7 @@ TEST(GoldenThingAdminClientTest, UpdateBackupExpireTime) { auto proto_expire_time = google::cloud::internal::ToProtoTimestamp(expire_time); EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, UpdateBackup) .Times(2) @@ -777,11 +796,12 @@ TEST(GoldenThingAdminClientTest, UpdateBackupExpireTime) { } TEST(GoldenThingAdminClientTest, DeleteBackup) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_backup_name = "/projects/test-project/instances/test-instance/backups/test-backup"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, DeleteBackup) .Times(2) @@ -802,11 +822,12 @@ TEST(GoldenThingAdminClientTest, DeleteBackup) { } TEST(GoldenThingAdminClientTest, ListBackups) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, ListBackups) .Times(2) @@ -840,7 +861,8 @@ TEST(GoldenThingAdminClientTest, ListBackups) { } TEST(GoldenThingAdminClientTest, RestoreDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; std::string expected_database = @@ -848,7 +870,7 @@ TEST(GoldenThingAdminClientTest, RestoreDatabase) { std::string expected_backup_name = "/projects/test-project/instances/test-instance/backups/test-backup"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, RestoreDatabase) .Times(2) @@ -887,11 +909,12 @@ TEST(GoldenThingAdminClientTest, RestoreDatabase) { } TEST(GoldenThingAdminClientTest, ListDatabaseOperations) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, ListDatabaseOperations) .Times(2) @@ -928,11 +951,12 @@ TEST(GoldenThingAdminClientTest, ListDatabaseOperations) { } TEST(GoldenThingAdminClientTest, ListBackupOperations) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_instance = "/projects/test-project/instances/test-instance"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, ListBackupOperations) .Times(2) @@ -968,7 +992,8 @@ TEST(GoldenThingAdminClientTest, ListBackupOperations) { } TEST(GoldenThingAdminClientTest, AsyncGetDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { @@ -1017,11 +1042,12 @@ TEST(GoldenThingAdminClientTest, AsyncGetDatabase) { } TEST(GoldenThingAdminClientTest, AsyncDropDatabase) { - auto mock = std::make_shared(); + auto mock = + std::make_shared(); std::string expected_database = "/projects/test-project/instances/test-instance/databases/test-db"; EXPECT_CALL(*mock, options).WillRepeatedly([] { - return golden_internal::GoldenThingAdminDefaultOptions(Options{}); + return golden_v1_internal::GoldenThingAdminDefaultOptions(Options{}); }); EXPECT_CALL(*mock, AsyncDropDatabase) .Times(2) @@ -1043,6 +1069,6 @@ TEST(GoldenThingAdminClientTest, AsyncDropDatabase) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_connection_test.cc b/generator/integration_tests/tests/golden_thing_admin_connection_test.cc index f23c08295927..3bb7716ea820 100644 --- a/generator/integration_tests/tests/golden_thing_admin_connection_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_connection_test.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_thing_admin_connection.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h" #include "google/cloud/grpc_options.h" #include "google/cloud/polling_policy.h" #include "google/cloud/testing_util/async_sequencer.h" #include "google/cloud/testing_util/is_proto_equal.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" -#include "generator/integration_tests/golden/golden_thing_admin_options.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" #include "generator/integration_tests/tests/mock_golden_thing_admin_stub.h" #include #include @@ -29,14 +29,14 @@ namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::GoldenThingAdminConnectionImpl; -using ::google::cloud::golden_internal::GoldenThingAdminDefaultOptions; -using ::google::cloud::golden_internal::GoldenThingAdminStub; -using ::google::cloud::golden_internal::MockGoldenThingAdminStub; +using ::google::cloud::golden_v1_internal::GoldenThingAdminConnectionImpl; +using ::google::cloud::golden_v1_internal::GoldenThingAdminDefaultOptions; +using ::google::cloud::golden_v1_internal::GoldenThingAdminStub; +using ::google::cloud::golden_v1_internal::MockGoldenThingAdminStub; using ::google::cloud::testing_util::AsyncSequencer; using ::google::cloud::testing_util::IsProtoEqual; using ::google::cloud::testing_util::StatusIs; @@ -48,22 +48,23 @@ using ::testing::ElementsAre; using ::testing::HasSubstr; using ::testing::Return; -std::shared_ptr CreateTestingConnection( +std::shared_ptr CreateTestingConnection( std::shared_ptr mock) { - golden::GoldenThingAdminLimitedErrorCountRetryPolicy retry( + golden_v1::GoldenThingAdminLimitedErrorCountRetryPolicy retry( /*maximum_failures=*/2); ExponentialBackoffPolicy backoff( /*initial_delay=*/std::chrono::microseconds(1), /*maximum_delay=*/std::chrono::microseconds(1), /*scaling=*/2.0); - GenericPollingPolicy polling(retry, backoff); auto options = GoldenThingAdminDefaultOptions( Options{} - .set(retry.clone()) - .set(backoff.clone()) - .set(polling.clone())); + .set(retry.clone()) + .set(backoff.clone()) + .set( + polling.clone())); auto background = internal::MakeBackgroundThreadsFactory(options)(); return std::make_shared( std::move(background), std::move(mock), std::move(options)); @@ -1363,6 +1364,6 @@ TEST(GoldenThingAdminConnectionTest, CheckExpectedOptions) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_idempotency_policy_test.cc b/generator/integration_tests/tests/golden_thing_admin_idempotency_policy_test.cc index b96710604cce..ebfbe60cd786 100644 --- a/generator/integration_tests/tests/golden_thing_admin_idempotency_policy_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_idempotency_policy_test.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h" #include #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -28,10 +28,12 @@ namespace gtab = ::google::test::admin::database::v1; class GoldenIdempotencyPolicyTest : public ::testing::Test { protected: void SetUp() override { - policy_ = golden::MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy(); + policy_ = + golden_v1::MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy(); } - std::unique_ptr policy_; + std::unique_ptr + policy_; }; TEST_F(GoldenIdempotencyPolicyTest, ListDatabases) { @@ -121,6 +123,6 @@ TEST_F(GoldenIdempotencyPolicyTest, ListBackupOperations) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_logging_decorator_test.cc b/generator/integration_tests/tests/golden_thing_admin_logging_decorator_test.cc index 4d6af215007b..52833e612ae3 100644 --- a/generator/integration_tests/tests/golden_thing_admin_logging_decorator_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_logging_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h" #include "google/cloud/log.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -22,7 +22,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -386,6 +386,6 @@ TEST_F(LoggingDecoratorTest, CancelOperation) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_metadata_decorator_test.cc b/generator/integration_tests/tests/golden_thing_admin_metadata_decorator_test.cc index f2852ec7d658..2ec2e94d04dc 100644 --- a/generator/integration_tests/tests/golden_thing_admin_metadata_decorator_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_metadata_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h" #include "google/cloud/internal/api_client_header.h" #include "google/cloud/testing_util/status_matchers.h" #include "google/cloud/testing_util/validate_metadata.h" @@ -22,11 +22,11 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockGoldenThingAdminStub; +using ::google::cloud::golden_v1_internal::MockGoldenThingAdminStub; using ::google::cloud::testing_util::ValidateMetadataFixture; class MetadataDecoratorTest : public ::testing::Test { @@ -542,6 +542,6 @@ TEST_F(MetadataDecoratorTest, CancelOperation) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_option_defaults_test.cc b/generator/integration_tests/tests/golden_thing_admin_option_defaults_test.cc index c8b69408f640..1076f5ed757f 100644 --- a/generator/integration_tests/tests/golden_thing_admin_option_defaults_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_option_defaults_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" #include "google/cloud/common_options.h" #include "google/cloud/grpc_options.h" #include "google/cloud/testing_util/scoped_environment.h" @@ -21,7 +21,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -51,6 +51,6 @@ TEST(GoldenThingAdminDefaultOptions, OptionEndpoint) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_rest_logging_decorator_test.cc b/generator/integration_tests/tests/golden_thing_admin_rest_logging_decorator_test.cc index 2d5598726433..969081a5e89e 100644 --- a/generator/integration_tests/tests/golden_thing_admin_rest_logging_decorator_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_rest_logging_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_logging_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_logging_decorator.h" #include "google/cloud/log.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -22,7 +22,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -329,6 +329,6 @@ TEST(LoggingDecoratorRestTest, ListBackupOperations) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_rest_metadata_decorator_test.cc b/generator/integration_tests/tests/golden_thing_admin_rest_metadata_decorator_test.cc index a7090b33b5b2..0fb7f029828e 100644 --- a/generator/integration_tests/tests/golden_thing_admin_rest_metadata_decorator_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_rest_metadata_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_metadata_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.h" #include "google/cloud/common_options.h" #include "google/cloud/internal/api_client_header.h" #include "google/cloud/testing_util/status_matchers.h" @@ -23,11 +23,11 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -using ::google::cloud::golden_internal::MockGoldenThingAdminRestStub; +using ::google::cloud::golden_v1_internal::MockGoldenThingAdminRestStub; using ::testing::AllOf; using ::testing::Contains; using ::testing::HasSubstr; @@ -541,6 +541,6 @@ TEST(ThingAdminRestMetadataDecoratorTest, ListBackupOperations) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_rest_stub_factory_test.cc b/generator/integration_tests/tests/golden_thing_admin_rest_stub_factory_test.cc index aec20ac9b8a7..eb1958f4184f 100644 --- a/generator/integration_tests/tests/golden_thing_admin_rest_stub_factory_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_rest_stub_factory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub_factory.h" #include "google/cloud/common_options.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -21,7 +21,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -47,6 +47,6 @@ TEST(GoldenThingAdminRestStubFactoryTest, DefaultStubWithLogging) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_rest_stub_test.cc b/generator/integration_tests/tests/golden_thing_admin_rest_stub_test.cc index c8739c5943c8..4c1784b45dfc 100644 --- a/generator/integration_tests/tests/golden_thing_admin_rest_stub_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_rest_stub_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include "google/cloud/internal/rest_context.h" #include "google/cloud/testing_util/mock_http_payload.h" #include "google/cloud/testing_util/mock_rest_client.h" @@ -24,7 +24,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -647,6 +647,6 @@ TEST(GoldenThingAdminRestStubTest, ListBackupOperations) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_round_robin_decorator_test.cc b/generator/integration_tests/tests/golden_thing_admin_round_robin_decorator_test.cc index 71a49465b029..059a3cb923ee 100644 --- a/generator/integration_tests/tests/golden_thing_admin_round_robin_decorator_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_round_robin_decorator_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_round_robin_decorator.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_round_robin_decorator.h" #include "google/cloud/testing_util/status_matchers.h" #include "generator/integration_tests/tests/mock_golden_thing_admin_stub.h" #include @@ -20,7 +20,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -179,6 +179,6 @@ TEST(GoldenThingAdminRoundRobinDecoratorTest, AsyncCancelOperation) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc b/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc index 7ea62c5294d7..208d78dac68f 100644 --- a/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub_factory.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.h" #include "google/cloud/common_options.h" #include "google/cloud/testing_util/scoped_log.h" #include "google/cloud/testing_util/status_matchers.h" @@ -21,7 +21,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -71,6 +71,6 @@ TEST_F(GoldenStubFactoryTest, DefaultStubWithAuth) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/golden_thing_admin_stub_test.cc b/generator/integration_tests/tests/golden_thing_admin_stub_test.cc index 60fe4b9920e9..c2f5627c163d 100644 --- a/generator/integration_tests/tests/golden_thing_admin_stub_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_stub_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include "google/cloud/testing_util/mock_async_response_reader.h" #include "google/cloud/testing_util/mock_completion_queue_impl.h" #include "google/cloud/testing_util/status_matchers.h" @@ -21,7 +21,7 @@ namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -944,6 +944,6 @@ TEST_F(GoldenStubTest, AsyncCancelOperation) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/mock_golden_kitchen_sink_rest_stub.h b/generator/integration_tests/tests/mock_golden_kitchen_sink_rest_stub.h index b239162e43c1..5c7c1f1fec18 100644 --- a/generator/integration_tests/tests/mock_golden_kitchen_sink_rest_stub.h +++ b/generator/integration_tests/tests/mock_golden_kitchen_sink_rest_stub.h @@ -15,12 +15,12 @@ #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_KITCHEN_SINK_REST_STUB_H #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_KITCHEN_SINK_REST_STUB_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class MockGoldenKitchenSinkRestStub : public GoldenKitchenSinkRestStub { @@ -77,7 +77,7 @@ class MockGoldenKitchenSinkRestStub : public GoldenKitchenSinkRestStub { }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h b/generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h index 89724ccb7d7b..433866adfe1a 100644 --- a/generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h +++ b/generator/integration_tests/tests/mock_golden_kitchen_sink_stub.h @@ -15,12 +15,12 @@ #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_KITCHEN_SINK_STUB_H #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_KITCHEN_SINK_STUB_H -#include "generator/integration_tests/golden/internal/golden_kitchen_sink_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class MockGoldenKitchenSinkStub : public GoldenKitchenSinkStub { @@ -192,7 +192,7 @@ class MockAsyncStreamingWriteRpc }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/mock_golden_thing_admin_rest_stub.h b/generator/integration_tests/tests/mock_golden_thing_admin_rest_stub.h index e2550acbf1ff..a07192ca1bf7 100644 --- a/generator/integration_tests/tests/mock_golden_thing_admin_rest_stub.h +++ b/generator/integration_tests/tests/mock_golden_thing_admin_rest_stub.h @@ -15,16 +15,16 @@ #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_THING_ADMIN_REST_STUB_H #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_THING_ADMIN_REST_STUB_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_rest_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_stub.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class MockGoldenThingAdminRestStub - : public google::cloud::golden_internal::GoldenThingAdminRestStub { + : public google::cloud::golden_v1_internal::GoldenThingAdminRestStub { public: ~MockGoldenThingAdminRestStub() override = default; @@ -118,7 +118,7 @@ class MockGoldenThingAdminRestStub }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/mock_golden_thing_admin_stub.h b/generator/integration_tests/tests/mock_golden_thing_admin_stub.h index 3b36f37acb2b..08124e4a84fb 100644 --- a/generator/integration_tests/tests/mock_golden_thing_admin_stub.h +++ b/generator/integration_tests/tests/mock_golden_thing_admin_stub.h @@ -15,16 +15,16 @@ #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_THING_ADMIN_STUB_H #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_TESTS_MOCK_GOLDEN_THING_ADMIN_STUB_H -#include "generator/integration_tests/golden/internal/golden_thing_admin_stub.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h" #include namespace google { namespace cloud { -namespace golden_internal { +namespace golden_v1_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN class MockGoldenThingAdminStub - : public google::cloud::golden_internal::GoldenThingAdminStub { + : public google::cloud::golden_v1_internal::GoldenThingAdminStub { public: ~MockGoldenThingAdminStub() override = default; @@ -154,7 +154,7 @@ class MockGoldenThingAdminStub }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden_internal +} // namespace golden_v1_internal } // namespace cloud } // namespace google diff --git a/generator/integration_tests/tests/plumbing_test.cc b/generator/integration_tests/tests/plumbing_test.cc index fbc8edb9c580..6fe1cc2bfe72 100644 --- a/generator/integration_tests/tests/plumbing_test.cc +++ b/generator/integration_tests/tests/plumbing_test.cc @@ -15,17 +15,17 @@ #include "google/cloud/grpc_options.h" #include "google/cloud/testing_util/mock_backoff_policy.h" #include "google/cloud/testing_util/status_matchers.h" -#include "generator/integration_tests/golden/golden_thing_admin_client.h" -#include "generator/integration_tests/golden/golden_thing_admin_options.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h" -#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_client.h" +#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_connection_impl.h" +#include "generator/integration_tests/golden/v1/internal/golden_thing_admin_option_defaults.h" #include "generator/integration_tests/tests/mock_golden_thing_admin_stub.h" #include #include namespace google { namespace cloud { -namespace golden { +namespace golden_v1 { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { @@ -66,15 +66,16 @@ TEST(PlumbingTest, RetryLoopUsesPerCallPolicies) { return clone; }); - auto stub = std::make_shared(); + auto stub = std::make_shared(); EXPECT_CALL(*stub, GetDatabase) .WillOnce(Return(Status(StatusCode::kUnavailable, "try again"))) .WillOnce(Return(Status(StatusCode::kPermissionDenied, "fail"))); - auto options = golden_internal::GoldenThingAdminDefaultOptions({}); + auto options = golden_v1_internal::GoldenThingAdminDefaultOptions({}); auto background = internal::MakeBackgroundThreadsFactory(options)(); - auto conn = std::make_shared( - std::move(background), std::move(stub), std::move(options)); + auto conn = + std::make_shared( + std::move(background), std::move(stub), std::move(options)); auto client = GoldenThingAdminClient(std::move(conn)); (void)client.GetDatabase("name", std::move(call_options)); @@ -98,7 +99,7 @@ TEST(PlumbingTest, PollingLoopUsesPerCallPolicies) { return clone; }); - auto stub = std::make_shared(); + auto stub = std::make_shared(); EXPECT_CALL(*stub, AsyncCreateDatabase) .WillOnce([](CompletionQueue&, std::unique_ptr, ::google::test::admin::database::v1:: @@ -117,10 +118,11 @@ TEST(PlumbingTest, PollingLoopUsesPerCallPolicies) { return make_ready_future(make_status_or(op)); }); - auto options = golden_internal::GoldenThingAdminDefaultOptions({}); + auto options = golden_v1_internal::GoldenThingAdminDefaultOptions({}); auto background = internal::MakeBackgroundThreadsFactory(options)(); - auto conn = std::make_shared( - std::move(background), std::move(stub), std::move(options)); + auto conn = + std::make_shared( + std::move(background), std::move(stub), std::move(options)); auto client = GoldenThingAdminClient(std::move(conn)); (void)client.CreateDatabase({}, std::move(call_options)); @@ -128,6 +130,6 @@ TEST(PlumbingTest, PollingLoopUsesPerCallPolicies) { } // namespace GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END -} // namespace golden +} // namespace golden_v1 } // namespace cloud } // namespace google