From 80403036a665cb8fcc1a1b3e17593d20b03b2489 Mon Sep 17 00:00:00 2001
From: Darren Bolduc <dbolduc@google.com>
Date: Fri, 2 Feb 2024 21:39:16 +0000
Subject: [PATCH] [google-cloud-cpp] update to the latest release (v2.21.0)
 (#36522)

* [google-cloud-cpp] update to the latest release (v2.21.0)

* rerun version thingy

* rerun version thingy again
---
 ports/google-cloud-cpp/portfile.cmake | 31 +++++++++++++--------------
 ports/google-cloud-cpp/vcpkg.json     | 15 +++++++++++--
 versions/baseline.json                |  4 ++--
 versions/g-/google-cloud-cpp.json     |  5 +++++
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 3d5cf10a4a8c99..a9b68e5c37ffe8 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO googleapis/google-cloud-cpp
     REF "v${VERSION}"
-    SHA512 f017252b3fbccd5b91088a00c98a610606c5e98b920bf6c0889b6bf0f33f923c38a6116df7d9784381fd6b81ff4c303f55a609fde2e7182958a3c9cbab1f9f47
+    SHA512 f02e26964a4049791bf4ce9580e738f245fb8380f9a1ccf3bd193296a4877aece72e8507efbbcabf7ef7072a810f6632c399748d804e33f3cc769ef49e334a88
     HEAD_REF main
     PATCHES
         support_absl_cxx17.patch
@@ -53,28 +53,27 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-foreach(feature IN LISTS FEATURES)
-    set(config_path "lib/cmake/google_cloud_cpp_${feature}")
-    # Most features get their own package in `google-cloud-cpp`.
-    # The exceptions are captured by this `if()` command, basically
-    # things like `core` and `experimental-storage-grpc` are skipped.
+
+function (google_cloud_cpp_cmake_config_fixup library)
+    set(config_path "lib/cmake/google_cloud_cpp_${library}")
+    # If the library exists and is installed, tell vcpkg about it.
     if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
-        continue()
+        return()
     endif()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}"
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${library}"
                              CONFIG_PATH "${config_path}"
                              DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endfunction ()
+
+foreach(feature IN LISTS GOOGLE_CLOUD_CPP_ENABLE)
+    google_cloud_cpp_cmake_config_fixup(${feature})
+    google_cloud_cpp_cmake_config_fixup(${feature}_mocks)
 endforeach()
+
 # These packages are automatically installed depending on what features are
 # enabled.
-foreach(suffix common compute_protos googleapis grpc_utils iam_v2 logging_type rest_internal rest_protobuf_internal dialogflow_cx dialogflow_es)
-    set(config_path "lib/cmake/google_cloud_cpp_${suffix}")
-    if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
-        continue()
-    endif()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}"
-                             CONFIG_PATH "${config_path}"
-                             DO_NOT_DELETE_PARENT_CONFIG_PATH)
+foreach(feature common compute_protos googleapis grpc_utils iam_v2 logging_type rest_internal rest_protobuf_internal)
+    google_cloud_cpp_cmake_config_fixup(${feature})
 endforeach()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
index 486358971395ee..e572ef9cd70457 100644
--- a/ports/google-cloud-cpp/vcpkg.json
+++ b/ports/google-cloud-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "google-cloud-cpp",
-  "version": "2.20.0",
-  "port-version": 1,
+  "version": "2.21.0",
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
@@ -1205,6 +1204,18 @@
         }
       ]
     },
+    "servicehealth": {
+      "description": "Personalized Service Health API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "servicemanagement": {
       "description": "Service Management API C++ Client Library",
       "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 996b996e7c53d9..171be980392fea 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3081,8 +3081,8 @@
       "port-version": 7
     },
     "google-cloud-cpp": {
-      "baseline": "2.20.0",
-      "port-version": 1
+      "baseline": "2.21.0",
+      "port-version": 0
     },
     "google-cloud-cpp-common": {
       "baseline": "alias",
diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json
index 2fb80816ccd0ac..b8dc298e34f6bd 100644
--- a/versions/g-/google-cloud-cpp.json
+++ b/versions/g-/google-cloud-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d8f3be8b308c4858ec0226b7aebe1e55a21298f4",
+      "version": "2.21.0",
+      "port-version": 0
+    },
     {
       "git-tree": "363eb6725f35aaefdbd1da17ab0a3d1bd93e90cd",
       "version": "2.20.0",