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

Commit 2cb2cff

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
fix(deps): Require google-api-core >=1.34.0, >=2.11.0 (#97)
* fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: googleapis/googleapis@fea4387 Source-Link: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add gapic_version.py Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent 7ba10a7 commit 2cb2cff

22 files changed

+121
-122
lines changed

‎.coveragerc

-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ exclude_lines =
1010
pragma: NO COVER
1111
# Ignore debug-only repr
1212
def __repr__
13-
# Ignore pkg_resources exceptions.
14-
# This is added at the module level as a safeguard for if someone
15-
# generates the code and tries to run it without pip installing. This
16-
# makes it virtually impossible to test properly.
17-
except pkg_resources.DistributionNotFound

‎google/cloud/certificate_manager_v1/gapic_version.py

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2022 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
__version__ = "1.1.1" # {x-release-please-version}

‎google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py

+49-53
Large diffs are not rendered by default.

‎google/cloud/certificate_manager_v1/services/certificate_manager/client.py

+35-39
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
from google.auth.transport import mtls # type: ignore
3939
from google.auth.transport.grpc import SslCredentials # type: ignore
4040
from google.oauth2 import service_account # type: ignore
41-
import pkg_resources
41+
42+
from google.cloud.certificate_manager_v1 import gapic_version as package_version
4243

4344
try:
4445
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -603,7 +604,7 @@ def list_certificates(
603604
*,
604605
parent: Optional[str] = None,
605606
retry: OptionalRetry = gapic_v1.method.DEFAULT,
606-
timeout: Optional[float] = None,
607+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
607608
metadata: Sequence[Tuple[str, str]] = (),
608609
) -> pagers.ListCertificatesPager:
609610
r"""Lists Certificates in a given project and location.
@@ -720,7 +721,7 @@ def get_certificate(
720721
*,
721722
name: Optional[str] = None,
722723
retry: OptionalRetry = gapic_v1.method.DEFAULT,
723-
timeout: Optional[float] = None,
724+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
724725
metadata: Sequence[Tuple[str, str]] = (),
725726
) -> certificate_manager.Certificate:
726727
r"""Gets details of a single Certificate.
@@ -824,7 +825,7 @@ def create_certificate(
824825
certificate: Optional[certificate_manager.Certificate] = None,
825826
certificate_id: Optional[str] = None,
826827
retry: OptionalRetry = gapic_v1.method.DEFAULT,
827-
timeout: Optional[float] = None,
828+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
828829
metadata: Sequence[Tuple[str, str]] = (),
829830
) -> operation.Operation:
830831
r"""Creates a new Certificate in a given project and
@@ -964,7 +965,7 @@ def update_certificate(
964965
certificate: Optional[certificate_manager.Certificate] = None,
965966
update_mask: Optional[field_mask_pb2.FieldMask] = None,
966967
retry: OptionalRetry = gapic_v1.method.DEFAULT,
967-
timeout: Optional[float] = None,
968+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
968969
metadata: Sequence[Tuple[str, str]] = (),
969970
) -> operation.Operation:
970971
r"""Updates a Certificate.
@@ -1094,7 +1095,7 @@ def delete_certificate(
10941095
*,
10951096
name: Optional[str] = None,
10961097
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1097-
timeout: Optional[float] = None,
1098+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
10981099
metadata: Sequence[Tuple[str, str]] = (),
10991100
) -> operation.Operation:
11001101
r"""Deletes a single Certificate.
@@ -1220,7 +1221,7 @@ def list_certificate_maps(
12201221
*,
12211222
parent: Optional[str] = None,
12221223
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1223-
timeout: Optional[float] = None,
1224+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
12241225
metadata: Sequence[Tuple[str, str]] = (),
12251226
) -> pagers.ListCertificateMapsPager:
12261227
r"""Lists CertificateMaps in a given project and
@@ -1338,7 +1339,7 @@ def get_certificate_map(
13381339
*,
13391340
name: Optional[str] = None,
13401341
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1341-
timeout: Optional[float] = None,
1342+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
13421343
metadata: Sequence[Tuple[str, str]] = (),
13431344
) -> certificate_manager.CertificateMap:
13441345
r"""Gets details of a single CertificateMap.
@@ -1445,7 +1446,7 @@ def create_certificate_map(
14451446
certificate_map: Optional[certificate_manager.CertificateMap] = None,
14461447
certificate_map_id: Optional[str] = None,
14471448
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1448-
timeout: Optional[float] = None,
1449+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
14491450
metadata: Sequence[Tuple[str, str]] = (),
14501451
) -> operation.Operation:
14511452
r"""Creates a new CertificateMap in a given project and
@@ -1585,7 +1586,7 @@ def update_certificate_map(
15851586
certificate_map: Optional[certificate_manager.CertificateMap] = None,
15861587
update_mask: Optional[field_mask_pb2.FieldMask] = None,
15871588
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1588-
timeout: Optional[float] = None,
1589+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
15891590
metadata: Sequence[Tuple[str, str]] = (),
15901591
) -> operation.Operation:
15911592
r"""Updates a CertificateMap.
@@ -1715,7 +1716,7 @@ def delete_certificate_map(
17151716
*,
17161717
name: Optional[str] = None,
17171718
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1718-
timeout: Optional[float] = None,
1719+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
17191720
metadata: Sequence[Tuple[str, str]] = (),
17201721
) -> operation.Operation:
17211722
r"""Deletes a single CertificateMap. A Certificate Map
@@ -1845,7 +1846,7 @@ def list_certificate_map_entries(
18451846
*,
18461847
parent: Optional[str] = None,
18471848
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1848-
timeout: Optional[float] = None,
1849+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
18491850
metadata: Sequence[Tuple[str, str]] = (),
18501851
) -> pagers.ListCertificateMapEntriesPager:
18511852
r"""Lists CertificateMapEntries in a given project and
@@ -1968,7 +1969,7 @@ def get_certificate_map_entry(
19681969
*,
19691970
name: Optional[str] = None,
19701971
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1971-
timeout: Optional[float] = None,
1972+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
19721973
metadata: Sequence[Tuple[str, str]] = (),
19731974
) -> certificate_manager.CertificateMapEntry:
19741975
r"""Gets details of a single CertificateMapEntry.
@@ -2075,7 +2076,7 @@ def create_certificate_map_entry(
20752076
certificate_map_entry: Optional[certificate_manager.CertificateMapEntry] = None,
20762077
certificate_map_entry_id: Optional[str] = None,
20772078
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2078-
timeout: Optional[float] = None,
2079+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
20792080
metadata: Sequence[Tuple[str, str]] = (),
20802081
) -> operation.Operation:
20812082
r"""Creates a new CertificateMapEntry in a given project
@@ -2226,7 +2227,7 @@ def update_certificate_map_entry(
22262227
certificate_map_entry: Optional[certificate_manager.CertificateMapEntry] = None,
22272228
update_mask: Optional[field_mask_pb2.FieldMask] = None,
22282229
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2229-
timeout: Optional[float] = None,
2230+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
22302231
metadata: Sequence[Tuple[str, str]] = (),
22312232
) -> operation.Operation:
22322233
r"""Updates a CertificateMapEntry.
@@ -2365,7 +2366,7 @@ def delete_certificate_map_entry(
23652366
*,
23662367
name: Optional[str] = None,
23672368
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2368-
timeout: Optional[float] = None,
2369+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
23692370
metadata: Sequence[Tuple[str, str]] = (),
23702371
) -> operation.Operation:
23712372
r"""Deletes a single CertificateMapEntry.
@@ -2496,7 +2497,7 @@ def list_dns_authorizations(
24962497
*,
24972498
parent: Optional[str] = None,
24982499
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2499-
timeout: Optional[float] = None,
2500+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
25002501
metadata: Sequence[Tuple[str, str]] = (),
25012502
) -> pagers.ListDnsAuthorizationsPager:
25022503
r"""Lists DnsAuthorizations in a given project and
@@ -2614,7 +2615,7 @@ def get_dns_authorization(
26142615
*,
26152616
name: Optional[str] = None,
26162617
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2617-
timeout: Optional[float] = None,
2618+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
26182619
metadata: Sequence[Tuple[str, str]] = (),
26192620
) -> certificate_manager.DnsAuthorization:
26202621
r"""Gets details of a single DnsAuthorization.
@@ -2722,7 +2723,7 @@ def create_dns_authorization(
27222723
dns_authorization: Optional[certificate_manager.DnsAuthorization] = None,
27232724
dns_authorization_id: Optional[str] = None,
27242725
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2725-
timeout: Optional[float] = None,
2726+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
27262727
metadata: Sequence[Tuple[str, str]] = (),
27272728
) -> operation.Operation:
27282729
r"""Creates a new DnsAuthorization in a given project and
@@ -2865,7 +2866,7 @@ def update_dns_authorization(
28652866
dns_authorization: Optional[certificate_manager.DnsAuthorization] = None,
28662867
update_mask: Optional[field_mask_pb2.FieldMask] = None,
28672868
retry: OptionalRetry = gapic_v1.method.DEFAULT,
2868-
timeout: Optional[float] = None,
2869+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
28692870
metadata: Sequence[Tuple[str, str]] = (),
28702871
) -> operation.Operation:
28712872
r"""Updates a DnsAuthorization.
@@ -2998,7 +2999,7 @@ def delete_dns_authorization(
29982999
*,
29993000
name: Optional[str] = None,
30003001
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3001-
timeout: Optional[float] = None,
3002+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
30023003
metadata: Sequence[Tuple[str, str]] = (),
30033004
) -> operation.Operation:
30043005
r"""Deletes a single DnsAuthorization.
@@ -3127,7 +3128,7 @@ def list_certificate_issuance_configs(
31273128
*,
31283129
parent: Optional[str] = None,
31293130
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3130-
timeout: Optional[float] = None,
3131+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
31313132
metadata: Sequence[Tuple[str, str]] = (),
31323133
) -> pagers.ListCertificateIssuanceConfigsPager:
31333134
r"""Lists CertificateIssuanceConfigs in a given project
@@ -3251,7 +3252,7 @@ def get_certificate_issuance_config(
32513252
*,
32523253
name: Optional[str] = None,
32533254
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3254-
timeout: Optional[float] = None,
3255+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
32553256
metadata: Sequence[Tuple[str, str]] = (),
32563257
) -> certificate_issuance_config.CertificateIssuanceConfig:
32573258
r"""Gets details of a single CertificateIssuanceConfig.
@@ -3369,7 +3370,7 @@ def create_certificate_issuance_config(
33693370
] = None,
33703371
certificate_issuance_config_id: Optional[str] = None,
33713372
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3372-
timeout: Optional[float] = None,
3373+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
33733374
metadata: Sequence[Tuple[str, str]] = (),
33743375
) -> operation.Operation:
33753376
r"""Creates a new CertificateIssuanceConfig in a given
@@ -3529,7 +3530,7 @@ def delete_certificate_issuance_config(
35293530
*,
35303531
name: Optional[str] = None,
35313532
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3532-
timeout: Optional[float] = None,
3533+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
35333534
metadata: Sequence[Tuple[str, str]] = (),
35343535
) -> operation.Operation:
35353536
r"""Deletes a single CertificateIssuanceConfig.
@@ -3674,7 +3675,7 @@ def list_operations(
36743675
request: Optional[operations_pb2.ListOperationsRequest] = None,
36753676
*,
36763677
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3677-
timeout: Optional[float] = None,
3678+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
36783679
metadata: Sequence[Tuple[str, str]] = (),
36793680
) -> operations_pb2.ListOperationsResponse:
36803681
r"""Lists operations that match the specified filter in the request.
@@ -3728,7 +3729,7 @@ def get_operation(
37283729
request: Optional[operations_pb2.GetOperationRequest] = None,
37293730
*,
37303731
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3731-
timeout: Optional[float] = None,
3732+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
37323733
metadata: Sequence[Tuple[str, str]] = (),
37333734
) -> operations_pb2.Operation:
37343735
r"""Gets the latest state of a long-running operation.
@@ -3782,7 +3783,7 @@ def delete_operation(
37823783
request: Optional[operations_pb2.DeleteOperationRequest] = None,
37833784
*,
37843785
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3785-
timeout: Optional[float] = None,
3786+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
37863787
metadata: Sequence[Tuple[str, str]] = (),
37873788
) -> None:
37883789
r"""Deletes a long-running operation.
@@ -3837,7 +3838,7 @@ def cancel_operation(
38373838
request: Optional[operations_pb2.CancelOperationRequest] = None,
38383839
*,
38393840
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3840-
timeout: Optional[float] = None,
3841+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
38413842
metadata: Sequence[Tuple[str, str]] = (),
38423843
) -> None:
38433844
r"""Starts asynchronous cancellation on a long-running operation.
@@ -3891,7 +3892,7 @@ def get_location(
38913892
request: Optional[locations_pb2.GetLocationRequest] = None,
38923893
*,
38933894
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3894-
timeout: Optional[float] = None,
3895+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
38953896
metadata: Sequence[Tuple[str, str]] = (),
38963897
) -> locations_pb2.Location:
38973898
r"""Gets information about a location.
@@ -3945,7 +3946,7 @@ def list_locations(
39453946
request: Optional[locations_pb2.ListLocationsRequest] = None,
39463947
*,
39473948
retry: OptionalRetry = gapic_v1.method.DEFAULT,
3948-
timeout: Optional[float] = None,
3949+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
39493950
metadata: Sequence[Tuple[str, str]] = (),
39503951
) -> locations_pb2.ListLocationsResponse:
39513952
r"""Lists information about the supported locations for this service.
@@ -3995,14 +3996,9 @@ def list_locations(
39953996
return response
39963997

39973998

3998-
try:
3999-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
4000-
gapic_version=pkg_resources.get_distribution(
4001-
"google-cloud-certificate-manager",
4002-
).version,
4003-
)
4004-
except pkg_resources.DistributionNotFound:
4005-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3999+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
4000+
gapic_version=package_version.__version__
4001+
)
40064002

