feat: add context manager support in client

google/cloud/spanner_admin_database_v1/services/database_admin/async_client.py

@@ -1928,6 +1928,12 @@ async def list_backup_operations(
         # Done; return the response.
         return response
 
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc, tb):
+        await self.transport.close()
+
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

google/cloud/spanner_admin_database_v1/services/database_admin/client.py

@@ -17,7 +17,7 @@
 from distutils import util
 import os
 import re
-from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union
+from typing import Dict, Optional, Sequence, Tuple, Type, Union
 import pkg_resources
 
 from google.api_core import client_options as client_options_lib  # type: ignore
@@ -435,15 +435,12 @@ def __init__(
                 client_cert_source_for_mtls=client_cert_source_func,
                 quota_project_id=client_options.quota_project_id,
                 client_info=client_info,
-                always_use_jwt_access=(
-                    Transport == type(self).get_transport_class("grpc")
-                    or Transport == type(self).get_transport_class("grpc_asyncio")
-                ),
+                always_use_jwt_access=True,
             )
 
     def list_databases(
         self,
-        request: spanner_database_admin.ListDatabasesRequest = None,
+        request: Union[spanner_database_admin.ListDatabasesRequest, dict] = None,
         *,
         parent: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -453,7 +450,7 @@ def list_databases(
         r"""Lists Cloud Spanner databases.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.ListDatabasesRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.ListDatabasesRequest, dict]):
                 The request object. The request for
                 [ListDatabases][google.spanner.admin.database.v1.DatabaseAdmin.ListDatabases].
             parent (str):
@@ -524,7 +521,7 @@ def list_databases(
 
     def create_database(
         self,
-        request: spanner_database_admin.CreateDatabaseRequest = None,
+        request: Union[spanner_database_admin.CreateDatabaseRequest, dict] = None,
         *,
         parent: str = None,
         create_statement: str = None,
@@ -544,7 +541,7 @@ def create_database(
         successful.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.CreateDatabaseRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.CreateDatabaseRequest, dict]):
                 The request object. The request for
                 [CreateDatabase][google.spanner.admin.database.v1.DatabaseAdmin.CreateDatabase].
             parent (str):
@@ -631,7 +628,7 @@ def create_database(
 
     def get_database(
         self,
-        request: spanner_database_admin.GetDatabaseRequest = None,
+        request: Union[spanner_database_admin.GetDatabaseRequest, dict] = None,
         *,
         name: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -641,7 +638,7 @@ def get_database(
         r"""Gets the state of a Cloud Spanner database.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.GetDatabaseRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.GetDatabaseRequest, dict]):
                 The request object. The request for
                 [GetDatabase][google.spanner.admin.database.v1.DatabaseAdmin.GetDatabase].
             name (str):
