Skip to content
This repository has been archived by the owner on Nov 29, 2023. It is now read-only.

Commit

Permalink
feat: add context manager support in client (#125)
Browse files Browse the repository at this point in the history
- [ ] Regenerate this pull request now.

chore: fix docstring for first attribute of protos

committer: @busunkim96
PiperOrigin-RevId: 401271153

Source-Link: googleapis/googleapis@787f8c9

Source-Link: https://github.com/googleapis/googleapis-gen/commit/81decffe9fc72396a8153e756d1d67a6eecfd620
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODFkZWNmZmU5ZmM3MjM5NmE4MTUzZTc1NmQxZDY3YTZlZWNmZDYyMCJ9
  • Loading branch information
gcf-owl-bot[bot] authored Oct 8, 2021
1 parent 397a7f2 commit bf9cc26
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,12 @@ async def test_iam_permissions(
# 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,7 @@ 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 create_connection(
Expand Down Expand Up @@ -1101,6 +1098,19 @@ def test_iam_permissions(
# 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,15 @@ def _prep_wrapped_messages(self, client_info):
),
}

def close(self):
"""Closes resources associated with the transport.
.. warning::
Only call this method if the transport is NOT shared
with other clients - this may cause errors in other clients!
"""
raise NotImplementedError()

@property
def create_connection(
self,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,5 +461,8 @@ def test_iam_permissions(
)
return self._stubs["test_iam_permissions"]

def close(self):
self.grpc_channel.close()


__all__ = ("ConnectionServiceGrpcTransport",)
Original file line number Diff line number Diff line change
Expand Up @@ -465,5 +465,8 @@ def test_iam_permissions(
)
return self._stubs["test_iam_permissions"]

def close(self):
return self.grpc_channel.close()


__all__ = ("ConnectionServiceGrpcAsyncIOTransport",)
5 changes: 5 additions & 0 deletions google/cloud/bigquery_connection_v1/types/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ class UpdateConnectionRequest(proto.Message):

class DeleteConnectionRequest(proto.Message):
r"""The request for [ConnectionService.DeleteConnectionRequest][].
Attributes:
name (str):
Required. Name of the deleted connection, for example:
Expand Down Expand Up @@ -192,6 +193,7 @@ class Connection(proto.Message):

class CloudSqlProperties(proto.Message):
r"""Connection properties specific to the Cloud SQL.
Attributes:
instance_id (str):
Cloud SQL instance ID in the form
Expand All @@ -218,6 +220,7 @@ class DatabaseType(proto.Enum):

class CloudSqlCredential(proto.Message):
r"""Credential info for the Cloud SQL.
Attributes:
username (str):
The username for the credential.
Expand All @@ -231,6 +234,7 @@ class CloudSqlCredential(proto.Message):

class CloudSpannerProperties(proto.Message):
r"""Connection properties specific to Cloud Spanner.
Attributes:
database (str):
Cloud Spanner database in the form
Expand All @@ -246,6 +250,7 @@ class CloudSpannerProperties(proto.Message):

class AwsProperties(proto.Message):
r"""Connection properties specific to Amazon Web Services (AWS).
Attributes:
cross_account_role (google.cloud.bigquery_connection_v1.types.AwsCrossAccountRole):
Authentication using Google owned AWS IAM
Expand Down
50 changes: 50 additions & 0 deletions tests/unit/gapic/bigquery_connection_v1/test_connection_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from google.api_core import gapic_v1
from google.api_core import grpc_helpers
from google.api_core import grpc_helpers_async
from google.api_core import path_template
from google.auth import credentials as ga_credentials
from google.auth.exceptions import MutualTLSChannelError
from google.cloud.bigquery_connection_v1.services.connection_service import (
Expand Down Expand Up @@ -2608,6 +2609,9 @@ def test_connection_service_base_transport():
with pytest.raises(NotImplementedError):
getattr(transport, method)(request=object())

with pytest.raises(NotImplementedError):
transport.close()


@requires_google_auth_gte_1_25_0
def test_connection_service_base_transport_with_credentials_file():
Expand Down Expand Up @@ -3111,3 +3115,49 @@ def test_client_withDEFAULT_CLIENT_INFO():
credentials=ga_credentials.AnonymousCredentials(), client_info=client_info,
)
prep.assert_called_once_with(client_info)


@pytest.mark.asyncio
async def test_transport_close_async():
client = ConnectionServiceAsyncClient(
credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio",
)
with mock.patch.object(
type(getattr(client.transport, "grpc_channel")), "close"
) as close:
async with client:
close.assert_not_called()
close.assert_called_once()


def test_transport_close():
transports = {
"grpc": "_grpc_channel",
}

for transport, close_name in transports.items():
client = ConnectionServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport
)
with mock.patch.object(
type(getattr(client.transport, close_name)), "close"
) as close:
with client:
close.assert_not_called()
close.assert_called_once()


def test_client_ctx():
transports = [
"grpc",
]
for transport in transports:
client = ConnectionServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport
)
# Test client calls underlying transport.
with mock.patch.object(type(client.transport), "close") as close:
close.assert_not_called()
with client:
pass
close.assert_called()

0 comments on commit bf9cc26

Please sign in to comment.