From e736b24608926479c22f8afff1fcaf9cd60a7476 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Sat, 3 Jan 2026 22:19:27 +0000 Subject: [PATCH 1/3] impl: remove deprecated retry_traits.h files --- doc/v3-migration-guide.md | 16 ++++++++++++++ google/cloud/bigquery/retry_traits.h | 21 ------------------ google/cloud/iam/retry_traits.h | 22 ------------------- google/cloud/spanner/admin/retry_traits.h | 22 ------------------- .../spanner/google_cloud_cpp_spanner.bzl | 1 - 5 files changed, 16 insertions(+), 66 deletions(-) delete mode 100644 google/cloud/bigquery/retry_traits.h delete mode 100644 google/cloud/iam/retry_traits.h delete mode 100644 google/cloud/spanner/admin/retry_traits.h diff --git a/doc/v3-migration-guide.md b/doc/v3-migration-guide.md index 9421abcddc5fc..76713afb12293 100644 --- a/doc/v3-migration-guide.md +++ b/doc/v3-migration-guide.md @@ -44,6 +44,14 @@ module which can be added to your `MODULE.bazel` file as a dependency. ### Common +
+Removed retry_traits.h file + +The library no longer exposes the `retry_traits.h` header file. It only +contained internal symbols. + +
+ ### Bigtable
@@ -125,4 +133,12 @@ auto limit = google::cloud::bigtable::RowReader::NO_ROWS_LIMIT; ### Spanner +
+Removed admin/retry_traits.h file + +The library no longer exposes `spanner::retry_traits.h` header file. It only +contained internal symbols. + +
+ ### Storage diff --git a/google/cloud/bigquery/retry_traits.h b/google/cloud/bigquery/retry_traits.h deleted file mode 100644 index 9227228d0295b..0000000000000 --- a/google/cloud/bigquery/retry_traits.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RETRY_TRAITS_H - -#include "google/cloud/bigquery/internal/bigquery_read_retry_traits.h" -#warning "This header is deprecated, it only provided internal symbols." - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RETRY_TRAITS_H diff --git a/google/cloud/iam/retry_traits.h b/google/cloud/iam/retry_traits.h deleted file mode 100644 index 963f4491785b5..0000000000000 --- a/google/cloud/iam/retry_traits.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_RETRY_TRAITS_H - -#include "google/cloud/iam/admin/v1/internal/iam_retry_traits.h" -#include "google/cloud/iam/credentials/v1/internal/iam_credentials_retry_traits.h" -#warning "This header is deprecated, it only provided internal symbols" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_RETRY_TRAITS_H diff --git a/google/cloud/spanner/admin/retry_traits.h b/google/cloud/spanner/admin/retry_traits.h deleted file mode 100644 index c0460f752763d..0000000000000 --- a/google/cloud/spanner/admin/retry_traits.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_ADMIN_RETRY_TRAITS_H -#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_ADMIN_RETRY_TRAITS_H - -#include "google/cloud/spanner/admin/internal/database_admin_retry_traits.h" -#include "google/cloud/spanner/admin/internal/instance_admin_retry_traits.h" -#warning "This header is deprecated, it provided internal-only symbols" - -#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_ADMIN_RETRY_TRAITS_H diff --git a/google/cloud/spanner/google_cloud_cpp_spanner.bzl b/google/cloud/spanner/google_cloud_cpp_spanner.bzl index 2225628fa9d8e..bdc97d985bf35 100644 --- a/google/cloud/spanner/google_cloud_cpp_spanner.bzl +++ b/google/cloud/spanner/google_cloud_cpp_spanner.bzl @@ -45,7 +45,6 @@ google_cloud_cpp_spanner_hdrs = [ "admin/internal/instance_admin_stub_factory.h", "admin/internal/instance_admin_tracing_connection.h", "admin/internal/instance_admin_tracing_stub.h", - "admin/retry_traits.h", "backoff_policy.h", "backup.h", "batch_dml_result.h", From 06c835cb3b680f1e7da73046f745b0abd104d612 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Sat, 3 Jan 2026 22:22:24 +0000 Subject: [PATCH 2/3] document iam --- doc/v3-migration-guide.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/v3-migration-guide.md b/doc/v3-migration-guide.md index 76713afb12293..7bd841616cbf3 100644 --- a/doc/v3-migration-guide.md +++ b/doc/v3-migration-guide.md @@ -142,3 +142,13 @@ contained internal symbols.
### Storage + +### IAM + +
+Removed retry_traits.h file + +The library no longer exposes `retry_traits.h` header file. It only contained +internal symbols. + +
From 3d709992c60610298abba6f13c779e9591a3ea31 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Sat, 3 Jan 2026 22:30:54 +0000 Subject: [PATCH 3/3] fix cmake and doc --- doc/v3-migration-guide.md | 16 ++++++++-------- google/cloud/spanner/CMakeLists.txt | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/v3-migration-guide.md b/doc/v3-migration-guide.md index 7bd841616cbf3..e15e0dfe6872c 100644 --- a/doc/v3-migration-guide.md +++ b/doc/v3-migration-guide.md @@ -45,10 +45,10 @@ module which can be added to your `MODULE.bazel` file as a dependency. ### Common
-Removed retry_traits.h file +Removed bigquery/retry_traits.h file -The library no longer exposes the `retry_traits.h` header file. It only -contained internal symbols. +The library no longer exposes the `google/cloud/bigquery/retry_traits.h` header +file. It only contained internal symbols.
@@ -136,8 +136,8 @@ auto limit = google::cloud::bigtable::RowReader::NO_ROWS_LIMIT;
Removed admin/retry_traits.h file -The library no longer exposes `spanner::retry_traits.h` header file. It only -contained internal symbols. +The library no longer exposes `google/cloud/spanner/admin/retry_traits.h` header +file. It only contained internal symbols.
@@ -146,9 +146,9 @@ contained internal symbols. ### IAM
-Removed retry_traits.h file +Removed iam/retry_traits.h file -The library no longer exposes `retry_traits.h` header file. It only contained -internal symbols. +The library no longer exposes `google/cloud/iam/retry_traits.h` header file. It +only contained internal symbols.
diff --git a/google/cloud/spanner/CMakeLists.txt b/google/cloud/spanner/CMakeLists.txt index acb029537fecb..c85fa68df9b3b 100644 --- a/google/cloud/spanner/CMakeLists.txt +++ b/google/cloud/spanner/CMakeLists.txt @@ -88,7 +88,6 @@ add_library( admin/internal/instance_admin_tracing_connection.h admin/internal/instance_admin_tracing_stub.cc admin/internal/instance_admin_tracing_stub.h - admin/retry_traits.h backoff_policy.h backup.cc backup.h