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

Commit 7a1d242

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#145)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent ab00b52 commit 7a1d242

File tree

16 files changed

+319
-449
lines changed

16 files changed

+319
-449
lines changed

‎google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py

Lines changed: 90 additions & 88 deletions
Large diffs are not rendered by default.

‎google/cloud/security/privateca_v1/services/certificate_authority_service/client.py

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.security.privateca_v1.services.certificate_authority_service import (
@@ -460,7 +462,7 @@ def create_certificate(
460462
parent: str = None,
461463
certificate: resources.Certificate = None,
462464
certificate_id: str = None,
463-
retry: retries.Retry = gapic_v1.method.DEFAULT,
465+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
464466
timeout: float = None,
465467
metadata: Sequence[Tuple[str, str]] = (),
466468
) -> resources.Certificate:
@@ -560,7 +562,7 @@ def get_certificate(
560562
request: Union[service.GetCertificateRequest, dict] = None,
561563
*,
562564
name: str = None,
563-
retry: retries.Retry = gapic_v1.method.DEFAULT,
565+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
564566
timeout: float = None,
565567
metadata: Sequence[Tuple[str, str]] = (),
566568
) -> resources.Certificate:
@@ -635,7 +637,7 @@ def list_certificates(
635637
request: Union[service.ListCertificatesRequest, dict] = None,
636638
*,
637639
parent: str = None,
638-
retry: retries.Retry = gapic_v1.method.DEFAULT,
640+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
639641
timeout: float = None,
640642
metadata: Sequence[Tuple[str, str]] = (),
641643
) -> pagers.ListCertificatesPager:
@@ -718,7 +720,7 @@ def revoke_certificate(
718720
request: Union[service.RevokeCertificateRequest, dict] = None,
719721
*,
720722
name: str = None,
721-
retry: retries.Retry = gapic_v1.method.DEFAULT,
723+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
722724
timeout: float = None,
723725
metadata: Sequence[Tuple[str, str]] = (),
724726
) -> resources.Certificate:
@@ -793,7 +795,7 @@ def update_certificate(
793795
*,
794796
certificate: resources.Certificate = None,
795797
update_mask: field_mask_pb2.FieldMask = None,
796-
retry: retries.Retry = gapic_v1.method.DEFAULT,
798+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
797799
timeout: float = None,
798800
metadata: Sequence[Tuple[str, str]] = (),
799801
) -> resources.Certificate:
@@ -880,7 +882,7 @@ def activate_certificate_authority(
880882
request: Union[service.ActivateCertificateAuthorityRequest, dict] = None,
881883
*,
882884
name: str = None,
883-
retry: retries.Retry = gapic_v1.method.DEFAULT,
885+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
884886
timeout: float = None,
885887
metadata: Sequence[Tuple[str, str]] = (),
886888
) -> operation.Operation:
@@ -979,7 +981,7 @@ def create_certificate_authority(
979981
parent: str = None,
980982
certificate_authority: resources.CertificateAuthority = None,
981983
certificate_authority_id: str = None,
982-
retry: retries.Retry = gapic_v1.method.DEFAULT,
984+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
983985
timeout: float = None,
984986
metadata: Sequence[Tuple[str, str]] = (),
985987
) -> operation.Operation:
@@ -1091,7 +1093,7 @@ def disable_certificate_authority(
10911093
request: Union[service.DisableCertificateAuthorityRequest, dict] = None,
10921094
*,
10931095
name: str = None,
1094-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1096+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10951097
timeout: float = None,
10961098
metadata: Sequence[Tuple[str, str]] = (),
10971099
) -> operation.Operation:
@@ -1180,7 +1182,7 @@ def enable_certificate_authority(
11801182
request: Union[service.EnableCertificateAuthorityRequest, dict] = None,
11811183
*,
11821184
name: str = None,
1183-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1185+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11841186
timeout: float = None,
11851187
metadata: Sequence[Tuple[str, str]] = (),
11861188
) -> operation.Operation:
@@ -1269,7 +1271,7 @@ def fetch_certificate_authority_csr(
12691271
request: Union[service.FetchCertificateAuthorityCsrRequest, dict] = None,
12701272
*,
12711273
name: str = None,
1272-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1274+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12731275
timeout: float = None,
12741276
metadata: Sequence[Tuple[str, str]] = (),
12751277
) -> service.FetchCertificateAuthorityCsrResponse:
@@ -1354,7 +1356,7 @@ def get_certificate_authority(
13541356
request: Union[service.GetCertificateAuthorityRequest, dict] = None,
13551357
*,
13561358
name: str = None,
1357-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1359+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13581360
timeout: float = None,
13591361
metadata: Sequence[Tuple[str, str]] = (),
13601362
) -> resources.CertificateAuthority:
@@ -1434,7 +1436,7 @@ def list_certificate_authorities(
14341436
request: Union[service.ListCertificateAuthoritiesRequest, dict] = None,
14351437
*,
14361438
parent: str = None,
1437-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1439+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14381440
timeout: float = None,
14391441
metadata: Sequence[Tuple[str, str]] = (),
14401442
) -> pagers.ListCertificateAuthoritiesPager:
@@ -1520,7 +1522,7 @@ def undelete_certificate_authority(
15201522
request: Union[service.UndeleteCertificateAuthorityRequest, dict] = None,
15211523
*,
15221524
name: str = None,
1523-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1525+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15241526
timeout: float = None,
15251527
metadata: Sequence[Tuple[str, str]] = (),
15261528
) -> operation.Operation:
@@ -1610,7 +1612,7 @@ def delete_certificate_authority(
16101612
request: Union[service.DeleteCertificateAuthorityRequest, dict] = None,
16111613
*,
16121614
name: str = None,
1613-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1615+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16141616
timeout: float = None,
16151617
metadata: Sequence[Tuple[str, str]] = (),
16161618
) -> operation.Operation:
@@ -1700,7 +1702,7 @@ def update_certificate_authority(
17001702
*,
17011703
certificate_authority: resources.CertificateAuthority = None,
17021704
update_mask: field_mask_pb2.FieldMask = None,
1703-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1705+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17041706
timeout: float = None,
17051707
metadata: Sequence[Tuple[str, str]] = (),
17061708
) -> operation.Operation:
@@ -1801,7 +1803,7 @@ def create_ca_pool(
18011803
parent: str = None,
18021804
ca_pool: resources.CaPool = None,
18031805
ca_pool_id: str = None,
1804-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1806+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18051807
timeout: float = None,
18061808
metadata: Sequence[Tuple[str, str]] = (),
18071809
) -> operation.Operation:
@@ -1911,7 +1913,7 @@ def update_ca_pool(
19111913
*,
19121914
ca_pool: resources.CaPool = None,
19131915
update_mask: field_mask_pb2.FieldMask = None,
1914-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1916+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19151917
timeout: float = None,
19161918
metadata: Sequence[Tuple[str, str]] = (),
19171919
) -> operation.Operation:
@@ -2011,7 +2013,7 @@ def get_ca_pool(
20112013
request: Union[service.GetCaPoolRequest, dict] = None,
20122014
*,
20132015
name: str = None,
2014-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2016+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20152017
timeout: float = None,
20162018
metadata: Sequence[Tuple[str, str]] = (),
20172019
) -> resources.CaPool:
@@ -2092,7 +2094,7 @@ def list_ca_pools(
20922094
request: Union[service.ListCaPoolsRequest, dict] = None,
20932095
*,
20942096
parent: str = None,
2095-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2097+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20962098
timeout: float = None,
20972099
metadata: Sequence[Tuple[str, str]] = (),
20982100
) -> pagers.ListCaPoolsPager:
@@ -2174,7 +2176,7 @@ def delete_ca_pool(
21742176
request: Union[service.DeleteCaPoolRequest, dict] = None,
21752177
*,
21762178
name: str = None,
2177-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2179+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21782180
timeout: float = None,
21792181
metadata: Sequence[Tuple[str, str]] = (),
21802182
) -> operation.Operation:
@@ -2267,7 +2269,7 @@ def fetch_ca_certs(
22672269
request: Union[service.FetchCaCertsRequest, dict] = None,
22682270
*,
22692271
ca_pool: str = None,
2270-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2272+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22712273
timeout: float = None,
22722274
metadata: Sequence[Tuple[str, str]] = (),
22732275
) -> service.FetchCaCertsResponse:
@@ -2344,7 +2346,7 @@ def get_certificate_revocation_list(
23442346
request: Union[service.GetCertificateRevocationListRequest, dict] = None,
23452347
*,
23462348
name: str = None,
2347-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2349+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23482350
timeout: float = None,
23492351
metadata: Sequence[Tuple[str, str]] = (),
23502352
) -> resources.CertificateRevocationList:
@@ -2423,7 +2425,7 @@ def list_certificate_revocation_lists(
24232425
request: Union[service.ListCertificateRevocationListsRequest, dict] = None,
24242426
*,
24252427
parent: str = None,
2426-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2428+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24272429
timeout: float = None,
24282430
metadata: Sequence[Tuple[str, str]] = (),
24292431
) -> pagers.ListCertificateRevocationListsPager:
@@ -2510,7 +2512,7 @@ def update_certificate_revocation_list(
25102512
*,
25112513
certificate_revocation_list: resources.CertificateRevocationList = None,
25122514
update_mask: field_mask_pb2.FieldMask = None,
2513-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2515+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25142516
timeout: float = None,
25152517
metadata: Sequence[Tuple[str, str]] = (),
25162518
) -> operation.Operation:
@@ -2615,7 +2617,7 @@ def create_certificate_template(
26152617
parent: str = None,
26162618
certificate_template: resources.CertificateTemplate = None,
26172619
certificate_template_id: str = None,
2618-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2620+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26192621
timeout: float = None,
26202622
metadata: Sequence[Tuple[str, str]] = (),
26212623
) -> operation.Operation:
@@ -2723,7 +2725,7 @@ def delete_certificate_template(
27232725
request: Union[service.DeleteCertificateTemplateRequest, dict] = None,
27242726
*,
27252727
name: str = None,
2726-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2728+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27272729
timeout: float = None,
27282730
metadata: Sequence[Tuple[str, str]] = (),
27292731
) -> operation.Operation:
@@ -2820,7 +2822,7 @@ def get_certificate_template(
28202822
request: Union[service.GetCertificateTemplateRequest, dict] = None,
28212823
*,
28222824
name: str = None,
2823-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2825+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28242826
timeout: float = None,
28252827
metadata: Sequence[Tuple[str, str]] = (),
28262828
) -> resources.CertificateTemplate:
@@ -2895,7 +2897,7 @@ def list_certificate_templates(
28952897
request: Union[service.ListCertificateTemplatesRequest, dict] = None,
28962898
*,
28972899
parent: str = None,
2898-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2900+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28992901
timeout: float = None,
29002902
metadata: Sequence[Tuple[str, str]] = (),
29012903
) -> pagers.ListCertificateTemplatesPager:
@@ -2981,7 +2983,7 @@ def update_certificate_template(
29812983
*,
29822984
certificate_template: resources.CertificateTemplate = None,
29832985
update_mask: field_mask_pb2.FieldMask = None,
2984-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2986+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29852987
timeout: float = None,
29862988
metadata: Sequence[Tuple[str, str]] = (),
29872989
) -> operation.Operation:

‎google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -40,15 +39,6 @@
4039
except pkg_resources.DistributionNotFound:
4140
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4241

43-
try:
44-
# google.auth.__version__ was added in 1.26.0
45-
_GOOGLE_AUTH_VERSION = google.auth.__version__
46-
except AttributeError:
47-
try: # try pkg_resources if it is available
48-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
49-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
50-
_GOOGLE_AUTH_VERSION = None
51-
5242

5343
class CertificateAuthorityServiceTransport(abc.ABC):
5444
"""Abstract transport class for CertificateAuthorityService."""
@@ -98,7 +88,7 @@ def __init__(
9888
host += ":443"
9989
self._host = host
10090

101-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
91+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10292

10393
# Save the scopes.
10494
self._scopes = scopes
@@ -131,29 +121,6 @@ def __init__(
131121
# Save the credentials.
132122
self._credentials = credentials
133123

134-
# TODO(busunkim): This method is in the base transport
135-
# to avoid duplicating code across the transport classes. These functions
136-
# should be deleted once the minimum required versions of google-auth is increased.
137-
138-
# TODO: Remove this function once google-auth >= 1.25.0 is required
139-
@classmethod
140-
def _get_scopes_kwargs(
141-
cls, host: str, scopes: Optional[Sequence[str]]
142-
) -> Dict[str, Optional[Sequence[str]]]:
143-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
144-
145-
scopes_kwargs = {}
146-
147-
if _GOOGLE_AUTH_VERSION and (
148-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
149-
>= packaging.version.parse("1.25.0")
150-
):
151-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
152-
else:
153-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
154-
155-
return scopes_kwargs
156-
157124
def _prep_wrapped_messages(self, client_info):
158125
# Precompute the wrapped methods.
159126
self._wrapped_methods = {
@@ -292,7 +259,7 @@ def close(self):
292259
raise NotImplementedError()
293260

294261
@property
295-
def operations_client(self) -> operations_v1.OperationsClient:
262+
def operations_client(self):
296263
"""Return the client designed to process long-running operations."""
297264
raise NotImplementedError()
298265

‎google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def __init__(
115115
self._grpc_channel = None
116116
self._ssl_channel_credentials = ssl_channel_credentials
117117
self._stubs: Dict[str, Callable] = {}
118-
self._operations_client = None
118+
self._operations_client: Optional[operations_v1.OperationsClient] = None
119119

120120
if api_mtls_endpoint:
121121
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -164,7 +163,7 @@ def __init__(
164163
self._grpc_channel = None
165164
self._ssl_channel_credentials = ssl_channel_credentials
166165
self._stubs: Dict[str, Callable] = {}
167-
self._operations_client = None
166+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
168167

169168
if api_mtls_endpoint:
170169
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)