From 1859e67961629663a8749eea849b5b005fcbc09f Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:47:18 -0800
Subject: [PATCH] feat: Adding feature flags for routing cookie and retry info
 (#905)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Modify ModifyColumnFamiliesRequest proto to expose ignore_warnings field

PiperOrigin-RevId: 590940407

Source-Link: https://github.com/googleapis/googleapis/commit/fb027c893ce1536d6a485748d4036d97092fb812

Source-Link: https://github.com/googleapis/googleapis-gen/commit/f0728cda227b38835822c4e5519e568ce8d2b5ac
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjA3MjhjZGEyMjdiMzg4MzU4MjJjNGU1NTE5ZTU2OGNlOGQyYjVhYyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* feat: Adding feature flags for routing cookie and retry info

PiperOrigin-RevId: 591912877

Source-Link: https://github.com/googleapis/googleapis/commit/f6505fe8d0daac2426c22be985ad3b745a4b5485

Source-Link: https://github.com/googleapis/googleapis-gen/commit/7499187415f8d405ef0d46dd6ff608b125c53c8f
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzQ5OTE4NzQxNWY4ZDQwNWVmMGQ0NmRkNmZmNjA4YjEyNWM1M2M4ZiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../types/bigtable_table_admin.py                |  7 +++++++
 google/cloud/bigtable_v2/types/feature_flags.py  | 16 ++++++++++++++++
 scripts/fixup_bigtable_admin_v2_keywords.py      |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/google/cloud/bigtable_admin_v2/types/bigtable_table_admin.py b/google/cloud/bigtable_admin_v2/types/bigtable_table_admin.py
index 6a3b31a1e..c21ac4d5a 100644
--- a/google/cloud/bigtable_admin_v2/types/bigtable_table_admin.py
+++ b/google/cloud/bigtable_admin_v2/types/bigtable_table_admin.py
@@ -597,6 +597,9 @@ class ModifyColumnFamiliesRequest(proto.Message):
             earlier modifications can be masked by later
             ones (in the case of repeated updates to the
             same family, for example).
+        ignore_warnings (bool):
+            Optional. If true, ignore safety checks when
+            modifying the column families.
     """
 
     class Modification(proto.Message):
@@ -662,6 +665,10 @@ class Modification(proto.Message):
         number=2,
         message=Modification,
     )
+    ignore_warnings: bool = proto.Field(
+        proto.BOOL,
+        number=3,
+    )
 
 
 class GenerateConsistencyTokenRequest(proto.Message):
diff --git a/google/cloud/bigtable_v2/types/feature_flags.py b/google/cloud/bigtable_v2/types/feature_flags.py
index 92ac5023d..45e673f75 100644
--- a/google/cloud/bigtable_v2/types/feature_flags.py
+++ b/google/cloud/bigtable_v2/types/feature_flags.py
@@ -59,6 +59,14 @@ class FeatureFlags(proto.Message):
             Notify the server that the client supports the
             last_scanned_row field in ReadRowsResponse for long-running
             scans.
+        routing_cookie (bool):
+            Notify the server that the client supports
+            using encoded routing cookie strings to retry
+            requests with.
+        retry_info (bool):
+            Notify the server that the client supports
+            using retry info back off durations to retry
+            requests with.
     """
 
     reverse_scans: bool = proto.Field(
@@ -77,6 +85,14 @@ class FeatureFlags(proto.Message):
         proto.BOOL,
         number=4,
     )
+    routing_cookie: bool = proto.Field(
+        proto.BOOL,
+        number=6,
+    )
+    retry_info: bool = proto.Field(
+        proto.BOOL,
+        number=7,
+    )
 
 
 __all__ = tuple(sorted(__protobuf__.manifest))
diff --git a/scripts/fixup_bigtable_admin_v2_keywords.py b/scripts/fixup_bigtable_admin_v2_keywords.py
index 6882feaf6..8c3efea10 100644
--- a/scripts/fixup_bigtable_admin_v2_keywords.py
+++ b/scripts/fixup_bigtable_admin_v2_keywords.py
@@ -69,7 +69,7 @@ class bigtable_adminCallTransformer(cst.CSTTransformer):
         'list_instances': ('parent', 'page_token', ),
         'list_snapshots': ('parent', 'page_size', 'page_token', ),
         'list_tables': ('parent', 'view', 'page_size', 'page_token', ),
-        'modify_column_families': ('name', 'modifications', ),
+        'modify_column_families': ('name', 'modifications', 'ignore_warnings', ),
         'partial_update_cluster': ('cluster', 'update_mask', ),
         'partial_update_instance': ('instance', 'update_mask', ),
         'restore_table': ('parent', 'table_id', 'backup', ),