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

chore: use gapic-generator-python 0.51.2 #120

Merged
merged 2 commits into from
Sep 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from distutils import util
import os
import re
from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union
from typing import Dict, Optional, Sequence, Tuple, Type, Union
import pkg_resources

from google.api_core import client_options as client_options_lib # type: ignore
Expand Down Expand Up @@ -363,7 +363,7 @@ def __init__(

def generate_access_token(
self,
request: common.GenerateAccessTokenRequest = None,
request: Union[common.GenerateAccessTokenRequest, dict] = None,
*,
name: str = None,
delegates: Sequence[str] = None,
Expand All @@ -377,7 +377,7 @@ def generate_access_token(
account.

Args:
request (google.cloud.iam_credentials_v1.types.GenerateAccessTokenRequest):
request (Union[google.cloud.iam_credentials_v1.types.GenerateAccessTokenRequest, dict]):
The request object.
name (str):
Required. The resource name of the service account for
Expand Down Expand Up @@ -485,7 +485,7 @@ def generate_access_token(

def generate_id_token(
self,
request: common.GenerateIdTokenRequest = None,
request: Union[common.GenerateIdTokenRequest, dict] = None,
*,
name: str = None,
delegates: Sequence[str] = None,
Expand All @@ -499,7 +499,7 @@ def generate_id_token(
account.

Args:
request (google.cloud.iam_credentials_v1.types.GenerateIdTokenRequest):
request (Union[google.cloud.iam_credentials_v1.types.GenerateIdTokenRequest, dict]):
The request object.
name (str):
Required. The resource name of the service account for
Expand Down Expand Up @@ -601,7 +601,7 @@ def generate_id_token(

def sign_blob(
self,
request: common.SignBlobRequest = None,
request: Union[common.SignBlobRequest, dict] = None,
*,
name: str = None,
delegates: Sequence[str] = None,
Expand All @@ -614,7 +614,7 @@ def sign_blob(
private key.

Args:
request (google.cloud.iam_credentials_v1.types.SignBlobRequest):
request (Union[google.cloud.iam_credentials_v1.types.SignBlobRequest, dict]):
The request object.
name (str):
Required. The resource name of the service account for
Expand Down Expand Up @@ -703,7 +703,7 @@ def sign_blob(

def sign_jwt(
self,
request: common.SignJwtRequest = None,
request: Union[common.SignJwtRequest, dict] = None,
*,
name: str = None,
delegates: Sequence[str] = None,
Expand All @@ -716,7 +716,7 @@ def sign_jwt(
private key.

Args:
request (google.cloud.iam_credentials_v1.types.SignJwtRequest):
request (Union[google.cloud.iam_credentials_v1.types.SignJwtRequest, dict]):
The request object.
name (str):
Required. The resource name of the service account for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def __init__(
**scopes_kwargs, quota_project_id=quota_project_id
)

# If the credentials is service account credentials, then always try to use self signed JWT.
# If the credentials are service account credentials, then always try to use self signed JWT.
if (
always_use_jwt_access
and isinstance(credentials, service_account.Credentials)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@ def __init__(
api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint.
If provided, it overrides the ``host`` argument and tries to create
a mutual TLS channel with client SSL credentials from
``client_cert_source`` or applicatin default SSL credentials.
``client_cert_source`` or application default SSL credentials.
client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]):
Deprecated. A callback to provide client SSL certificate bytes and
private key bytes, both in PEM format. It is ignored if
``api_mtls_endpoint`` is None.
ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
for grpc channel. It is ignored if ``channel`` is provided.
for the grpc channel. It is ignored if ``channel`` is provided.
client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]):
A callback to provide client certificate bytes and private key bytes,
both in PEM format. It is used to configure mutual TLS channel. It is
both in PEM format. It is used to configure a mutual TLS channel. It is
ignored if ``channel`` or ``ssl_channel_credentials`` is provided.
quota_project_id (Optional[str]): An optional project to use for billing
and quota.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,16 @@ def __init__(
api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint.
If provided, it overrides the ``host`` argument and tries to create
a mutual TLS channel with client SSL credentials from
``client_cert_source`` or applicatin default SSL credentials.
``client_cert_source`` or application default SSL credentials.
client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]):
Deprecated. A callback to provide client SSL certificate bytes and
private key bytes, both in PEM format. It is ignored if
``api_mtls_endpoint`` is None.
ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
for grpc channel. It is ignored if ``channel`` is provided.
for the grpc channel. It is ignored if ``channel`` is provided.
client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]):
A callback to provide client certificate bytes and private key bytes,
both in PEM format. It is used to configure mutual TLS channel. It is
both in PEM format. It is used to configure a mutual TLS channel. It is
ignored if ``channel`` or ``ssl_channel_credentials`` is provided.
quota_project_id (Optional[str]): An optional project to use for billing
and quota.
Expand Down
10 changes: 5 additions & 5 deletions scripts/fixup_credentials_v1_keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ def partition(
class credentialsCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'generate_access_token': ('name', 'scope', 'delegates', 'lifetime', ),
'generate_id_token': ('name', 'audience', 'delegates', 'include_email', ),
'sign_blob': ('name', 'payload', 'delegates', ),
'sign_jwt': ('name', 'payload', 'delegates', ),
'generate_access_token': ('name', 'scope', 'delegates', 'lifetime', ),
'generate_id_token': ('name', 'audience', 'delegates', 'include_email', ),
'sign_blob': ('name', 'payload', 'delegates', ),
'sign_jwt': ('name', 'payload', 'delegates', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -61,7 +61,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down