Merge branch 'googleapis:main' into support_reversed_scans

googleapis · Jan 16, 2024 · 04ea661 · 04ea661
2 parents 3df1290 + 1859e67
commit 04ea661
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 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
@@ -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
@@ -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
@@ -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', ),