fix: add implicit routing in GAPICs

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc

@@ -42,7 +42,7 @@ StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse>
 GoldenKitchenSinkMetadata::GenerateAccessToken(
     grpc::ClientContext& context,
     google::test::admin::database::v1::GenerateAccessTokenRequest const& request) {
-  SetMetadata(context, absl::StrCat("name=", request.name()));
+  SetMetadata(context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->GenerateAccessToken(context, request);
 }
 
@@ -66,15 +66,15 @@ StatusOr<google::test::admin::database::v1::ListLogsResponse>
 GoldenKitchenSinkMetadata::ListLogs(
     grpc::ClientContext& context,
     google::test::admin::database::v1::ListLogsRequest const& request) {
-  SetMetadata(context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->ListLogs(context, request);
 }
 
 StatusOr<google::test::admin::database::v1::ListServiceAccountKeysResponse>
 GoldenKitchenSinkMetadata::ListServiceAccountKeys(
     grpc::ClientContext& context,
     google::test::admin::database::v1::ListServiceAccountKeysRequest const& request) {
-  SetMetadata(context, absl::StrCat("name=", request.name()));
+  SetMetadata(context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->ListServiceAccountKeys(context, request);
 }
 

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h

@@ -20,6 +20,7 @@
 #define GOOGLE_CLOUD_CPP_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/internal/url_encode.h"
 #include "google/cloud/version.h"
 #include <map>
 #include <memory>

generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc

@@ -42,7 +42,7 @@ StatusOr<google::test::admin::database::v1::ListDatabasesResponse>
 GoldenThingAdminMetadata::ListDatabases(
     grpc::ClientContext& context,
     google::test::admin::database::v1::ListDatabasesRequest const& request) {
-  SetMetadata(context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->ListDatabases(context, request);
 }
 
@@ -51,15 +51,15 @@ GoldenThingAdminMetadata::AsyncCreateDatabase(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::test::admin::database::v1::CreateDatabaseRequest const& request) {
-  SetMetadata(*context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(*context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->AsyncCreateDatabase(cq, std::move(context), request);
 }
 
 StatusOr<google::test::admin::database::v1::Database>
 GoldenThingAdminMetadata::GetDatabase(
     grpc::ClientContext& context,
     google::test::admin::database::v1::GetDatabaseRequest const& request) {
-  SetMetadata(context, absl::StrCat("name=", request.name()));
+  SetMetadata(context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->GetDatabase(context, request);
 }
 
@@ -68,7 +68,7 @@ GoldenThingAdminMetadata::AsyncUpdateDatabaseDdl(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::test::admin::database::v1::UpdateDatabaseDdlRequest const& request) {
-  SetMetadata(*context, absl::StrCat("database=", request.database()));
+  SetMetadata(*context, absl::StrCat("database=", internal::UrlEncode(request.database())));
   return child_->AsyncUpdateDatabaseDdl(cq, std::move(context), request);
 }
 
@@ -124,31 +124,31 @@ StatusOr<google::test::admin::database::v1::GetDatabaseDdlResponse>
 GoldenThingAdminMetadata::GetDatabaseDdl(
     grpc::ClientContext& context,
     google::test::admin::database::v1::GetDatabaseDdlRequest const& request) {
-  SetMetadata(context, absl::StrCat("database=", request.database()));
+  SetMetadata(context, absl::StrCat("database=", internal::UrlEncode(request.database())));
   return child_->GetDatabaseDdl(context, request);
 }
 
 StatusOr<google::iam::v1::Policy>
 GoldenThingAdminMetadata::SetIamPolicy(
     grpc::ClientContext& context,
     google::iam::v1::SetIamPolicyRequest const& request) {
-  SetMetadata(context, absl::StrCat("resource=", request.resource()));
+  SetMetadata(context, absl::StrCat("resource=", internal::UrlEncode(request.resource())));
   return child_->SetIamPolicy(context, request);
 }
 
 StatusOr<google::iam::v1::Policy>
 GoldenThingAdminMetadata::GetIamPolicy(
     grpc::ClientContext& context,
     google::iam::v1::GetIamPolicyRequest const& request) {
-  SetMetadata(context, absl::StrCat("resource=", request.resource()));
+  SetMetadata(context, absl::StrCat("resource=", internal::UrlEncode(request.resource())));
   return child_->GetIamPolicy(context, request);
 }
 
 StatusOr<google::iam::v1::TestIamPermissionsResponse>
 GoldenThingAdminMetadata::TestIamPermissions(
     grpc::ClientContext& context,
     google::iam::v1::TestIamPermissionsRequest const& request) {
-  SetMetadata(context, absl::StrCat("resource=", request.resource()));
+  SetMetadata(context, absl::StrCat("resource=", internal::UrlEncode(request.resource())));
   return child_->TestIamPermissions(context, request);
 }
 
@@ -157,39 +157,39 @@ GoldenThingAdminMetadata::AsyncCreateBackup(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::test::admin::database::v1::CreateBackupRequest const& request) {
-  SetMetadata(*context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(*context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->AsyncCreateBackup(cq, std::move(context), request);
 }
 
 StatusOr<google::test::admin::database::v1::Backup>
 GoldenThingAdminMetadata::GetBackup(
     grpc::ClientContext& context,
     google::test::admin::database::v1::GetBackupRequest const& request) {
-  SetMetadata(context, absl::StrCat("name=", request.name()));
+  SetMetadata(context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->GetBackup(context, request);
 }
 
 StatusOr<google::test::admin::database::v1::Backup>
 GoldenThingAdminMetadata::UpdateBackup(
     grpc::ClientContext& context,
     google::test::admin::database::v1::UpdateBackupRequest const& request) {
-  SetMetadata(context, absl::StrCat("backup.name=", request.backup().name()));
+  SetMetadata(context, absl::StrCat("backup.name=", internal::UrlEncode(request.backup().name())));
   return child_->UpdateBackup(context, request);
 }
 
 Status
 GoldenThingAdminMetadata::DeleteBackup(
     grpc::ClientContext& context,
     google::test::admin::database::v1::DeleteBackupRequest const& request) {
-  SetMetadata(context, absl::StrCat("name=", request.name()));
+  SetMetadata(context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->DeleteBackup(context, request);
 }
 
 StatusOr<google::test::admin::database::v1::ListBackupsResponse>
 GoldenThingAdminMetadata::ListBackups(
     grpc::ClientContext& context,
     google::test::admin::database::v1::ListBackupsRequest const& request) {
-  SetMetadata(context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->ListBackups(context, request);
 }
 
@@ -198,23 +198,23 @@ GoldenThingAdminMetadata::AsyncRestoreDatabase(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::test::admin::database::v1::RestoreDatabaseRequest const& request) {
-  SetMetadata(*context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(*context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->AsyncRestoreDatabase(cq, std::move(context), request);
 }
 
 StatusOr<google::test::admin::database::v1::ListDatabaseOperationsResponse>
 GoldenThingAdminMetadata::ListDatabaseOperations(
     grpc::ClientContext& context,
     google::test::admin::database::v1::ListDatabaseOperationsRequest const& request) {
-  SetMetadata(context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->ListDatabaseOperations(context, request);
 }
 
 StatusOr<google::test::admin::database::v1::ListBackupOperationsResponse>
 GoldenThingAdminMetadata::ListBackupOperations(
     grpc::ClientContext& context,
     google::test::admin::database::v1::ListBackupOperationsRequest const& request) {
-  SetMetadata(context, absl::StrCat("parent=", request.parent()));
+  SetMetadata(context, absl::StrCat("parent=", internal::UrlEncode(request.parent())));
   return child_->ListBackupOperations(context, request);
 }
 
@@ -232,7 +232,7 @@ GoldenThingAdminMetadata::AsyncGetDatabase(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::test::admin::database::v1::GetDatabaseRequest const& request) {
-  SetMetadata(*context, absl::StrCat("name=", request.name()));
+  SetMetadata(*context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->AsyncGetDatabase(cq, std::move(context), request);
 }
 
@@ -290,15 +290,15 @@ GoldenThingAdminMetadata::AsyncGetOperation(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::longrunning::GetOperationRequest const& request) {
-  SetMetadata(*context, "name=" + request.name());
+  SetMetadata(*context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->AsyncGetOperation(cq, std::move(context), request);
 }
 
 future<Status> GoldenThingAdminMetadata::AsyncCancelOperation(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::longrunning::CancelOperationRequest const& request) {
-  SetMetadata(*context, "name=" + request.name());
+   SetMetadata(*context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->AsyncCancelOperation(cq, std::move(context), request);
 }
 

generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.h

@@ -20,6 +20,7 @@
 #define GOOGLE_CLOUD_CPP_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/internal/url_encode.h"
 #include "google/cloud/version.h"
 #include <google/longrunning/operations.grpc.pb.h>
 #include <map>

generator/internal/descriptor_utils_test.cc

@@ -835,9 +835,9 @@ INSTANTIATE_TEST_SUITE_P(
         MethodVarsTestValues("google.protobuf.Service.Method2",
                              "longrunning_deduced_response_type",
                              "google::protobuf::Bar"),
-        MethodVarsTestValues("google.protobuf.Service.Method2",
-                             "method_request_params",
-                             "\"parent=\", request.parent()"),
+        MethodVarsTestValues(
+            "google.protobuf.Service.Method2", "method_request_params",
+            "\"parent=\", internal::UrlEncode(request.parent())"),
         MethodVarsTestValues("google.protobuf.Service.Method2", "idempotency",
                              "kNonIdempotent"),
         MethodVarsTestValues("google.protobuf.Service.Method2",
@@ -856,9 +856,9 @@ INSTANTIATE_TEST_SUITE_P(
         MethodVarsTestValues("google.protobuf.Service.Method3",
                              "longrunning_deduced_response_type",
                              "google::protobuf::Struct"),
-        MethodVarsTestValues("google.protobuf.Service.Method3",
-                             "method_request_params",
-                             "\"parent=\", request.parent()"),
+        MethodVarsTestValues(
+            "google.protobuf.Service.Method3", "method_request_params",
+            "\"parent=\", internal::UrlEncode(request.parent())"),
         MethodVarsTestValues("google.protobuf.Service.Method3", "idempotency",
                              "kIdempotent"),
         MethodVarsTestValues("google.protobuf.Service.Method3",
@@ -871,7 +871,7 @@ INSTANTIATE_TEST_SUITE_P(
                              "range_output_type", "google::protobuf::Bar"),
         MethodVarsTestValues("google.protobuf.Service.Method4",
                              "method_request_params",
-                             "\"name=\", request.name()"),
+                             "\"name=\", internal::UrlEncode(request.name())"),
         MethodVarsTestValues("google.protobuf.Service.Method4", "idempotency",
                              "kNonIdempotent"),
         // Method5
@@ -901,9 +901,9 @@ INSTANTIATE_TEST_SUITE_P(
                              "method_request_setters1",
                              "  request.set_number(number);\n"
                              "  *request.mutable_widget() = widget;\n"),
-        MethodVarsTestValues("google.protobuf.Service.Method5",
-                             "method_request_params",
-                             "\"parent=\", request.parent()"),
+        MethodVarsTestValues(
+            "google.protobuf.Service.Method5", "method_request_params",
+            "\"parent=\", internal::UrlEncode(request.parent())"),
         MethodVarsTestValues("google.protobuf.Service.Method5",
                              "method_request_body", "*"),
         MethodVarsTestValues("google.protobuf.Service.Method5", "idempotency",
@@ -914,7 +914,7 @@ INSTANTIATE_TEST_SUITE_P(
         // Method6
         MethodVarsTestValues("google.protobuf.Service.Method6",
                              "method_request_params",
-                             "\"name=\", request.name()"),
+                             "\"name=\", internal::UrlEncode(request.name())"),
         MethodVarsTestValues("google.protobuf.Service.Method6", "idempotency",
                              "kIdempotent"),
         MethodVarsTestValues(
@@ -953,7 +953,8 @@ INSTANTIATE_TEST_SUITE_P(
                              "  *request.mutable_namespace_() = namespace_;\n"),
         MethodVarsTestValues(
             "google.protobuf.Service.Method8", "method_request_params",
-            "\"namespace.name=\", request.namespace_().name()"),
+            "\"namespace.name=\", "
+            "internal::UrlEncode(request.namespace_().name())"),
         MethodVarsTestValues("google.protobuf.Service.Method8",
                              "request_resource", "request.namespace_()"),
         MethodVarsTestValues(

generator/internal/http_option_utils.cc

@@ -109,9 +109,10 @@ void SetHttpDerivedMethodVars(
       method_vars["method_request_params"] = absl::StrJoin(
           info.field_substitutions, ", \"&\",",
           [&](std::string* out, std::pair<std::string, std::string> const& p) {
-            out->append(absl::StrFormat(
-                "\"%s=\", request.%s()", internal::UrlEncode(p.first),
-                FormatFieldAccessorCall(method, p.first)));
+            out->append(
+                absl::StrFormat("\"%s=\", internal::UrlEncode(request.%s())",
+                                internal::UrlEncode(p.first),
+                                FormatFieldAccessorCall(method, p.first)));
           });
       method_vars["method_request_body"] = info.body;
       method_vars["method_http_verb"] = info.http_verb;

generator/internal/http_option_utils_test.cc

@@ -425,7 +425,7 @@ TEST_F(HttpOptionUtilsTest, SetHttpDerivedMethodVarsExtensionInfoSingleParam) {
   VarsDictionary vars;
   SetHttpDerivedMethodVars(ParseHttpExtension(*method), *method, vars);
   EXPECT_THAT(vars.at("method_request_params"),
-              Eq("\"parent=\", request.parent()"));
+              Eq("\"parent=\", internal::UrlEncode(request.parent())"));
   EXPECT_THAT(vars.at("method_request_body"), Eq("*"));
   EXPECT_THAT(vars.at("method_http_verb"), Eq("Post"));
   EXPECT_THAT(
@@ -442,8 +442,9 @@ TEST_F(HttpOptionUtilsTest,
   VarsDictionary vars;
   SetHttpDerivedMethodVars(ParseHttpExtension(*method), *method, vars);
   EXPECT_THAT(vars.at("method_request_params"),
-              Eq("\"project=\", request.project(), \"&\",\"instance=\", "
-                 "request.instance()"));
+              Eq("\"project=\", internal::UrlEncode(request.project()), "
+                 "\"&\",\"instance=\", "
+                 "internal::UrlEncode(request.instance())"));
   EXPECT_THAT(vars.at("method_request_body"), Eq("*"));
   EXPECT_THAT(vars.at("method_http_verb"), Eq("Post"));
   EXPECT_THAT(

generator/internal/metadata_decorator_generator.cc

@@ -123,7 +123,8 @@ Status MetadataDecoratorGenerator::GenerateHeader() {
 
   // includes
   HeaderPrint("\n");
-  HeaderLocalIncludes({vars("stub_header_path"), "google/cloud/version.h"});
+  HeaderLocalIncludes({vars("stub_header_path"), "google/cloud/version.h",
+                       "google/cloud/internal/url_encode.h"});
   HeaderSystemIncludes(
       {HasLongrunningMethod() ? "google/longrunning/operations.grpc.pb.h" : "",
        "map", "memory", "string"});
@@ -346,15 +347,15 @@ future<StatusOr<google::longrunning::Operation>>
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::longrunning::GetOperationRequest const& request) {
-  SetMetadata(*context, "name=" + request.name());
+  SetMetadata(*context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->AsyncGetOperation(cq, std::move(context), request);
 }
 
 future<Status> $metadata_class_name$::AsyncCancelOperation(
     google::cloud::CompletionQueue& cq,
     std::shared_ptr<grpc::ClientContext> context,
     google::longrunning::CancelOperationRequest const& request) {
-  SetMetadata(*context, "name=" + request.name());
+   SetMetadata(*context, absl::StrCat("name=", internal::UrlEncode(request.name())));
   return child_->AsyncCancelOperation(cq, std::move(context), request);
 }
 )""");