chore: upgrade gapic-generator-python to 0.43.2

google/cloud/bigtable_admin_v2/__init__.py

@@ -88,7 +88,7 @@
     "AppProfile",
     "Backup",
     "BackupInfo",
-    "BigtableTableAdminClient",
+    "BigtableInstanceAdminClient",
     "CheckConsistencyRequest",
     "CheckConsistencyResponse",
     "Cluster",
@@ -151,5 +151,5 @@
     "UpdateBackupRequest",
     "UpdateClusterMetadata",
     "UpdateInstanceMetadata",
-    "BigtableInstanceAdminClient",
+    "BigtableTableAdminClient",
 )

google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/async_client.py

@@ -36,7 +36,7 @@
 from google.cloud.bigtable_admin_v2.types import instance
 from google.cloud.bigtable_admin_v2.types import instance as gba_instance
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.protobuf import field_mask_pb2 as field_mask  # type: ignore
 
 from .transports.base import BigtableInstanceAdminTransport, DEFAULT_CLIENT_INFO
@@ -1610,7 +1610,7 @@ async def get_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Gets the access control policy for an instance
         resource. Returns an empty policy if an instance exists
         but does not have a policy set.
@@ -1749,7 +1749,7 @@ async def set_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Sets the access control policy on an instance
         resource. Replaces any existing policy.
 

google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/client.py

@@ -40,7 +40,7 @@
 from google.cloud.bigtable_admin_v2.types import instance
 from google.cloud.bigtable_admin_v2.types import instance as gba_instance
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.protobuf import field_mask_pb2 as field_mask  # type: ignore
 
 from .transports.base import BigtableInstanceAdminTransport, DEFAULT_CLIENT_INFO
@@ -1750,7 +1750,7 @@ def get_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Gets the access control policy for an instance
         resource. Returns an empty policy if an instance exists
         but does not have a policy set.
@@ -1879,7 +1879,7 @@ def set_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Sets the access control policy on an instance
         resource. Replaces any existing policy.
 

google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/base.py

@@ -29,7 +29,7 @@
 from google.cloud.bigtable_admin_v2.types import bigtable_instance_admin
 from google.cloud.bigtable_admin_v2.types import instance
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.longrunning import operations_pb2 as operations  # type: ignore
 from google.protobuf import empty_pb2 as empty  # type: ignore
 
@@ -474,7 +474,7 @@ def get_iam_policy(
         self,
     ) -> typing.Callable[
         [iam_policy.GetIamPolicyRequest],
-        typing.Union[policy.Policy, typing.Awaitable[policy.Policy]],
+        typing.Union[giv_policy.Policy, typing.Awaitable[giv_policy.Policy]],
     ]:
         raise NotImplementedError()
 
@@ -483,7 +483,7 @@ def set_iam_policy(
         self,
     ) -> typing.Callable[
         [iam_policy.SetIamPolicyRequest],
-        typing.Union[policy.Policy, typing.Awaitable[policy.Policy]],
+        typing.Union[giv_policy.Policy, typing.Awaitable[giv_policy.Policy]],
     ]:
         raise NotImplementedError()
 

google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/grpc.py

@@ -30,7 +30,7 @@
 from google.cloud.bigtable_admin_v2.types import bigtable_instance_admin
 from google.cloud.bigtable_admin_v2.types import instance
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.longrunning import operations_pb2 as operations  # type: ignore
 from google.protobuf import empty_pb2 as empty  # type: ignore
 
@@ -682,7 +682,7 @@ def delete_app_profile(
     @property
     def get_iam_policy(
         self,
-    ) -> Callable[[iam_policy.GetIamPolicyRequest], policy.Policy]:
+    ) -> Callable[[iam_policy.GetIamPolicyRequest], giv_policy.Policy]:
         r"""Return a callable for the get iam policy method over gRPC.
 
         Gets the access control policy for an instance
@@ -703,14 +703,14 @@ def get_iam_policy(
             self._stubs["get_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetIamPolicy",
                 request_serializer=iam_policy.GetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["get_iam_policy"]
 
     @property
     def set_iam_policy(
         self,
-    ) -> Callable[[iam_policy.SetIamPolicyRequest], policy.Policy]:
+    ) -> Callable[[iam_policy.SetIamPolicyRequest], giv_policy.Policy]:
         r"""Return a callable for the set iam policy method over gRPC.
 
         Sets the access control policy on an instance
