From d68bf5d57f20277a20e9739b341ec59062773dee Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 28 Jun 2019 05:29:37 -0700 Subject: [PATCH] [CHANGE ME] Re-generated oslogin to pick up changes in the API or client library generator. --- .../oslogin_v1/gapic/os_login_service_client.py | 17 ++++++++++++++++- oslogin/synth.metadata | 10 +++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/oslogin/google/cloud/oslogin_v1/gapic/os_login_service_client.py b/oslogin/google/cloud/oslogin_v1/gapic/os_login_service_client.py index 4c3b56168a28..827c87d81b19 100644 --- a/oslogin/google/cloud/oslogin_v1/gapic/os_login_service_client.py +++ b/oslogin/google/cloud/oslogin_v1/gapic/os_login_service_client.py @@ -20,6 +20,7 @@ import warnings from google.oauth2 import service_account +import google.api_core.client_options import google.api_core.gapic_v1.client_info import google.api_core.gapic_v1.config import google.api_core.gapic_v1.method @@ -103,6 +104,7 @@ def __init__( credentials=None, client_config=None, client_info=None, + client_options=None, ): """Constructor. @@ -133,6 +135,9 @@ def __init__( API requests. If ``None``, then default info will be used. Generally, you only need to set this if you're developing your own client library. + client_options (Union[dict, google.api_core.client_options.ClientOptions]): + Client options used to set user options on the client. API Endpoint + should be set through client_options. """ # Raise deprecation warnings for things we want to go away. if client_config is not None: @@ -151,6 +156,15 @@ def __init__( stacklevel=2, ) + api_endpoint = self.SERVICE_ADDRESS + if client_options: + if type(client_options) == dict: + client_options = google.api_core.client_options.from_dict( + client_options + ) + if client_options.api_endpoint: + api_endpoint = client_options.api_endpoint + # Instantiate the transport. # The transport is responsible for handling serialization and # deserialization and actually sending data to the service. @@ -159,6 +173,7 @@ def __init__( self.transport = transport( credentials=credentials, default_class=os_login_service_grpc_transport.OsLoginServiceGrpcTransport, + address=api_endpoint, ) else: if credentials: @@ -169,7 +184,7 @@ def __init__( self.transport = transport else: self.transport = os_login_service_grpc_transport.OsLoginServiceGrpcTransport( - address=self.SERVICE_ADDRESS, channel=channel, credentials=credentials + address=api_endpoint, channel=channel, credentials=credentials ) if client_info is None: diff --git a/oslogin/synth.metadata b/oslogin/synth.metadata index 67bcc8d507be..105fdd91c9e6 100644 --- a/oslogin/synth.metadata +++ b/oslogin/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-18T12:23:34.412804Z", + "updateTime": "2019-06-28T12:29:36.850307Z", "sources": [ { "generator": { "name": "artman", - "version": "0.27.0", - "dockerImage": "googleapis/artman@sha256:b036a7f4278d9deb5796f065e5c7f608d47d75369985ca7ab5039998120e972d" + "version": "0.29.2", + "dockerImage": "googleapis/artman@sha256:45263333b058a4b3c26a8b7680a2710f43eae3d250f791a6cb66423991dcb2df" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "384aa843867c4d17756d14a01f047b6368494d32", - "internalRef": "253675319" + "sha": "84c8ad4e52f8eec8f08a60636cfa597b86969b5c", + "internalRef": "255474859" } }, {