impl(GCS+gRPC): by default use gRPC for metadata (#11712)

coryan · web-flow · commit c6c3f0116742 · 2023-05-23T20:34:51.000-04:00
diff --git a/google/cloud/storage/grpc_plugin.cc b/google/cloud/storage/grpc_plugin.cc
@@ -26,10 +26,10 @@ google::cloud::storage::Client DefaultGrpcClient(Options opts) {
   using ::google::cloud::internal::GetEnv;
   auto const config = GetEnv("GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG")
                           .value_or(opts.get<GrpcPluginOption>());
-  if (config == "none" || config.empty()) {
+  if (config == "none") {
     return google::cloud::storage::Client(std::move(opts));
   }
-  if (config == "metadata") {
+  if (config == "metadata" || config.empty()) {
     opts = google::cloud::storage_internal::DefaultOptionsGrpc(std::move(opts));
     return storage::internal::ClientImplDetails::CreateClient(
         storage_internal::GrpcClient::Create(opts));
diff --git a/google/cloud/storage/grpc_plugin_test.cc b/google/cloud/storage/grpc_plugin_test.cc
@@ -76,7 +76,7 @@ TEST(GrpcPluginTest, EnvironmentOverrides) {
   ASSERT_THAT(grpc, IsNull());
 }
 
-TEST(GrpcPluginTest, UnsetConfigCreatesCurl) {
+TEST(GrpcPluginTest, UnsetConfigCreatesMetadata) {
   // Explicitly disable logging, which may be enabled by our CI builds.
   auto logging =
       ScopedEnvironment("CLOUD_STORAGE_ENABLE_TRACING", absl::nullopt);
@@ -86,8 +86,8 @@ TEST(GrpcPluginTest, UnsetConfigCreatesCurl) {
   auto const* const retry =
       dynamic_cast<RetryClient*>(ClientImplDetails::GetRawClient(client).get());
   ASSERT_THAT(retry, NotNull());
-  auto const* const rest = dynamic_cast<RestClient*>(retry->client().get());
-  ASSERT_THAT(rest, NotNull());
+  auto const* const grpc = dynamic_cast<GrpcClient*>(retry->client().get());
+  ASSERT_THAT(grpc, NotNull());
 }
 
 TEST(GrpcPluginTest, NoneConfigCreatesCurl) {
diff --git a/google/cloud/storage/tests/BUILD.bazel b/google/cloud/storage/tests/BUILD.bazel
@@ -35,9 +35,9 @@ cc_proto_library(
 )
 
 VARIATIONS = {
-    "default": {},
+    "default": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": "none"},
     "grpc-media": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": "media"},
-    "grpc-metadata": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": "metadata"},
+    "grpc-metadata": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": ""},
     "legacy-http": {"GOOGLE_CLOUD_CPP_STORAGE_USE_LEGACY_HTTP": "yes"},
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ cc_proto_library(`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`VARIATIONS = {`
`38`		`- "default": {},`
	`38`	`+ "default": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": "none"},`
`39`	`39`	`"grpc-media": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": "media"},`
`40`		`- "grpc-metadata": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": "metadata"},`
	`40`	`+ "grpc-metadata": {"GOOGLE_CLOUD_CPP_STORAGE_GRPC_CONFIG": ""},`
`41`	`41`	`"legacy-http": {"GOOGLE_CLOUD_CPP_STORAGE_USE_LEGACY_HTTP": "yes"},`
`42`	`42`	`}`
`43`	`43`