@@ -730,7 +730,7 @@ def set_iam_policy(
             self._stubs["set_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableInstanceAdmin/SetIamPolicy",
                 request_serializer=iam_policy.SetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["set_iam_policy"]
 

google/cloud/bigtable_admin_v2/services/bigtable_instance_admin/transports/grpc_asyncio.py

@@ -31,7 +31,7 @@
 from google.cloud.bigtable_admin_v2.types import bigtable_instance_admin
 from google.cloud.bigtable_admin_v2.types import instance
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.longrunning import operations_pb2 as operations  # type: ignore
 from google.protobuf import empty_pb2 as empty  # type: ignore
 
@@ -709,7 +709,7 @@ def delete_app_profile(
     @property
     def get_iam_policy(
         self,
-    ) -> Callable[[iam_policy.GetIamPolicyRequest], Awaitable[policy.Policy]]:
+    ) -> Callable[[iam_policy.GetIamPolicyRequest], Awaitable[giv_policy.Policy]]:
         r"""Return a callable for the get iam policy method over gRPC.
 
         Gets the access control policy for an instance
@@ -730,14 +730,14 @@ def get_iam_policy(
             self._stubs["get_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetIamPolicy",
                 request_serializer=iam_policy.GetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["get_iam_policy"]
 
     @property
     def set_iam_policy(
         self,
-    ) -> Callable[[iam_policy.SetIamPolicyRequest], Awaitable[policy.Policy]]:
+    ) -> Callable[[iam_policy.SetIamPolicyRequest], Awaitable[giv_policy.Policy]]:
         r"""Return a callable for the set iam policy method over gRPC.
 
         Sets the access control policy on an instance
@@ -757,7 +757,7 @@ def set_iam_policy(
             self._stubs["set_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableInstanceAdmin/SetIamPolicy",
                 request_serializer=iam_policy.SetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["set_iam_policy"]
 

google/cloud/bigtable_admin_v2/services/bigtable_table_admin/async_client.py

@@ -35,7 +35,7 @@
 from google.cloud.bigtable_admin_v2.types import table
 from google.cloud.bigtable_admin_v2.types import table as gba_table
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.protobuf import field_mask_pb2 as field_mask  # type: ignore
 from google.protobuf import timestamp_pb2 as timestamp  # type: ignore
 
@@ -1959,7 +1959,7 @@ async def get_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Gets the access control policy for a Table or Backup
         resource. Returns an empty policy if the resource exists
         but does not have a policy set.
@@ -2098,7 +2098,7 @@ async def set_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Sets the access control policy on a Table or Backup
         resource. Replaces any existing policy.
 

google/cloud/bigtable_admin_v2/services/bigtable_table_admin/client.py

@@ -39,7 +39,7 @@
 from google.cloud.bigtable_admin_v2.types import table
 from google.cloud.bigtable_admin_v2.types import table as gba_table
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.protobuf import field_mask_pb2 as field_mask  # type: ignore
 from google.protobuf import timestamp_pb2 as timestamp  # type: ignore
 
@@ -2159,7 +2159,7 @@ def get_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Gets the access control policy for a Table or Backup
         resource. Returns an empty policy if the resource exists
         but does not have a policy set.
@@ -2288,7 +2288,7 @@ def set_iam_policy(
         retry: retries.Retry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
-    ) -> policy.Policy:
+    ) -> giv_policy.Policy:
         r"""Sets the access control policy on a Table or Backup
         resource. Replaces any existing policy.
 

google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/base.py

@@ -30,7 +30,7 @@
 from google.cloud.bigtable_admin_v2.types import table
 from google.cloud.bigtable_admin_v2.types import table as gba_table
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.longrunning import operations_pb2 as operations  # type: ignore
 from google.protobuf import empty_pb2 as empty  # type: ignore
 
@@ -498,7 +498,7 @@ def get_iam_policy(
         self,
     ) -> typing.Callable[
         [iam_policy.GetIamPolicyRequest],
-        typing.Union[policy.Policy, typing.Awaitable[policy.Policy]],
+        typing.Union[giv_policy.Policy, typing.Awaitable[giv_policy.Policy]],
     ]:
         raise NotImplementedError()
 
@@ -507,7 +507,7 @@ def set_iam_policy(
         self,
     ) -> typing.Callable[
         [iam_policy.SetIamPolicyRequest],
-        typing.Union[policy.Policy, typing.Awaitable[policy.Policy]],
+        typing.Union[giv_policy.Policy, typing.Awaitable[giv_policy.Policy]],
     ]:
         raise NotImplementedError()
 

google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/grpc.py

@@ -31,7 +31,7 @@
 from google.cloud.bigtable_admin_v2.types import table
 from google.cloud.bigtable_admin_v2.types import table as gba_table
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.longrunning import operations_pb2 as operations  # type: ignore
 from google.protobuf import empty_pb2 as empty  # type: ignore
 
@@ -832,7 +832,7 @@ def restore_table(
     @property
     def get_iam_policy(
         self,
-    ) -> Callable[[iam_policy.GetIamPolicyRequest], policy.Policy]:
+    ) -> Callable[[iam_policy.GetIamPolicyRequest], giv_policy.Policy]:
         r"""Return a callable for the get iam policy method over gRPC.
 
         Gets the access control policy for a Table or Backup
@@ -853,14 +853,14 @@ def get_iam_policy(
             self._stubs["get_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableTableAdmin/GetIamPolicy",
                 request_serializer=iam_policy.GetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["get_iam_policy"]
 
     @property
     def set_iam_policy(
         self,
-    ) -> Callable[[iam_policy.SetIamPolicyRequest], policy.Policy]:
+    ) -> Callable[[iam_policy.SetIamPolicyRequest], giv_policy.Policy]:
         r"""Return a callable for the set iam policy method over gRPC.
 
         Sets the access control policy on a Table or Backup
@@ -880,7 +880,7 @@ def set_iam_policy(
             self._stubs["set_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableTableAdmin/SetIamPolicy",
                 request_serializer=iam_policy.SetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["set_iam_policy"]
 

google/cloud/bigtable_admin_v2/services/bigtable_table_admin/transports/grpc_asyncio.py

@@ -32,7 +32,7 @@
 from google.cloud.bigtable_admin_v2.types import table
 from google.cloud.bigtable_admin_v2.types import table as gba_table
 from google.iam.v1 import iam_policy_pb2 as iam_policy  # type: ignore
-from google.iam.v1 import policy_pb2 as policy  # type: ignore
+from google.iam.v1 import policy_pb2 as giv_policy  # type: ignore
 from google.longrunning import operations_pb2 as operations  # type: ignore
 from google.protobuf import empty_pb2 as empty  # type: ignore
 
@@ -849,7 +849,7 @@ def restore_table(
     @property
     def get_iam_policy(
         self,
-    ) -> Callable[[iam_policy.GetIamPolicyRequest], Awaitable[policy.Policy]]:
+    ) -> Callable[[iam_policy.GetIamPolicyRequest], Awaitable[giv_policy.Policy]]:
         r"""Return a callable for the get iam policy method over gRPC.
 
         Gets the access control policy for a Table or Backup
@@ -870,14 +870,14 @@ def get_iam_policy(
             self._stubs["get_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableTableAdmin/GetIamPolicy",
                 request_serializer=iam_policy.GetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["get_iam_policy"]
 
     @property
     def set_iam_policy(
         self,
-    ) -> Callable[[iam_policy.SetIamPolicyRequest], Awaitable[policy.Policy]]:
+    ) -> Callable[[iam_policy.SetIamPolicyRequest], Awaitable[giv_policy.Policy]]:
         r"""Return a callable for the set iam policy method over gRPC.
 
         Sets the access control policy on a Table or Backup
@@ -897,7 +897,7 @@ def set_iam_policy(
             self._stubs["set_iam_policy"] = self.grpc_channel.unary_unary(
                 "/google.bigtable.admin.v2.BigtableTableAdmin/SetIamPolicy",
                 request_serializer=iam_policy.SetIamPolicyRequest.SerializeToString,
-                response_deserializer=policy.Policy.FromString,
+                response_deserializer=giv_policy.Policy.FromString,
             )
         return self._stubs["set_iam_policy"]
 

scripts/fixup_bigtable_admin_v2_keywords.py

@@ -59,7 +59,7 @@ class bigtable_adminCallTransformer(cst.CSTTransformer):
     'get_app_profile': ('name', ),
     'get_backup': ('name', ),
     'get_cluster': ('name', ),
-    'get_iam_policy': ('resource', 'options', ),
+    'get_iam_policy': ('resource', 'options_', ),
     'get_instance': ('name', ),
     'get_snapshot': ('name', ),
     'get_table': ('name', 'view', ),
@@ -72,7 +72,7 @@ class bigtable_adminCallTransformer(cst.CSTTransformer):
     'modify_column_families': ('name', 'modifications', ),
     'partial_update_instance': ('instance', 'update_mask', ),
     'restore_table': ('parent', 'table_id', 'backup', ),
-    'set_iam_policy': ('resource', 'policy', ),
+    'set_iam_policy': ('resource', 'policy_', ),
     'snapshot_table': ('name', 'cluster', 'snapshot_id', 'ttl', 'description', ),
     'test_iam_permissions': ('resource', 'permissions', ),
     'update_app_profile': ('app_profile', 'update_mask', 'ignore_warnings', ),

synth.metadata

@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/python-bigtable.git",
-        "sha": "5089335c220c16ff3675f01b76f7d4e0dc2219e3"
+        "sha": "0e9fe5410e1b5d16ae0735ba1f606f7d1befafb9"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "95dd24960cf9f794ef583e59ad9f1fabe1c4a924",
-        "internalRef": "365882072"
+        "sha": "2490be32f08cccc870862ea86920f58325795c89",
+        "internalRef": "366826395"
       }
     },
     {