Skip to content
This repository was archived by the owner on Dec 31, 2023. It is now read-only.

Commit 3abec21

Browse files
arithmetic1728arithmetic1728
authored
feat: run synthtool to pick up mtls feature (#6)
1 parent 31fa794 commit 3abec21

221 files changed

Lines changed: 6344 additions & 6863 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.trampolinerc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
required_envvars+=(
1919
"STAGING_BUCKET"
2020
"V2_STAGING_BUCKET"
21-
"NOX_SESSION"
2221
)
2322

2423
# Add env vars which are passed down into the container here.

‎google/cloud/compute_v1/services/accelerator_types/client.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -268,21 +268,17 @@ def __init__(
268268
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
269269
)
270270

271-
ssl_credentials = None
271+
client_cert_source_func = None
272272
is_mtls = False
273273
if use_client_cert:
274274
if client_options.client_cert_source:
275-
import grpc # type: ignore
276-
277-
cert, key = client_options.client_cert_source()
278-
ssl_credentials = grpc.ssl_channel_credentials(
279-
certificate_chain=cert, private_key=key
280-
)
281275
is_mtls = True
276+
client_cert_source_func = client_options.client_cert_source
282277
else:
283-
creds = SslCredentials()
284-
is_mtls = creds.is_mtls
285-
ssl_credentials = creds.ssl_credentials if is_mtls else None
278+
is_mtls = mtls.has_default_client_cert_source()
279+
client_cert_source_func = (
280+
mtls.default_client_cert_source() if is_mtls else None
281+
)
286282

287283
# Figure out which api endpoint to use.
288284
if client_options.api_endpoint is not None:
@@ -325,7 +321,7 @@ def __init__(
325321
credentials_file=client_options.credentials_file,
326322
host=api_endpoint,
327323
scopes=client_options.scopes,
328-
ssl_channel_credentials=ssl_credentials,
324+
client_cert_source_for_mtls=client_cert_source_func,
329325
quota_project_id=client_options.quota_project_id,
330326
client_info=client_info,
331327
)

‎google/cloud/compute_v1/services/accelerator_types/transports/rest.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def __init__(
5555
credentials: credentials.Credentials = None,
5656
credentials_file: str = None,
5757
scopes: Sequence[str] = None,
58-
ssl_channel_credentials: grpc.ChannelCredentials = None,
58+
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
5959
quota_project_id: Optional[str] = None,
6060
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6161
) -> None:
@@ -74,8 +74,9 @@ def __init__(
7474
This argument is ignored if ``channel`` is provided.
7575
scopes (Optional(Sequence[str])): A list of scopes. This argument is
7676
ignored if ``channel`` is provided.
77-
ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
78-
for grpc channel. It is ignored if ``channel`` is provided.
77+
client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client
78+
certificate to configure mutual TLS HTTP channel. It is ignored
79+
if ``channel`` is provided.
7980
quota_project_id (Optional[str]): An optional project to use for billing
8081
and quota.
8182
client_info (google.api_core.gapic_v1.client_info.ClientInfo):
@@ -90,6 +91,8 @@ def __init__(
9091
host=host, credentials=credentials, client_info=client_info,
9192
)
9293
self._session = AuthorizedSession(self._credentials)
94+
if client_cert_source_for_mtls:
95+
self._session.configure_mtls_channel(client_cert_source_for_mtls)
9396

9497
def aggregated_list(
9598
self,
@@ -123,12 +126,12 @@ def aggregated_list(
123126
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
124127
# not required for GCE
125128
query_params = {
126-
"pageToken": request.page_token,
127-
"filter": request.filter,
128-
"orderBy": request.order_by,
129-
"includeAllScopes": request.include_all_scopes,
130129
"returnPartialSuccess": request.return_partial_success,
131130
"maxResults": request.max_results,
131+
"orderBy": request.order_by,
132+
"filter": request.filter,
133+
"pageToken": request.page_token,
134+
"includeAllScopes": request.include_all_scopes,
132135
}
133136
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
134137
# discards default values
@@ -233,11 +236,11 @@ def list(
233236
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
234237
# not required for GCE
235238
query_params = {
236-
"pageToken": request.page_token,
237-
"filter": request.filter,
238-
"orderBy": request.order_by,
239239
"returnPartialSuccess": request.return_partial_success,
240240
"maxResults": request.max_results,
241+
"orderBy": request.order_by,
242+
"filter": request.filter,
243+
"pageToken": request.page_token,
241244
}
242245
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
243246
# discards default values

‎google/cloud/compute_v1/services/addresses/client.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -264,21 +264,17 @@ def __init__(
264264
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
265265
)
266266

267-
ssl_credentials = None
267+
client_cert_source_func = None
268268
is_mtls = False
269269
if use_client_cert:
270270
if client_options.client_cert_source:
271-
import grpc # type: ignore
272-
273-
cert, key = client_options.client_cert_source()
274-
ssl_credentials = grpc.ssl_channel_credentials(
275-
certificate_chain=cert, private_key=key
276-
)
277271
is_mtls = True
272+
client_cert_source_func = client_options.client_cert_source
278273
else:
279-
creds = SslCredentials()
280-
is_mtls = creds.is_mtls
281-
ssl_credentials = creds.ssl_credentials if is_mtls else None
274+
is_mtls = mtls.has_default_client_cert_source()
275+
client_cert_source_func = (
276+
mtls.default_client_cert_source() if is_mtls else None
277+
)
282278

283279
# Figure out which api endpoint to use.
284280
if client_options.api_endpoint is not None:
@@ -321,7 +317,7 @@ def __init__(
321317
credentials_file=client_options.credentials_file,
322318
host=api_endpoint,
323319
scopes=client_options.scopes,
324-
ssl_channel_credentials=ssl_credentials,
320+
client_cert_source_for_mtls=client_cert_source_func,
325321
quota_project_id=client_options.quota_project_id,
326322
client_info=client_info,
327323
)

‎google/cloud/compute_v1/services/addresses/transports/rest.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(
5454
credentials: credentials.Credentials = None,
5555
credentials_file: str = None,
5656
scopes: Sequence[str] = None,
57-
ssl_channel_credentials: grpc.ChannelCredentials = None,
57+
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
5858
quota_project_id: Optional[str] = None,
5959
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6060
) -> None:
@@ -73,8 +73,9 @@ def __init__(
7373
This argument is ignored if ``channel`` is provided.
7474
scopes (Optional(Sequence[str])): A list of scopes. This argument is
7575
ignored if ``channel`` is provided.
76-
ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
77-
for grpc channel. It is ignored if ``channel`` is provided.
76+
client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client
77+
certificate to configure mutual TLS HTTP channel. It is ignored
78+
if ``channel`` is provided.
7879
quota_project_id (Optional[str]): An optional project to use for billing
7980
and quota.
8081
client_info (google.api_core.gapic_v1.client_info.ClientInfo):
@@ -89,6 +90,8 @@ def __init__(
8990
host=host, credentials=credentials, client_info=client_info,
9091
)
9192
self._session = AuthorizedSession(self._credentials)
93+
if client_cert_source_for_mtls:
94+
self._session.configure_mtls_channel(client_cert_source_for_mtls)
9295

9396
def aggregated_list(
9497
self,
@@ -122,12 +125,12 @@ def aggregated_list(
122125
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
123126
# not required for GCE
124127
query_params = {
125-
"pageToken": request.page_token,
126-
"filter": request.filter,
127-
"orderBy": request.order_by,
128-
"includeAllScopes": request.include_all_scopes,
129128
"returnPartialSuccess": request.return_partial_success,
130129
"maxResults": request.max_results,
130+
"orderBy": request.order_by,
131+
"filter": request.filter,
132+
"pageToken": request.page_token,
133+
"includeAllScopes": request.include_all_scopes,
131134
}
132135
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
133136
# discards default values
@@ -410,11 +413,11 @@ def list(
410413
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
411414
# not required for GCE
412415
query_params = {
413-
"pageToken": request.page_token,
414-
"filter": request.filter,
415-
"orderBy": request.order_by,
416416
"returnPartialSuccess": request.return_partial_success,
417417
"maxResults": request.max_results,
418+
"orderBy": request.order_by,
419+
"filter": request.filter,
420+
"pageToken": request.page_token,
418421
}
419422
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
420423
# discards default values

‎google/cloud/compute_v1/services/autoscalers/client.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -264,21 +264,17 @@ def __init__(
264264
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
265265
)
266266

267-
ssl_credentials = None
267+
client_cert_source_func = None
268268
is_mtls = False
269269
if use_client_cert:
270270
if client_options.client_cert_source:
271-
import grpc # type: ignore
272-
273-
cert, key = client_options.client_cert_source()
274-
ssl_credentials = grpc.ssl_channel_credentials(
275-
certificate_chain=cert, private_key=key
276-
)
277271
is_mtls = True
272+
client_cert_source_func = client_options.client_cert_source
278273
else:
279-
creds = SslCredentials()
280-
is_mtls = creds.is_mtls
281-
ssl_credentials = creds.ssl_credentials if is_mtls else None
274+
is_mtls = mtls.has_default_client_cert_source()
275+
client_cert_source_func = (
276+
mtls.default_client_cert_source() if is_mtls else None
277+
)
282278

283279
# Figure out which api endpoint to use.
284280
if client_options.api_endpoint is not None:
@@ -321,7 +317,7 @@ def __init__(
321317
credentials_file=client_options.credentials_file,
322318
host=api_endpoint,
323319
scopes=client_options.scopes,
324-
ssl_channel_credentials=ssl_credentials,
320+
client_cert_source_for_mtls=client_cert_source_func,
325321
quota_project_id=client_options.quota_project_id,
326322
client_info=client_info,
327323
)

‎google/cloud/compute_v1/services/autoscalers/transports/rest.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(
5454
credentials: credentials.Credentials = None,
5555
credentials_file: str = None,
5656
scopes: Sequence[str] = None,
57-
ssl_channel_credentials: grpc.ChannelCredentials = None,
57+
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
5858
quota_project_id: Optional[str] = None,
5959
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6060
) -> None:
@@ -73,8 +73,9 @@ def __init__(
7373
This argument is ignored if ``channel`` is provided.
7474
scopes (Optional(Sequence[str])): A list of scopes. This argument is
7575
ignored if ``channel`` is provided.
76-
ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
77-
for grpc channel. It is ignored if ``channel`` is provided.
76+
client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client
77+
certificate to configure mutual TLS HTTP channel. It is ignored
78+
if ``channel`` is provided.
7879
quota_project_id (Optional[str]): An optional project to use for billing
7980
and quota.
8081
client_info (google.api_core.gapic_v1.client_info.ClientInfo):
@@ -89,6 +90,8 @@ def __init__(
8990
host=host, credentials=credentials, client_info=client_info,
9091
)
9192
self._session = AuthorizedSession(self._credentials)
93+
if client_cert_source_for_mtls:
94+
self._session.configure_mtls_channel(client_cert_source_for_mtls)
9295

9396
def aggregated_list(
9497
self,
@@ -122,12 +125,12 @@ def aggregated_list(
122125
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
123126
# not required for GCE
124127
query_params = {
125-
"pageToken": request.page_token,
126-
"filter": request.filter,
127-
"orderBy": request.order_by,
128-
"includeAllScopes": request.include_all_scopes,
129128
"returnPartialSuccess": request.return_partial_success,
130129
"maxResults": request.max_results,
130+
"orderBy": request.order_by,
131+
"filter": request.filter,
132+
"pageToken": request.page_token,
133+
"includeAllScopes": request.include_all_scopes,
131134
}
132135
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
133136
# discards default values
@@ -406,11 +409,11 @@ def list(
406409
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
407410
# not required for GCE
408411
query_params = {
409-
"pageToken": request.page_token,
410-
"filter": request.filter,
411-
"orderBy": request.order_by,
412412
"returnPartialSuccess": request.return_partial_success,
413413
"maxResults": request.max_results,
414+
"orderBy": request.order_by,
415+
"filter": request.filter,
416+
"pageToken": request.page_token,
414417
}
415418
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
416419
# discards default values
@@ -491,8 +494,8 @@ def patch(
491494
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
492495
# not required for GCE
493496
query_params = {
494-
"requestId": request.request_id,
495497
"autoscaler": request.autoscaler,
498+
"requestId": request.request_id,
496499
}
497500
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
498501
# discards default values
@@ -573,8 +576,8 @@ def update(
573576
# TODO(yon-mg): handle nested fields corerctly rather than using only top level fields
574577
# not required for GCE
575578
query_params = {
576-
"requestId": request.request_id,
577579
"autoscaler": request.autoscaler,
580+
"requestId": request.request_id,
578581
}
579582
# TODO(yon-mg): further discussion needed whether 'python truthiness' is appropriate here
580583
# discards default values

‎google/cloud/compute_v1/services/backend_buckets/client.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -266,21 +266,17 @@ def __init__(
266266
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
267267
)
268268

269-
ssl_credentials = None
269+
client_cert_source_func = None
270270
is_mtls = False
271271
if use_client_cert:
272272
if client_options.client_cert_source:
273-
import grpc # type: ignore
274-
275-
cert, key = client_options.client_cert_source()
276-
ssl_credentials = grpc.ssl_channel_credentials(
277-
certificate_chain=cert, private_key=key
278-
)
279273
is_mtls = True
274+
client_cert_source_func = client_options.client_cert_source
280275
else:
281-
creds = SslCredentials()
282-
is_mtls = creds.is_mtls
283-
ssl_credentials = creds.ssl_credentials if is_mtls else None
276+
is_mtls = mtls.has_default_client_cert_source()
277+
client_cert_source_func = (
278+
mtls.default_client_cert_source() if is_mtls else None
279+
)
284280

285281
# Figure out which api endpoint to use.
286282
if client_options.api_endpoint is not None:
@@ -323,7 +319,7 @@ def __init__(
323319
credentials_file=client_options.credentials_file,
324320
host=api_endpoint,
325321
scopes=client_options.scopes,
326-
ssl_channel_credentials=ssl_credentials,
322+
client_cert_source_for_mtls=client_cert_source_func,
327323
quota_project_id=client_options.quota_project_id,
328324
client_info=client_info,
329325
)

0 commit comments

Comments
 (0)