chore: prepare for v2.22.1

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,8 +11,7 @@ example, is this related to bigtable (i.e., something in
 `google/cloud/bigtable`), or GCS (i.e., something in `google/cloud/storage`)?
 
 **Is your feature request related to a problem? Please describe.** A clear and
-concise description of what the problem is. Ex. I'm always frustrated when
-\[...\]
+concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like** A clear and concise description of what you
 want to happen.

CHANGELOG.md

@@ -4,6 +4,8 @@
 breaking changes in the upcoming 3.x release. This release is scheduled for
 2024-12 or 2025-01.
 
+## v2.22.1 - TBD
+
 ## v2.22.0 - 2024-03
 
 ### New Libraries

CMakeLists.txt

@@ -21,9 +21,9 @@ set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues")
 
 project(
     google-cloud-cpp
-    VERSION 2.22.0
+    VERSION 2.22.1
     LANGUAGES CXX)
-set(PROJECT_VERSION_PRE_RELEASE "")
+set(PROJECT_VERSION_PRE_RELEASE "rc")
 
 if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "")
     set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}")

ci/cloudbuild/builds/checkers.sh

@@ -78,16 +78,6 @@ readonly TIMEFORMAT="... %R seconds"
 # https://github.com/googleapis/google-cloud-cpp/issues/4152
 enable -n printf
 
