From 6c9a1badfed610a18454137e1b45156872914e7e Mon Sep 17 00:00:00 2001 From: larkee <31196561+larkee@users.noreply.github.com> Date: Fri, 17 Apr 2020 13:43:52 +1200 Subject: [PATCH] fix: pass gRPC config options to gRPC channel creation (#26) * fix: pass gRPC config options to grpc channel creation * regen spanner_grpc_transport.py to include changes (via synth) Co-authored-by: larkee --- .../spanner_v1/gapic/transports/spanner_grpc_transport.py | 3 +++ synth.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py b/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py index 1a3d0d1407..72b7beeda6 100644 --- a/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py +++ b/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py @@ -107,6 +107,9 @@ def create_channel( pkg_resources.resource_string(__name__, _SPANNER_GRPC_CONFIG) ) options = [(grpc_gcp.API_CONFIG_CHANNEL_ARG, grpc_gcp_config)] + if "options" in kwargs: + options.extend(kwargs["options"]) + kwargs["options"] = options return google.api_core.grpc_helpers.create_channel( address, credentials=credentials, scopes=cls._OAUTH_SCOPES, **kwargs ) diff --git a/synth.py b/synth.py index a351bbf943..ed1794b090 100644 --- a/synth.py +++ b/synth.py @@ -62,6 +62,9 @@ "\g<1>grpc_gcp_config = grpc_gcp.api_config_from_text_pb(" "\g<1> pkg_resources.resource_string(__name__, _SPANNER_GRPC_CONFIG))" "\g<1>options = [(grpc_gcp.API_CONFIG_CHANNEL_ARG, grpc_gcp_config)]" + "\g<1>if 'options' in kwargs:" + "\g<1> options.extend(kwargs['options'])" + "\g<1>kwargs['options'] = options" "\g<0>", ) s.replace(