@@ -701,7 +698,7 @@ def get_database(
 
     def update_database_ddl(
         self,
-        request: spanner_database_admin.UpdateDatabaseDdlRequest = None,
+        request: Union[spanner_database_admin.UpdateDatabaseDdlRequest, dict] = None,
         *,
         database: str = None,
         statements: Sequence[str] = None,
@@ -720,7 +717,7 @@ def update_database_ddl(
         The operation has no response.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.UpdateDatabaseDdlRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.UpdateDatabaseDdlRequest, dict]):
                 The request object. Enqueues the given DDL statements to
                 be applied, in order but not necessarily all at once, to
                 the database schema at some point (or points) in the
@@ -826,7 +823,7 @@ def update_database_ddl(
 
     def drop_database(
         self,
-        request: spanner_database_admin.DropDatabaseRequest = None,
+        request: Union[spanner_database_admin.DropDatabaseRequest, dict] = None,
         *,
         database: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -838,7 +835,7 @@ def drop_database(
         ``expire_time``.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.DropDatabaseRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.DropDatabaseRequest, dict]):
                 The request object. The request for
                 [DropDatabase][google.spanner.admin.database.v1.DatabaseAdmin.DropDatabase].
             database (str):
@@ -890,7 +887,7 @@ def drop_database(
 
     def get_database_ddl(
         self,
-        request: spanner_database_admin.GetDatabaseDdlRequest = None,
+        request: Union[spanner_database_admin.GetDatabaseDdlRequest, dict] = None,
         *,
         database: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -903,7 +900,7 @@ def get_database_ddl(
         [Operations][google.longrunning.Operations] API.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.GetDatabaseDdlRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.GetDatabaseDdlRequest, dict]):
                 The request object. The request for
                 [GetDatabaseDdl][google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDdl].
             database (str):
@@ -965,7 +962,7 @@ def get_database_ddl(
 
     def set_iam_policy(
         self,
-        request: iam_policy_pb2.SetIamPolicyRequest = None,
+        request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
         *,
         resource: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -983,7 +980,7 @@ def set_iam_policy(
         [resource][google.iam.v1.SetIamPolicyRequest.resource].
 
         Args:
-            request (google.iam.v1.iam_policy_pb2.SetIamPolicyRequest):
+            request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]):
                 The request object. Request message for `SetIamPolicy`
                 method.
             resource (str):
@@ -1098,7 +1095,7 @@ def set_iam_policy(
 
     def get_iam_policy(
         self,
-        request: iam_policy_pb2.GetIamPolicyRequest = None,
+        request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
         *,
         resource: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -1117,7 +1114,7 @@ def get_iam_policy(
         [resource][google.iam.v1.GetIamPolicyRequest.resource].
 
         Args:
-            request (google.iam.v1.iam_policy_pb2.GetIamPolicyRequest):
+            request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]):
                 The request object. Request message for `GetIamPolicy`
                 method.
             resource (str):
@@ -1232,7 +1229,7 @@ def get_iam_policy(
 
     def test_iam_permissions(
         self,
-        request: iam_policy_pb2.TestIamPermissionsRequest = None,
+        request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
         *,
         resource: str = None,
         permissions: Sequence[str] = None,
@@ -1252,7 +1249,7 @@ def test_iam_permissions(
         permission on the containing instance.
 
         Args:
-            request (google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest):
+            request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]):
                 The request object. Request message for
                 `TestIamPermissions` method.
             resource (str):
@@ -1323,7 +1320,7 @@ def test_iam_permissions(
 
     def create_backup(
         self,
-        request: gsad_backup.CreateBackupRequest = None,
+        request: Union[gsad_backup.CreateBackupRequest, dict] = None,
         *,
         parent: str = None,
         backup: gsad_backup.Backup = None,
@@ -1347,7 +1344,7 @@ def create_backup(
         databases can run concurrently.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.CreateBackupRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.CreateBackupRequest, dict]):
                 The request object. The request for
                 [CreateBackup][google.spanner.admin.database.v1.DatabaseAdmin.CreateBackup].
             parent (str):
@@ -1442,7 +1439,7 @@ def create_backup(
 
     def get_backup(
         self,
-        request: backup.GetBackupRequest = None,
+        request: Union[backup.GetBackupRequest, dict] = None,
         *,
         name: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -1453,7 +1450,7 @@ def get_backup(
         [Backup][google.spanner.admin.database.v1.Backup].
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.GetBackupRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.GetBackupRequest, dict]):
                 The request object. The request for
                 [GetBackup][google.spanner.admin.database.v1.DatabaseAdmin.GetBackup].
             name (str):
@@ -1512,7 +1509,7 @@ def get_backup(
 
     def update_backup(
         self,
-        request: gsad_backup.UpdateBackupRequest = None,
+        request: Union[gsad_backup.UpdateBackupRequest, dict] = None,
         *,
         backup: gsad_backup.Backup = None,
         update_mask: field_mask_pb2.FieldMask = None,
@@ -1524,7 +1521,7 @@ def update_backup(
         [Backup][google.spanner.admin.database.v1.Backup].
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.UpdateBackupRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.UpdateBackupRequest, dict]):
                 The request object. The request for
                 [UpdateBackup][google.spanner.admin.database.v1.DatabaseAdmin.UpdateBackup].
             backup (google.cloud.spanner_admin_database_v1.types.Backup):
@@ -1603,7 +1600,7 @@ def update_backup(
 
     def delete_backup(
         self,
-        request: backup.DeleteBackupRequest = None,
+        request: Union[backup.DeleteBackupRequest, dict] = None,
         *,
         name: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -1614,7 +1611,7 @@ def delete_backup(
         [Backup][google.spanner.admin.database.v1.Backup].
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.DeleteBackupRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.DeleteBackupRequest, dict]):
                 The request object. The request for
                 [DeleteBackup][google.spanner.admin.database.v1.DatabaseAdmin.DeleteBackup].
             name (str):
@@ -1669,7 +1666,7 @@ def delete_backup(
 
     def list_backups(
         self,
-        request: backup.ListBackupsRequest = None,
+        request: Union[backup.ListBackupsRequest, dict] = None,
         *,
         parent: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -1681,7 +1678,7 @@ def list_backups(
         the most recent ``create_time``.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.ListBackupsRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.ListBackupsRequest, dict]):
                 The request object. The request for
                 [ListBackups][google.spanner.admin.database.v1.DatabaseAdmin.ListBackups].
             parent (str):
@@ -1751,7 +1748,7 @@ def list_backups(
 
     def restore_database(
         self,
-        request: spanner_database_admin.RestoreDatabaseRequest = None,
+        request: Union[spanner_database_admin.RestoreDatabaseRequest, dict] = None,
         *,
         parent: str = None,
         database_id: str = None,
@@ -1781,7 +1778,7 @@ def restore_database(
         first restore to complete.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.RestoreDatabaseRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.RestoreDatabaseRequest, dict]):
                 The request object. The request for
                 [RestoreDatabase][google.spanner.admin.database.v1.DatabaseAdmin.RestoreDatabase].
             parent (str):
@@ -1878,7 +1875,9 @@ def restore_database(
 
     def list_database_operations(
         self,
-        request: spanner_database_admin.ListDatabaseOperationsRequest = None,
+        request: Union[
+            spanner_database_admin.ListDatabaseOperationsRequest, dict
+        ] = None,
         *,
         parent: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -1897,7 +1896,7 @@ def list_database_operations(
         operations.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.ListDatabaseOperationsRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.ListDatabaseOperationsRequest, dict]):
                 The request object. The request for
                 [ListDatabaseOperations][google.spanner.admin.database.v1.DatabaseAdmin.ListDatabaseOperations].
             parent (str):
@@ -1970,7 +1969,7 @@ def list_database_operations(
 
     def list_backup_operations(
         self,
-        request: backup.ListBackupOperationsRequest = None,
+        request: Union[backup.ListBackupOperationsRequest, dict] = None,
         *,
         parent: str = None,
         retry: retries.Retry = gapic_v1.method.DEFAULT,
@@ -1991,7 +1990,7 @@ def list_backup_operations(
         order starting from the most recently started operation.
 
         Args:
-            request (google.cloud.spanner_admin_database_v1.types.ListBackupOperationsRequest):
+            request (Union[google.cloud.spanner_admin_database_v1.types.ListBackupOperationsRequest, dict]):
                 The request object. The request for
                 [ListBackupOperations][google.spanner.admin.database.v1.DatabaseAdmin.ListBackupOperations].
             parent (str):
@@ -2060,6 +2059,19 @@ def list_backup_operations(
         # Done; return the response.
         return response
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        """Releases underlying transport's resources.
+
+        .. warning::
+            ONLY use as a context manager if the transport is NOT shared
+            with other clients! Exiting the with block will CLOSE the transport
+            and may cause errors in other clients!
+        """
+        self.transport.close()
+
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(