From 6785b3db2d07029b4c58944b6fe74997f7355372 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 10 Dec 2020 00:49:17 +0000 Subject: [PATCH 1/2] fix: remove client-side send/recv limit --- .../%version/%sub/services/%service/transports/grpc.py.j2 | 8 ++++++++ .../unit/gapic/%name_%version/%sub/test_%service.py.j2 | 8 ++++++++ .../%sub/services/%service/transports/grpc.py.j2 | 8 ++++++++ .../%sub/services/%service/transports/grpc_asyncio.py.j2 | 8 ++++++++ .../%sub/services/%service/transports/rest.py.j2 | 4 ++++ .../unit/gapic/%name_%version/%sub/test_%service.py.j2 | 8 ++++++++ 6 files changed, 44 insertions(+) diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 index 6438991b57..d12feb65a0 100644 --- a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 +++ b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 @@ -124,6 +124,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): 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: @@ -138,6 +142,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): credentials=credentials, ssl_credentials=ssl_channel_credentials, scopes=self.AUTH_SCOPES, + options={ + "grpc.max_send_message_length": -1, + "grpc.max_receive_message_length": -1, + }, ) self._stubs = {} # type: Dict[str, Callable] diff --git a/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 5dc0f26bab..976fd5f923 100644 --- a/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -748,6 +748,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_client_cert_s ), 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 @@ -787,6 +791,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_adc( ), 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/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 index 3d1f5ca9b2..68f54bd6c0 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 @@ -132,6 +132,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): 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: @@ -148,6 +152,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): 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] diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 index 5ea7031162..fcad4baef4 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 @@ -176,6 +176,10 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport): 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: @@ -192,6 +196,10 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport): 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/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 index a25f66e2a7..5a130a417e 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 @@ -101,6 +101,10 @@ class {{ service.name }}RestTransport({{ service.name }}Transport): self._host, credentials=self._credentials, scopes=self.AUTH_SCOPES, + options={ + "grpc.max_send_message_length": -1, + "grpc.max_receive_message_length": -1, + }, ) ) diff --git a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 5882e95f78..6b6d09a6db 100644 --- a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -1237,6 +1237,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_client_cert_s ), 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 @@ -1276,6 +1280,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_adc( ), 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 From fbd4d4421562037775239e79d27f84e08d022a18 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 10 Dec 2020 00:53:47 +0000 Subject: [PATCH 2/2] fix: use list of tuples --- .../%sub/services/%service/transports/grpc.py.j2 | 16 ++++++++-------- .../%name_%version/%sub/test_%service.py.j2 | 16 ++++++++-------- .../%sub/services/%service/transports/grpc.py.j2 | 16 ++++++++-------- .../%service/transports/grpc_asyncio.py.j2 | 16 ++++++++-------- .../%sub/services/%service/transports/rest.py.j2 | 8 ++++---- .../%name_%version/%sub/test_%service.py.j2 | 16 ++++++++-------- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 index d12feb65a0..c8e721b9cc 100644 --- a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 +++ b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/grpc.py.j2 @@ -124,10 +124,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): 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, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._ssl_channel_credentials = ssl_credentials else: @@ -142,10 +142,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): credentials=credentials, ssl_credentials=ssl_channel_credentials, scopes=self.AUTH_SCOPES, - options={ - "grpc.max_send_message_length": -1, - "grpc.max_receive_message_length": -1, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._stubs = {} # type: Dict[str, Callable] diff --git a/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 976fd5f923..b1b9ec2679 100644 --- a/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -748,10 +748,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_client_cert_s ), ssl_credentials=mock_ssl_cred, quota_project_id=None, - options={ - "grpc.max_send_message_length": -1, - "grpc.max_receive_message_length": -1, - }, + 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 @@ -791,10 +791,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_adc( ), ssl_credentials=mock_ssl_cred, quota_project_id=None, - options={ - "grpc.max_send_message_length": -1, - "grpc.max_receive_message_length": -1, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) assert transport.grpc_channel == mock_grpc_channel diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 index 68f54bd6c0..0bcd1fa64f 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc.py.j2 @@ -132,10 +132,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): 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, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._ssl_channel_credentials = ssl_credentials else: @@ -152,10 +152,10 @@ class {{ service.name }}GrpcTransport({{ service.name }}Transport): 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, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._stubs = {} # type: Dict[str, Callable] diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 index fcad4baef4..83013d83ee 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/grpc_asyncio.py.j2 @@ -176,10 +176,10 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport): 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, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._ssl_channel_credentials = ssl_credentials else: @@ -196,10 +196,10 @@ class {{ service.grpc_asyncio_transport_name }}({{ service.name }}Transport): 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, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) # Run the base constructor. diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 index 5a130a417e..ad7e4051b9 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 @@ -101,10 +101,10 @@ class {{ service.name }}RestTransport({{ service.name }}Transport): self._host, credentials=self._credentials, scopes=self.AUTH_SCOPES, - options={ - "grpc.max_send_message_length": -1, - "grpc.max_receive_message_length": -1, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) ) diff --git a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 6b6d09a6db..18108233b8 100644 --- a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -1237,10 +1237,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_client_cert_s ), ssl_credentials=mock_ssl_cred, quota_project_id=None, - options={ - "grpc.max_send_message_length": -1, - "grpc.max_receive_message_length": -1, - }, + 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 @@ -1280,10 +1280,10 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_adc( ), ssl_credentials=mock_ssl_cred, quota_project_id=None, - options={ - "grpc.max_send_message_length": -1, - "grpc.max_receive_message_length": -1, - }, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) assert transport.grpc_channel == mock_grpc_channel