refactor(generator): use common version and inline namespace for generated code (#5174)

* refactor(generator): use common version and inline namespace for generated code

Author: scotthart

generator/integration_tests/golden/BUILD

@@ -23,9 +23,6 @@ filegroup(
     srcs = [
         "connection_options.gcpcxx.pb.cc",
         "connection_options.gcpcxx.pb.h",
-        "version.cc",
-        "version.h",
-        "version_info.h",
     ],
 )
 

generator/integration_tests/golden/CMakeLists.txt

@@ -25,10 +25,7 @@ set(google_cloud_cpp_generator_golden_files
     internal/database_admin_stub.gcpcxx.pb.cc
     internal/database_admin_stub.gcpcxx.pb.h
     internal/database_admin_stub_factory.gcpcxx.pb.cc
-    internal/database_admin_stub_factory.gcpcxx.pb.h
-    version.cc
-    version.h
-    version_info.h)
+    internal/database_admin_stub_factory.gcpcxx.pb.h)
 
 # Export the list of golden files to a .bzl file so we do not need to maintain
 # the list in multiple places.
@@ -47,10 +44,7 @@ add_library(
     internal/database_admin_stub.gcpcxx.pb.cc
     internal/database_admin_stub.gcpcxx.pb.h
     internal/database_admin_stub_factory.gcpcxx.pb.cc
-    internal/database_admin_stub_factory.gcpcxx.pb.h
-    version.cc
-    version.h
-    version_info.h)
+    internal/database_admin_stub_factory.gcpcxx.pb.h)
 
 target_include_directories(
     google_cloud_cpp_generator_golden_lib

generator/integration_tests/golden/connection_options.gcpcxx.pb.cc

@@ -17,30 +17,25 @@
 // source: generator/integration_tests/test.proto
 
 #include "generator/integration_tests/golden/connection_options.gcpcxx.pb.h"
-#include "absl/strings/str_cat.h"
-#include "google/cloud/internal/compiler_info.h"
+#include "google/cloud/internal/user_agent_prefix.h"
 #include <string>
 
 namespace google {
 namespace cloud {
 namespace golden {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 
 std::string ConnectionOptionsTraits::default_endpoint() {
   return "test.googleapis.com";
 }
 
 std::string ConnectionOptionsTraits::user_agent_prefix() {
-  return absl::StrCat("gcloud-cpp/",
-         VersionString(), " (",
-         google::cloud::internal::CompilerId(),  "-",
-         google::cloud::internal::CompilerVersion(), "; ",
-         google::cloud::internal::CompilerFeatures(), ")");
+  return google::cloud::internal::UserAgentPrefix();
 }
 
 int ConnectionOptionsTraits::default_num_channels() { return 4; }
 
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/connection_options.gcpcxx.pb.h

@@ -18,14 +18,14 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_CONNECTION_OPTIONS_GCPCXX_PB_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_CONNECTION_OPTIONS_GCPCXX_PB_H
 
-#include "generator/integration_tests/golden/version.h"
 #include "google/cloud/connection_options.h"
+#include "google/cloud/version.h"
 #include <string>
 
 namespace google {
 namespace cloud {
 namespace golden {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 
 struct ConnectionOptionsTraits {
   static std::string default_endpoint();
@@ -36,7 +36,7 @@ struct ConnectionOptionsTraits {
 using ConnectionOptions =
   google::cloud::ConnectionOptions<ConnectionOptionsTraits>;
 
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/golden_connection_options_test.cc

@@ -19,7 +19,7 @@
 namespace google {
 namespace cloud {
 namespace golden {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 namespace {
 
 using ::testing::HasSubstr;
@@ -40,7 +40,7 @@ TEST(GoldenConnectionOptionsTest, DefaultNumChannels) {
 }
 
 }  // namespace
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/golden_logging_decorator_test.cc

@@ -21,7 +21,7 @@
 namespace google {
 namespace cloud {
 namespace golden_internal {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 namespace {
 
 using ::testing::_;
@@ -475,7 +475,7 @@ TEST_F(LoggingDecoratorTest, CancelOperation) {
 }
 
 }  // namespace
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden_internal
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/golden_metadata_decorator_test.cc

@@ -21,7 +21,7 @@
 namespace google {
 namespace cloud {
 namespace golden_internal {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 namespace {
 
 using ::google::cloud::testing_util::IsContextMDValid;
@@ -565,7 +565,7 @@ TEST_F(MetadataDecoratorTest, CancelOperation) {
 }
 
 }  // namespace
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden_internal
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/golden_stub_factory_test.cc

@@ -20,7 +20,7 @@
 namespace google {
 namespace cloud {
 namespace golden_internal {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 namespace {
 
 using ::testing::HasSubstr;
@@ -64,7 +64,7 @@ TEST_F(GoldenStubFactoryTest, DefaultStubWithLogging) {
 }
 
 }  // namespace
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden_internal
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/golden_stub_test.cc

@@ -22,7 +22,7 @@ using ::testing::Return;
 namespace google {
 namespace cloud {
 namespace golden_internal {
-inline namespace GOLDEN_CLIENT_NS {
+inline namespace GOOGLE_CLOUD_CPP_NS {
 namespace {
 
 class MockGrpcDatabaseAdminStub
@@ -817,7 +817,7 @@ TEST_F(GoldenStubTest, CancelOperation) {
 }
 
 }  // namespace
-}  // namespace GOLDEN_CLIENT_NS
+}  // namespace GOOGLE_CLOUD_CPP_NS
 }  // namespace golden_internal
 }  // namespace cloud
 }  // namespace google

generator/integration_tests/golden/google_cloud_cpp_generator_golden_files.bzl

@@ -27,7 +27,4 @@ google_cloud_cpp_generator_golden_files = [
     "internal/database_admin_stub.gcpcxx.pb.h",
     "internal/database_admin_stub_factory.gcpcxx.pb.cc",
     "internal/database_admin_stub_factory.gcpcxx.pb.h",
-    "version.cc",
-    "version.h",
-    "version_info.h",
 ]