Skip to content
This repository was archived by the owner on Jul 6, 2023. It is now read-only.
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,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 @@ -85,16 +85,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 @@ -134,16 +134,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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,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 @@ -85,16 +85,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 @@ -134,16 +134,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
60 changes: 30 additions & 30 deletions scripts/fixup_privateca_v1_keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,35 +39,35 @@ def partition(
class privatecaCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'activate_certificate_authority': ('name', 'pem_ca_certificate', 'subordinate_config', 'request_id', ),
'create_ca_pool': ('parent', 'ca_pool_id', 'ca_pool', 'request_id', ),
'create_certificate': ('parent', 'certificate', 'certificate_id', 'request_id', 'validate_only', 'issuing_certificate_authority_id', ),
'create_certificate_authority': ('parent', 'certificate_authority_id', 'certificate_authority', 'request_id', ),
'create_certificate_template': ('parent', 'certificate_template_id', 'certificate_template', 'request_id', ),
'delete_ca_pool': ('name', 'request_id', ),
'delete_certificate_authority': ('name', 'request_id', 'ignore_active_certificates', ),
'delete_certificate_template': ('name', 'request_id', ),
'disable_certificate_authority': ('name', 'request_id', ),
'enable_certificate_authority': ('name', 'request_id', ),
'fetch_ca_certs': ('ca_pool', 'request_id', ),
'fetch_certificate_authority_csr': ('name', ),
'get_ca_pool': ('name', ),
'get_certificate': ('name', ),
'get_certificate_authority': ('name', ),
'get_certificate_revocation_list': ('name', ),
'get_certificate_template': ('name', ),
'list_ca_pools': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_authorities': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_revocation_lists': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_templates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'revoke_certificate': ('name', 'reason', 'request_id', ),
'undelete_certificate_authority': ('name', 'request_id', ),
'update_ca_pool': ('ca_pool', 'update_mask', 'request_id', ),
'update_certificate': ('certificate', 'update_mask', 'request_id', ),
'update_certificate_authority': ('certificate_authority', 'update_mask', 'request_id', ),
'update_certificate_revocation_list': ('certificate_revocation_list', 'update_mask', 'request_id', ),
'update_certificate_template': ('certificate_template', 'update_mask', 'request_id', ),
'activate_certificate_authority': ('name', 'pem_ca_certificate', 'subordinate_config', 'request_id', ),
'create_ca_pool': ('parent', 'ca_pool_id', 'ca_pool', 'request_id', ),
'create_certificate': ('parent', 'certificate', 'certificate_id', 'request_id', 'validate_only', 'issuing_certificate_authority_id', ),
'create_certificate_authority': ('parent', 'certificate_authority_id', 'certificate_authority', 'request_id', ),
'create_certificate_template': ('parent', 'certificate_template_id', 'certificate_template', 'request_id', ),
'delete_ca_pool': ('name', 'request_id', ),
'delete_certificate_authority': ('name', 'request_id', 'ignore_active_certificates', ),
'delete_certificate_template': ('name', 'request_id', ),
'disable_certificate_authority': ('name', 'request_id', ),
'enable_certificate_authority': ('name', 'request_id', ),
'fetch_ca_certs': ('ca_pool', 'request_id', ),
'fetch_certificate_authority_csr': ('name', ),
'get_ca_pool': ('name', ),
'get_certificate': ('name', ),
'get_certificate_authority': ('name', ),
'get_certificate_revocation_list': ('name', ),
'get_certificate_template': ('name', ),
'list_ca_pools': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_authorities': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_revocation_lists': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_templates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'revoke_certificate': ('name', 'reason', 'request_id', ),
'undelete_certificate_authority': ('name', 'request_id', ),
'update_ca_pool': ('ca_pool', 'update_mask', 'request_id', ),
'update_certificate': ('certificate', 'update_mask', 'request_id', ),
'update_certificate_authority': ('certificate_authority', 'update_mask', 'request_id', ),
'update_certificate_revocation_list': ('certificate_revocation_list', 'update_mask', 'request_id', ),
'update_certificate_template': ('certificate_template', 'update_mask', 'request_id', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -86,7 +86,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
42 changes: 21 additions & 21 deletions scripts/fixup_privateca_v1beta1_keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@ def partition(
class privatecaCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'activate_certificate_authority': ('name', 'pem_ca_certificate', 'subordinate_config', 'request_id', ),
'create_certificate': ('parent', 'certificate', 'certificate_id', 'request_id', ),
'create_certificate_authority': ('parent', 'certificate_authority_id', 'certificate_authority', 'request_id', ),
'disable_certificate_authority': ('name', 'request_id', ),
'enable_certificate_authority': ('name', 'request_id', ),
'fetch_certificate_authority_csr': ('name', ),
'get_certificate': ('name', ),
'get_certificate_authority': ('name', ),
'get_certificate_revocation_list': ('name', ),
'get_reusable_config': ('name', ),
'list_certificate_authorities': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_revocation_lists': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_reusable_configs': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'restore_certificate_authority': ('name', 'request_id', ),
'revoke_certificate': ('name', 'reason', 'request_id', ),
'schedule_delete_certificate_authority': ('name', 'request_id', ),
'update_certificate': ('certificate', 'update_mask', 'request_id', ),
'update_certificate_authority': ('certificate_authority', 'update_mask', 'request_id', ),
'update_certificate_revocation_list': ('certificate_revocation_list', 'update_mask', 'request_id', ),
'activate_certificate_authority': ('name', 'pem_ca_certificate', 'subordinate_config', 'request_id', ),
'create_certificate': ('parent', 'certificate', 'certificate_id', 'request_id', ),
'create_certificate_authority': ('parent', 'certificate_authority_id', 'certificate_authority', 'request_id', ),
'disable_certificate_authority': ('name', 'request_id', ),
'enable_certificate_authority': ('name', 'request_id', ),
'fetch_certificate_authority_csr': ('name', ),
'get_certificate': ('name', ),
'get_certificate_authority': ('name', ),
'get_certificate_revocation_list': ('name', ),
'get_reusable_config': ('name', ),
'list_certificate_authorities': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificate_revocation_lists': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_certificates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'list_reusable_configs': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
'restore_certificate_authority': ('name', 'request_id', ),
'revoke_certificate': ('name', 'reason', 'request_id', ),
'schedule_delete_certificate_authority': ('name', 'request_id', ),
'update_certificate': ('certificate', 'update_mask', 'request_id', ),
'update_certificate_authority': ('certificate_authority', 'update_mask', 'request_id', ),
'update_certificate_revocation_list': ('certificate_revocation_list', 'update_mask', 'request_id', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -77,7 +77,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