-# Check for typos first so we don't generate more new files w/ the same typos.
-printf "%-50s" "Running typos:" >&2
-time {
-  # See https://github.com/crate-ci/typos for more details.
-  # A couple useful invocations:
-  #  $ typos --write-changes  # writes spelling fixes back to disk
-  #  $ typos --dump-config -  # dumps effective config to stdout
-  typos
-}
-
 printf "%-50s" "Running check-include-guards:" >&2
 time {
   git_files -z -- '*.h' |

ci/cloudbuild/dockerfiles/checkers.Dockerfile

@@ -35,8 +35,6 @@ RUN dnf makecache && \
         python-pip \
         ShellCheck
 
-RUN cargo install typos-cli --version 1.16.1 --root /usr/local
-
 RUN curl -L -o /usr/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/v6.4.0/buildifier-linux-amd64 && \
     chmod 755 /usr/bin/buildifier
 

ci/cloudbuild/triggers/asan-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 45fd50c2-04f1-4674-b533-0db1346c8b7e
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: asan-pr
+name: v2-22-x-asan-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/45fd50c2-04f1-4674-b533-0db1346c8b7e
 substitutions:
   _BUILD_NAME: asan

ci/cloudbuild/triggers/bazel-oldest-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 3a7690ee-a385-4e86-835e-990a64eb71d7
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-oldest-ci
+name: v2-22-x-bazel-oldest-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3a7690ee-a385-4e86-835e-990a64eb71d7
 substitutions:
   _BUILD_NAME: bazel-oldest

ci/cloudbuild/triggers/bazel-oldest-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 914bc7a4-afa2-4faf-8a0e-571218e8fd83
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-oldest-pr
+name: v2-22-x-bazel-oldest-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/914bc7a4-afa2-4faf-8a0e-571218e8fd83
 substitutions:
   _BUILD_NAME: bazel-oldest

ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml

@@ -3,11 +3,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: abfbaa6f-e1a0-4298-af45-78f9dc1a9831
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-otel-abi-2-ci
+name: v2-22-x-bazel-otel-abi-2-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/abfbaa6f-e1a0-4298-af45-78f9dc1a9831
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2

ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml

@@ -3,11 +3,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 18b11d89-0625-40ba-897a-ac10462d1c7b
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-otel-abi-2-pr
+name: v2-22-x-bazel-otel-abi-2-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/18b11d89-0625-40ba-897a-ac10462d1c7b
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2

ci/cloudbuild/triggers/bazel-targets-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 1f63c286-589b-41cf-aee0-dd0e3cb6861c
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-targets-ci
+name: v2-22-x-bazel-targets-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/1f63c286-589b-41cf-aee0-dd0e3cb6861c
 substitutions:
   _BUILD_NAME: bazel-targets

ci/cloudbuild/triggers/bazel-targets-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 95e11a96-2138-4d65-8598-25308f1cf5f8
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-targets-pr
+name: v2-22-x-bazel-targets-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/95e11a96-2138-4d65-8598-25308f1cf5f8
 substitutions:
   _BUILD_NAME: bazel-targets

ci/cloudbuild/triggers/check-api-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 83b375fa-9209-4691-8dcc-a28f7a19dcf2
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: check-api-ci
+name: v2-22-x-check-api-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/83b375fa-9209-4691-8dcc-a28f7a19dcf2
 substitutions:
   _BUILD_NAME: check-api

ci/cloudbuild/triggers/check-api-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 9d4afe6c-48fc-4bc4-8b40-68312b2c0fec
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: check-api-pr
+name: v2-22-x-check-api-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/9d4afe6c-48fc-4bc4-8b40-68312b2c0fec
 substitutions:
   _BUILD_NAME: check-api

ci/cloudbuild/triggers/checkers-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 746bbc75-cdf8-4172-bb08-0c2335479a8b
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: checkers-pr
+name: v2-22-x-checkers-pr
 substitutions:
   _BUILD_NAME: checkers
   _DISTRO: checkers

ci/cloudbuild/triggers/clang-7-0-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: c9060166-f159-46c6-8ac9-4f256759fcb8
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-7-0-ci
+name: v2-22-x-clang-7-0-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/c9060166-f159-46c6-8ac9-4f256759fcb8
 substitutions:
   _BUILD_NAME: clang-7.0

ci/cloudbuild/triggers/clang-7-0-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 8a4c069a-53c0-49bf-ba31-5f3a3c228a42
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-7-0-pr
+name: v2-22-x-clang-7-0-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8a4c069a-53c0-49bf-ba31-5f3a3c228a42
 substitutions:
   _BUILD_NAME: clang-7.0

ci/cloudbuild/triggers/clang-cxx20-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: ed6fae7b-7ab3-44b9-b26b-d41de3926e16
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-cxx20-ci
+name: v2-22-x-clang-cxx20-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ed6fae7b-7ab3-44b9-b26b-d41de3926e16
 substitutions:
   _BUILD_NAME: clang-cxx20

ci/cloudbuild/triggers/clang-cxx20-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: b5fb032a-c06d-4369-b42d-98524085d402
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-cxx20-pr
+name: v2-22-x-clang-cxx20-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/b5fb032a-c06d-4369-b42d-98524085d402
 substitutions:
   _BUILD_NAME: clang-cxx20

ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 5ad8f0dd-38a8-4a40-aa81-925e0867fef6
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-bigquery-ci
+name: v2-22-x-clang-tidy-bigquery-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5ad8f0dd-38a8-4a40-aa81-925e0867fef6
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 94fbc973-ea4b-49e9-a1ce-db3994993675
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-bigquery-pr
+name: v2-22-x-clang-tidy-bigquery-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/94fbc973-ea4b-49e9-a1ce-db3994993675
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 88b3547a-7d8b-4af2-998f-e2ed284ebaaa
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-ci
+name: v2-22-x-clang-tidy-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/88b3547a-7d8b-4af2-998f-e2ed284ebaaa
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-compute.yaml

@@ -6,7 +6,7 @@ gitFileSource:
   revision: refs/heads/main
   uri: https://github.com/googleapis/google-cloud-cpp
 id: 6d247368-98d8-4b06-9179-afeedd054f50
-name: clang-tidy-compute
+name: v2-22-x-clang-tidy-compute
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6d247368-98d8-4b06-9179-afeedd054f50
 sourceToBuild:
   ref: refs/heads/main

ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 7bdca032-6ec4-4b7c-9c0b-d04bd19c2ba3
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-pubsub-ci
+name: v2-22-x-clang-tidy-pubsub-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7bdca032-6ec4-4b7c-9c0b-d04bd19c2ba3
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 47691835-f91f-42a3-92bf-7820c2eb34f2
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-pubsub-pr
+name: v2-22-x-clang-tidy-pubsub-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/47691835-f91f-42a3-92bf-7820c2eb34f2
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: dcb2a46a-01f9-4b02-8c34-79943099e25f
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-storage-ci
+name: v2-22-x-clang-tidy-storage-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/dcb2a46a-01f9-4b02-8c34-79943099e25f
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 163b45f9-e55c-48fb-948d-c1f4539f1524
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-storage-pr
+name: v2-22-x-clang-tidy-storage-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/163b45f9-e55c-48fb-948d-c1f4539f1524
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 8be80238-a508-43c4-a1c3-8ce285cbb571
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-tools-ci
+name: v2-22-x-clang-tidy-tools-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8be80238-a508-43c4-a1c3-8ce285cbb571
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: cb911c90-e6a6-4440-a1c9-0890cce4565f
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-tools-pr
+name: v2-22-x-clang-tidy-tools-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/cb911c90-e6a6-4440-a1c9-0890cce4565f
 substitutions:
   _BUILD_NAME: clang-tidy

ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 87c8300c-afd2-419e-b878-2e8ceb7a7496
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-gcs-rest-ci
+name: v2-22-x-cmake-gcs-rest-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/87c8300c-afd2-419e-b878-2e8ceb7a7496
 substitutions:
   _BUILD_NAME: cmake-gcs-rest