40074003

40084004
__all__ = ("CertificateManagerClient",)

‎google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py

+4-9
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,17 @@
2525
from google.cloud.location import locations_pb2 # type: ignore
2626
from google.longrunning import operations_pb2 # type: ignore
2727
from google.oauth2 import service_account # type: ignore
28-
import pkg_resources
2928

29+
from google.cloud.certificate_manager_v1 import gapic_version as package_version
3030
from google.cloud.certificate_manager_v1.types import certificate_issuance_config
3131
from google.cloud.certificate_manager_v1.types import (
3232
certificate_issuance_config as gcc_certificate_issuance_config,
3333
)
3434
from google.cloud.certificate_manager_v1.types import certificate_manager
3535

36-
try:
37-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
38-
gapic_version=pkg_resources.get_distribution(
39-
"google-cloud-certificate-manager",
40-
).version,
41-
)
42-
except pkg_resources.DistributionNotFound:
43-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
36+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
37+
gapic_version=package_version.__version__
38+
)
4439

4540

4641
class CertificateManagerTransport(abc.ABC):

‎release-please-config.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
".": {
55
"release-type": "python",
66
"extra-files": [
7+
"google/cloud/certificate_manager_v1/gapic_version.py",
78
"google/cloud/certificate_manager/gapic_version.py",
89
{
910
"type": "json",

‎samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async def sample_create_certificate():
4949

5050
print("Waiting for operation to complete...")
5151

52-
response = await operation.result()
52+
response = (await operation).result()
5353

5454
# Handle the response
5555
print(response)

‎samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async def sample_create_certificate_issuance_config():
5555

5656
print("Waiting for operation to complete...")
5757

58-
response = await operation.result()
58+
response = (await operation).result()
5959

6060
# Handle the response
6161
print(response)

‎samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_map_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async def sample_create_certificate_map():
4949

5050
print("Waiting for operation to complete...")
5151

52-
response = await operation.result()
52+
response = (await operation).result()
5353

5454
# Handle the response
5555
print(response)

‎samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_map_entry_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async def sample_create_certificate_map_entry():
5353

5454
print("Waiting for operation to complete...")
5555

56-
response = await operation.result()
56+
response = (await operation).result()
5757

5858
# Handle the response
5959
print(response)

0 commit comments

Comments
 (0)