build and quickstart updates

googleapis · Dec 11, 2024 · 20b1a94 · 20b1a94
1 parent 8035e48
commit 20b1a94
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/google/cloud/gkeconnect/BUILD.bazel b/google/cloud/gkeconnect/BUILD.bazel
@@ -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,
 )
diff --git a/google/cloud/gkeconnect/CMakeLists.txt b/google/cloud/gkeconnect/CMakeLists.txt
@@ -17,11 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(gkeconnect "Connect Gateway API"
-<<<<<<< HEAD
-                                   SERVICE_DIRS "gateway/v1/")
-=======
                                    REST_TRANSPORT SERVICE_DIRS "gateway/v1/")
->>>>>>> b81a9d7c33 (update CMakeLists.txt)
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(gkeconnect_quickstart "quickstart/quickstart.cc")

diff --git a/google/cloud/gkeconnect/README.md b/google/cloud/gkeconnect/README.md
@@ -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]);

diff --git a/google/cloud/gkeconnect/quickstart/quickstart.cc b/google/cloud/gkeconnect/quickstart/quickstart.cc
@@ -14,6 +14,7 @@
 
 //! [all]
 #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>
 
@@ -28,7 +29,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]);