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

Commit 0dcc0c3

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#248)
- [ ] 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 850a7bc commit 0dcc0c3

File tree

42 files changed

+652
-1055
lines changed

Some content is hidden

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

42 files changed

+652
-1055
lines changed

‎google/cloud/datacatalog_v1/services/data_catalog/async_client.py‎

Lines changed: 87 additions & 85 deletions
Large diffs are not rendered by default.

‎google/cloud/datacatalog_v1/services/data_catalog/client.py‎

Lines changed: 30 additions & 28 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.cloud.datacatalog_v1.services.data_catalog import pagers
3436
from google.cloud.datacatalog_v1.types import common
3537
from google.cloud.datacatalog_v1.types import data_source
@@ -463,7 +465,7 @@ def search_catalog(
463465
*,
464466
scope: datacatalog.SearchCatalogRequest.Scope = None,
465467
query: str = None,
466-
retry: retries.Retry = gapic_v1.method.DEFAULT,
468+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
467469
timeout: float = None,
468470
metadata: Sequence[Tuple[str, str]] = (),
469471
) -> pagers.SearchCatalogPager:
@@ -579,7 +581,7 @@ def create_entry_group(
579581
parent: str = None,
580582
entry_group_id: str = None,
581583
entry_group: datacatalog.EntryGroup = None,
582-
retry: retries.Retry = gapic_v1.method.DEFAULT,
584+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
583585
timeout: float = None,
584586
metadata: Sequence[Tuple[str, str]] = (),
585587
) -> datacatalog.EntryGroup:
@@ -709,7 +711,7 @@ def get_entry_group(
709711
*,
710712
name: str = None,
711713
read_mask: field_mask_pb2.FieldMask = None,
712-
retry: retries.Retry = gapic_v1.method.DEFAULT,
714+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
713715
timeout: float = None,
714716
metadata: Sequence[Tuple[str, str]] = (),
715717
) -> datacatalog.EntryGroup:
@@ -793,7 +795,7 @@ def update_entry_group(
793795
*,
794796
entry_group: datacatalog.EntryGroup = 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
) -> datacatalog.EntryGroup:
@@ -888,7 +890,7 @@ def delete_entry_group(
888890
request: Union[datacatalog.DeleteEntryGroupRequest, dict] = None,
889891
*,
890892
name: str = None,
891-
retry: retries.Retry = gapic_v1.method.DEFAULT,
893+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
892894
timeout: float = None,
893895
metadata: Sequence[Tuple[str, str]] = (),
894896
) -> None:
@@ -957,7 +959,7 @@ def list_entry_groups(
957959
request: Union[datacatalog.ListEntryGroupsRequest, dict] = None,
958960
*,
959961
parent: str = None,
960-
retry: retries.Retry = gapic_v1.method.DEFAULT,
962+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
961963
timeout: float = None,
962964
metadata: Sequence[Tuple[str, str]] = (),
963965
) -> pagers.ListEntryGroupsPager:
@@ -1040,7 +1042,7 @@ def create_entry(
10401042
parent: str = None,
10411043
entry_id: str = None,
10421044
entry: datacatalog.Entry = None,
1043-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1045+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10441046
timeout: float = None,
10451047
metadata: Sequence[Tuple[str, str]] = (),
10461048
) -> datacatalog.Entry:
@@ -1155,7 +1157,7 @@ def update_entry(
11551157
*,
11561158
entry: datacatalog.Entry = None,
11571159
update_mask: field_mask_pb2.FieldMask = None,
1158-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1160+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11591161
timeout: float = None,
11601162
metadata: Sequence[Tuple[str, str]] = (),
11611163
) -> datacatalog.Entry:
@@ -1279,7 +1281,7 @@ def delete_entry(
12791281
request: Union[datacatalog.DeleteEntryRequest, dict] = None,
12801282
*,
12811283
name: str = None,
1282-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1284+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12831285
timeout: float = None,
12841286
metadata: Sequence[Tuple[str, str]] = (),
12851287
) -> None:
@@ -1352,7 +1354,7 @@ def get_entry(
13521354
request: Union[datacatalog.GetEntryRequest, dict] = None,
13531355
*,
13541356
name: str = None,
1355-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1357+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13561358
timeout: float = None,
13571359
metadata: Sequence[Tuple[str, str]] = (),
13581360
) -> datacatalog.Entry:
@@ -1431,7 +1433,7 @@ def lookup_entry(
14311433
self,
14321434
request: Union[datacatalog.LookupEntryRequest, dict] = None,
14331435
*,
1434-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1436+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14351437
timeout: float = None,
14361438
metadata: Sequence[Tuple[str, str]] = (),
14371439
) -> datacatalog.Entry:
@@ -1487,7 +1489,7 @@ def list_entries(
14871489
request: Union[datacatalog.ListEntriesRequest, dict] = None,
14881490
*,
14891491
parent: str = None,
1490-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1492+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14911493
timeout: float = None,
14921494
metadata: Sequence[Tuple[str, str]] = (),
14931495
) -> pagers.ListEntriesPager:
@@ -1570,7 +1572,7 @@ def create_tag_template(
15701572
parent: str = None,
15711573
tag_template_id: str = None,
15721574
tag_template: tags.TagTemplate = None,
1573-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1575+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15741576
timeout: float = None,
15751577
metadata: Sequence[Tuple[str, str]] = (),
15761578
) -> tags.TagTemplate:
@@ -1676,7 +1678,7 @@ def get_tag_template(
16761678
request: Union[datacatalog.GetTagTemplateRequest, dict] = None,
16771679
*,
16781680
name: str = None,
1679-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1681+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16801682
timeout: float = None,
16811683
metadata: Sequence[Tuple[str, str]] = (),
16821684
) -> tags.TagTemplate:
@@ -1757,7 +1759,7 @@ def update_tag_template(
17571759
*,
17581760
tag_template: tags.TagTemplate = None,
17591761
update_mask: field_mask_pb2.FieldMask = None,
1760-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1762+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17611763
timeout: float = None,
17621764
metadata: Sequence[Tuple[str, str]] = (),
17631765
) -> tags.TagTemplate:
@@ -1864,7 +1866,7 @@ def delete_tag_template(
18641866
*,
18651867
name: str = None,
18661868
force: bool = None,
1867-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1869+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18681870
timeout: float = None,
18691871
metadata: Sequence[Tuple[str, str]] = (),
18701872
) -> None:
@@ -1946,7 +1948,7 @@ def create_tag_template_field(
19461948
parent: str = None,
19471949
tag_template_field_id: str = None,
19481950
tag_template_field: tags.TagTemplateField = None,
1949-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1951+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19501952
timeout: float = None,
19511953
metadata: Sequence[Tuple[str, str]] = (),
19521954
) -> tags.TagTemplateField:
@@ -2053,7 +2055,7 @@ def update_tag_template_field(
20532055
name: str = None,
20542056
tag_template_field: tags.TagTemplateField = None,
20552057
update_mask: field_mask_pb2.FieldMask = None,
2056-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2058+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20572059
timeout: float = None,
20582060
metadata: Sequence[Tuple[str, str]] = (),
20592061
) -> tags.TagTemplateField:
@@ -2166,7 +2168,7 @@ def rename_tag_template_field(
21662168
*,
21672169
name: str = None,
21682170
new_tag_template_field_id: str = None,
2169-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2171+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21702172
timeout: float = None,
21712173
metadata: Sequence[Tuple[str, str]] = (),
21722174
) -> tags.TagTemplateField:
@@ -2254,7 +2256,7 @@ def rename_tag_template_field_enum_value(
22542256
*,
22552257
name: str = None,
22562258
new_enum_value_display_name: str = None,
2257-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2259+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22582260
timeout: float = None,
22592261
metadata: Sequence[Tuple[str, str]] = (),
22602262
) -> tags.TagTemplateField:
@@ -2338,7 +2340,7 @@ def delete_tag_template_field(
23382340
*,
23392341
name: str = None,
23402342
force: bool = None,
2341-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2343+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23422344
timeout: float = None,
23432345
metadata: Sequence[Tuple[str, str]] = (),
23442346
) -> None:
@@ -2422,7 +2424,7 @@ def create_tag(
24222424
*,
24232425
parent: str = None,
24242426
tag: tags.Tag = None,
2425-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2427+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24262428
timeout: float = None,
24272429
metadata: Sequence[Tuple[str, str]] = (),
24282430
) -> tags.Tag:
@@ -2527,7 +2529,7 @@ def update_tag(
25272529
*,
25282530
tag: tags.Tag = None,
25292531
update_mask: field_mask_pb2.FieldMask = None,
2530-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2532+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25312533
timeout: float = None,
25322534
metadata: Sequence[Tuple[str, str]] = (),
25332535
) -> tags.Tag:
@@ -2618,7 +2620,7 @@ def delete_tag(
26182620
request: Union[datacatalog.DeleteTagRequest, dict] = None,
26192621
*,
26202622
name: str = None,
2621-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2623+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26222624
timeout: float = None,
26232625
metadata: Sequence[Tuple[str, str]] = (),
26242626
) -> None:
@@ -2682,7 +2684,7 @@ def list_tags(
26822684
request: Union[datacatalog.ListTagsRequest, dict] = None,
26832685
*,
26842686
parent: str = None,
2685-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2687+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26862688
timeout: float = None,
26872689
metadata: Sequence[Tuple[str, str]] = (),
26882690
) -> pagers.ListTagsPager:
@@ -2768,7 +2770,7 @@ def set_iam_policy(
27682770
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
27692771
*,
27702772
resource: str = None,
2771-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2773+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27722774
timeout: float = None,
27732775
metadata: Sequence[Tuple[str, str]] = (),
27742776
) -> policy_pb2.Policy:
@@ -2912,7 +2914,7 @@ def get_iam_policy(
29122914
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
29132915
*,
29142916
resource: str = None,
2915-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2917+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29162918
timeout: float = None,
29172919
metadata: Sequence[Tuple[str, str]] = (),
29182920
) -> policy_pb2.Policy:
@@ -3059,7 +3061,7 @@ def test_iam_permissions(
30593061
self,
30603062
request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
30613063
*,
3062-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3064+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30633065
timeout: float = None,
30643066
metadata: Sequence[Tuple[str, str]] = (),
30653067
) -> iam_policy_pb2.TestIamPermissionsResponse:

‎google/cloud/datacatalog_v1/services/data_catalog/transports/base.py‎

Lines changed: 1 addition & 34 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
@@ -41,15 +40,6 @@
4140
except pkg_resources.DistributionNotFound:
4241
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4342

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

5444
class DataCatalogTransport(abc.ABC):
5545
"""Abstract transport class for DataCatalog."""
@@ -99,7 +89,7 @@ def __init__(
9989
host += ":443"
10090
self._host = host
10191

102-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
92+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10393

10494
# Save the scopes.
10595
self._scopes = scopes
@@ -132,29 +122,6 @@ def __init__(
132122
# Save the credentials.
133123
self._credentials = credentials
134124

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

‎google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

0 commit comments

Comments
 (0)