fix: remove client side gRPC receive limits (#192)

* changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * fix: remove client recv msg limit fix: add enums to `types/__init__.py` PiperOrigin-RevId: 347055288 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri Dec 11 12:44:37 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: dd372aa22ded7a8ba6f0e03a80e06358a3fa0907 Source-Link: googleapis/googleapis@dd372aa * docs: revert unsupported docstring headers Co-authored-by: larkee <larkee@users.noreply.github.com> Co-authored-by: larkee <31196561+larkee@users.noreply.github.com>
googleapis · Dec 29, 2020 · 90effc4 · 90effc4
1 parent c000ec4
commit 90effc4
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 28 deletions.
diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/__init__.py b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/__init__.py
@@ -28,7 +28,6 @@
 _transport_registry["grpc"] = DatabaseAdminGrpcTransport
 _transport_registry["grpc_asyncio"] = DatabaseAdminGrpcAsyncIOTransport
 
-
 __all__ = (
  "DatabaseAdminTransport",
  "DatabaseAdminGrpcTransport",

diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py
@@ -158,6 +158,10 @@ def __init__(
  ssl_credentials=ssl_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  self._ssl_channel_credentials = ssl_credentials
  else:
@@ -176,9 +180,14 @@ def __init__(
  ssl_credentials=ssl_channel_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
 
  self._stubs = {} # type: Dict[str, Callable]
+ self._operations_client = None
 
  # Run the base constructor.
  super().__init__(
@@ -202,7 +211,7 @@ def create_channel(
  ) -> grpc.Channel:
  """Create and return a gRPC channel object.
  Args:
- address (Optionsl[str]): The host for the channel to use.
+ address (Optional[str]): The host for the channel to use.
  credentials (Optional[~.Credentials]): The
  authorization credentials to attach to requests. These
  credentials identify this application to the service. If
@@ -249,13 +258,11 @@ def operations_client(self) -> operations_v1.OperationsClient:
  client.
  """
  # Sanity check: Only create a new client if we do not already have one.
- if "operations_client" not in self.__dict__:
- self.__dict__["operations_client"] = operations_v1.OperationsClient(
- self.grpc_channel
- )
+ if self._operations_client is None:
+ self._operations_client = operations_v1.OperationsClient(self.grpc_channel)
 
  # Return the client from cache.
- return self.__dict__["operations_client"]
+ return self._operations_client
 
  @property
  def list_databases(

diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc_asyncio.py b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc_asyncio.py
@@ -203,6 +203,10 @@ def __init__(
  ssl_credentials=ssl_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  self._ssl_channel_credentials = ssl_credentials
  else:
@@ -221,6 +225,10 @@ def __init__(
  ssl_credentials=ssl_channel_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
 
  # Run the base constructor.
@@ -234,6 +242,7 @@ def __init__(
  )
 
  self._stubs = {}
+ self._operations_client = None
 
  @property
  def grpc_channel(self) -> aio.Channel:
@@ -253,13 +262,13 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient:
  client.
  """
  # Sanity check: Only create a new client if we do not already have one.
- if "operations_client" not in self.__dict__:
- self.__dict__["operations_client"] = operations_v1.OperationsAsyncClient(
+ if self._operations_client is None:
+ self._operations_client = operations_v1.OperationsAsyncClient(
  self.grpc_channel
  )
 
  # Return the client from cache.
- return self.__dict__["operations_client"]
+ return self._operations_client
 
  @property
  def list_databases(

diff --git a/google/cloud/spanner_admin_database_v1/types/__init__.py b/google/cloud/spanner_admin_database_v1/types/__init__.py
@@ -47,9 +47,9 @@
  RestoreDatabaseRequest,
  RestoreDatabaseMetadata,
  OptimizeRestoredDatabaseMetadata,
+ RestoreSourceType,
 )
 
-
 __all__ = (
  "OperationProgress",
  "Backup",
@@ -80,4 +80,5 @@
  "RestoreDatabaseRequest",
  "RestoreDatabaseMetadata",
  "OptimizeRestoredDatabaseMetadata",
+ "RestoreSourceType",
 )
diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/__init__.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/__init__.py
@@ -28,7 +28,6 @@
 _transport_registry["grpc"] = InstanceAdminGrpcTransport
 _transport_registry["grpc_asyncio"] = InstanceAdminGrpcAsyncIOTransport
 
-
 __all__ = (
  "InstanceAdminTransport",
  "InstanceAdminGrpcTransport",

diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py
@@ -171,6 +171,10 @@ def __init__(
  ssl_credentials=ssl_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  self._ssl_channel_credentials = ssl_credentials
  else:
@@ -189,9 +193,14 @@ def __init__(
  ssl_credentials=ssl_channel_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
 
  self._stubs = {} # type: Dict[str, Callable]
+ self._operations_client = None
 
  # Run the base constructor.
  super().__init__(
@@ -215,7 +224,7 @@ def create_channel(
  ) -> grpc.Channel:
  """Create and return a gRPC channel object.
  Args:
- address (Optionsl[str]): The host for the channel to use.
+ address (Optional[str]): The host for the channel to use.
  credentials (Optional[~.Credentials]): The
  authorization credentials to attach to requests. These
  credentials identify this application to the service. If
@@ -262,13 +271,11 @@ def operations_client(self) -> operations_v1.OperationsClient:
  client.
  """
  # Sanity check: Only create a new client if we do not already have one.
- if "operations_client" not in self.__dict__:
- self.__dict__["operations_client"] = operations_v1.OperationsClient(
- self.grpc_channel
- )
+ if self._operations_client is None:
+ self._operations_client = operations_v1.OperationsClient(self.grpc_channel)
 
  # Return the client from cache.
- return self.__dict__["operations_client"]
+ return self._operations_client
 
  @property
  def list_instance_configs(

diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc_asyncio.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc_asyncio.py
@@ -216,6 +216,10 @@ def __init__(
  ssl_credentials=ssl_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  self._ssl_channel_credentials = ssl_credentials
  else:
@@ -234,6 +238,10 @@ def __init__(
  ssl_credentials=ssl_channel_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
 
  # Run the base constructor.
@@ -247,6 +255,7 @@ def __init__(
  )
 
  self._stubs = {}
+ self._operations_client = None
 
  @property
  def grpc_channel(self) -> aio.Channel:
@@ -266,13 +275,13 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient:
  client.
  """
  # Sanity check: Only create a new client if we do not already have one.
- if "operations_client" not in self.__dict__:
- self.__dict__["operations_client"] = operations_v1.OperationsAsyncClient(
+ if self._operations_client is None:
+ self._operations_client = operations_v1.OperationsAsyncClient(
  self.grpc_channel
  )
 
  # Return the client from cache.
- return self.__dict__["operations_client"]
+ return self._operations_client
 
  @property
  def list_instance_configs(

diff --git a/google/cloud/spanner_admin_instance_v1/types/__init__.py b/google/cloud/spanner_admin_instance_v1/types/__init__.py
@@ -32,7 +32,6 @@
  UpdateInstanceMetadata,
 )
 
-
 __all__ = (
  "ReplicaInfo",
  "InstanceConfig",

diff --git a/google/cloud/spanner_v1/services/spanner/transports/__init__.py b/google/cloud/spanner_v1/services/spanner/transports/__init__.py
@@ -28,7 +28,6 @@
 _transport_registry["grpc"] = SpannerGrpcTransport
 _transport_registry["grpc_asyncio"] = SpannerGrpcAsyncIOTransport
 
-
 __all__ = (
  "SpannerTransport",
  "SpannerGrpcTransport",

diff --git a/google/cloud/spanner_v1/services/spanner/transports/grpc.py b/google/cloud/spanner_v1/services/spanner/transports/grpc.py
@@ -151,6 +151,10 @@ def __init__(
  ssl_credentials=ssl_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  self._ssl_channel_credentials = ssl_credentials
  else:
@@ -169,6 +173,10 @@ def __init__(
  ssl_credentials=ssl_channel_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
 
  self._stubs = {} # type: Dict[str, Callable]
@@ -195,7 +203,7 @@ def create_channel(
  ) -> grpc.Channel:
  """Create and return a gRPC channel object.
  Args:
- address (Optionsl[str]): The host for the channel to use.
+ address (Optional[str]): The host for the channel to use.
  credentials (Optional[~.Credentials]): The
  authorization credentials to attach to requests. These
  credentials identify this application to the service. If

diff --git a/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py b/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py
@@ -196,6 +196,10 @@ def __init__(
  ssl_credentials=ssl_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  self._ssl_channel_credentials = ssl_credentials
  else:
@@ -214,6 +218,10 @@ def __init__(
  ssl_credentials=ssl_channel_credentials,
  scopes=scopes or self.AUTH_SCOPES,
  quota_project_id=quota_project_id,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
 
  # Run the base constructor.

diff --git a/google/cloud/spanner_v1/types/__init__.py b/google/cloud/spanner_v1/types/__init__.py
@@ -32,6 +32,7 @@
 from .type import (
  Type,
  StructType,
+ TypeCode,
 )
 from .result_set import (
  ResultSet,
@@ -63,7 +64,6 @@
  RollbackRequest,
 )
 
-
 __all__ = (
  "KeyRange",
  "KeySet",
@@ -75,6 +75,7 @@
  "TransactionSelector",
  "Type",
  "StructType",
+ "TypeCode",
  "ResultSet",
  "PartialResultSet",
  "ResultSetMetadata",

diff --git a/synth.metadata b/synth.metadata
@@ -4,15 +4,15 @@
  "git": {
  "name": ".",
  "remote": "https://github.com/googleapis/python-spanner.git",
- "sha": "af5a3c65fbf81a93c1b4d4a8a9f65f06e96df325"
+ "sha": "2faf01b135360586ef27c66976646593fd85fd1e"
  }
  },
  {
  "git": {
  "name": "googleapis",
  "remote": "https://github.com/googleapis/googleapis.git",
- "sha": "53eb2512a55caabcbad1898225080a2a3dfcb6aa",
- "internalRef": "346818879"
+ "sha": "dd372aa22ded7a8ba6f0e03a80e06358a3fa0907",
+ "internalRef": "347055288"
  }
  },
  {

diff --git a/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py b/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
@@ -4784,6 +4784,10 @@ def test_database_admin_transport_channel_mtls_with_client_cert_source(transport
  ),
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  assert transport.grpc_channel == mock_grpc_channel
  assert transport._ssl_channel_credentials == mock_ssl_cred
@@ -4828,6 +4832,10 @@ def test_database_admin_transport_channel_mtls_with_adc(transport_class):
  ),
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  assert transport.grpc_channel == mock_grpc_channel
 

diff --git a/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py b/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
@@ -3141,6 +3141,10 @@ def test_instance_admin_transport_channel_mtls_with_client_cert_source(transport
  ),
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  assert transport.grpc_channel == mock_grpc_channel
  assert transport._ssl_channel_credentials == mock_ssl_cred
@@ -3185,6 +3189,10 @@ def test_instance_admin_transport_channel_mtls_with_adc(transport_class):
  ),
  ssl_credentials=mock_ssl_cred,
  quota_project_id=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
  )
  assert transport.grpc_channel == mock_grpc_channel