fix(gkeconnect): service only supports REST endpoint (#14897)

Author: scotthart

ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz

@@ -47,6 +47,8 @@ readonly SED_ARGS=(
   # The vcpkg maintainers introduced an `rpc` feature to just compile
   # `grpc-common`.
   -e '/^rpc$/d'
+  # TODO:(#14896) Skip gkeconnect as it transitions from grpc to REST transport.
+  -e '/^gkeconnect/d'
 )
 mapfile -t features < <(
   env -C "${vcpkg_dir}" ./vcpkg search google-cloud-cpp |

ci/cloudbuild/builds/quickstart-cmake.sh

@@ -376,6 +376,7 @@ macro (google_cloud_cpp_enable_cleanup)
         OR (bigquerycontrol IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         OR (compute IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         OR (experimental-bigquery_rest IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
+        OR (gkeconnect IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         OR (oauth2 IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         OR (opentelemetry IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         OR (sql IN_LIST GOOGLE_CLOUD_CPP_ENABLE)

cmake/GoogleCloudCppFeatures.cmake

@@ -2518,6 +2518,8 @@ service {
   product_path: "google/cloud/gkeconnect/gateway/v1"
   initial_copyright_year: "2024"
   retryable_status_codes: ["kUnavailable"]
+  generate_rest_transport: true
+  generate_grpc_transport: false
 }
 
 service {

generator/generator_config.textproto

@@ -26,6 +26,10 @@ googleapis_deps = [
 
 cc_gapic_library(
     name = "gkeconnect",
+    additional_deps = [
+        "//google/cloud:google_cloud_cpp_rest_internal",
+        "//google/cloud:google_cloud_cpp_rest_protobuf_internal",
+    ],
     googleapis_deps = googleapis_deps,
     service_dirs = service_dirs,
 )

google/cloud/gkeconnect/BUILD.bazel

@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(gkeconnect "Connect Gateway API"
-                                   SERVICE_DIRS "gateway/v1/")
+                                   REST_TRANSPORT SERVICE_DIRS "gateway/v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(gkeconnect_quickstart "quickstart/quickstart.cc")

google/cloud/gkeconnect/CMakeLists.txt

@@ -20,6 +20,7 @@ this library.
 
 ```cc
 #include "google/cloud/gkeconnect/gateway/v1/gateway_control_client.h"
+#include "google/cloud/gkeconnect/gateway/v1/gateway_control_rest_connection.h"
 #include "google/cloud/location.h"
 #include <iostream>
 
@@ -34,7 +35,7 @@ int main(int argc, char* argv[]) try {
 
   namespace gkeconnect = ::google::cloud::gkeconnect_gateway_v1;
   auto client = gkeconnect::GatewayControlClient(
-      gkeconnect::MakeGatewayControlConnection());
+      gkeconnect::MakeGatewayControlConnectionRest());
 
   google::cloud::gkeconnect::gateway::v1::GenerateCredentialsRequest request;
   request.set_name(location.FullName() + "/memberships/" + argv[3]);

google/cloud/gkeconnect/README.md

@@ -19,7 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_GATEWAY_CONTROL_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKECONNECT_GATEWAY_V1_GATEWAY_CONTROL_CLIENT_H
 
-#include "google/cloud/gkeconnect/gateway/v1/gateway_control_connection.h"
+#include "google/cloud/gkeconnect/gateway/v1/gateway_control_rest_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
 #include "google/cloud/polling_policy.h"

google/cloud/gkeconnect/gateway/v1/gateway_control_client.h

@@ -18,9 +18,7 @@
 
 #include "google/cloud/gkeconnect/gateway/v1/gateway_control_connection.h"
 #include "google/cloud/gkeconnect/gateway/v1/gateway_control_options.h"
-#include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_connection_impl.h"
 #include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_option_defaults.h"
-#include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_stub_factory.h"
 #include "google/cloud/gkeconnect/gateway/v1/internal/gateway_control_tracing_connection.h"
 #include "google/cloud/background_threads.h"
 #include "google/cloud/common_options.h"
@@ -43,24 +41,6 @@ GatewayControlConnection::GenerateCredentials(
   return Status(StatusCode::kUnimplemented, "not implemented");
 }
 
-std::shared_ptr<GatewayControlConnection> MakeGatewayControlConnection(
-    Options options) {
-  internal::CheckExpectedOptions<CommonOptionList, GrpcOptionList,
-                                 UnifiedCredentialsOptionList,
-                                 GatewayControlPolicyOptionList>(options,
-                                                                 __func__);
-  options = gkeconnect_gateway_v1_internal::GatewayControlDefaultOptions(
-      std::move(options));
-  auto background = internal::MakeBackgroundThreadsFactory(options)();
-  auto auth = internal::CreateAuthenticationStrategy(background->cq(), options);
-  auto stub = gkeconnect_gateway_v1_internal::CreateDefaultGatewayControlStub(
-      std::move(auth), options);
-  return gkeconnect_gateway_v1_internal::MakeGatewayControlTracingConnection(
-      std::make_shared<
-          gkeconnect_gateway_v1_internal::GatewayControlConnectionImpl>(
-          std::move(background), std::move(stub), std::move(options)));
-}
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace gkeconnect_gateway_v1
 }  // namespace cloud

google/cloud/gkeconnect/gateway/v1/gateway_control_connection.cc

@@ -188,30 +188,6 @@ class GatewayControlConnection {
           request);
 };
 
-/**
- * A factory function to construct an object of type `GatewayControlConnection`.
- *
- * The returned connection object should not be used directly; instead it
- * should be passed as an argument to the constructor of GatewayControlClient.
- *
- * The optional @p options argument may be used to configure aspects of the
- * returned `GatewayControlConnection`. Expected options are any of the types in
- * the following option lists:
- *
- * - `google::cloud::CommonOptionList`
- * - `google::cloud::GrpcOptionList`
- * - `google::cloud::UnifiedCredentialsOptionList`
- * - `google::cloud::gkeconnect_gateway_v1::GatewayControlPolicyOptionList`
- *
- * @note Unexpected options will be ignored. To log unexpected options instead,
- *     set `GOOGLE_CLOUD_CPP_ENABLE_CLOG=yes` in the environment.
- *
- * @param options (optional) Configure the `GatewayControlConnection` created by
- * this function.
- */
-std::shared_ptr<GatewayControlConnection> MakeGatewayControlConnection(
-    Options options = {});
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace gkeconnect_gateway_v1
 }  // namespace cloud