Skip to content

Commit 5f70bef

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#281)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency fix: fix extras_require typo in setup.py committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent f842bb0 commit 5f70bef

File tree

9 files changed

+485
-257
lines changed

9 files changed

+485
-257
lines changed

‎packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py‎

Lines changed: 105 additions & 103 deletions
Large diffs are not rendered by default.

‎packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py‎

Lines changed: 36 additions & 34 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.dlp_v2.services.dlp_service import pagers
3436
from google.cloud.dlp_v2.types import dlp
3537
from google.protobuf import field_mask_pb2 # type: ignore
@@ -447,7 +449,7 @@ def inspect_content(
447449
self,
448450
request: Union[dlp.InspectContentRequest, dict] = None,
449451
*,
450-
retry: retries.Retry = gapic_v1.method.DEFAULT,
452+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
451453
timeout: float = None,
452454
metadata: Sequence[Tuple[str, str]] = (),
453455
) -> dlp.InspectContentResponse:
@@ -504,7 +506,7 @@ def redact_image(
504506
self,
505507
request: Union[dlp.RedactImageRequest, dict] = None,
506508
*,
507-
retry: retries.Retry = gapic_v1.method.DEFAULT,
509+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
508510
timeout: float = None,
509511
metadata: Sequence[Tuple[str, str]] = (),
510512
) -> dlp.RedactImageResponse:
@@ -562,7 +564,7 @@ def deidentify_content(
562564
self,
563565
request: Union[dlp.DeidentifyContentRequest, dict] = None,
564566
*,
565-
retry: retries.Retry = gapic_v1.method.DEFAULT,
567+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
566568
timeout: float = None,
567569
metadata: Sequence[Tuple[str, str]] = (),
568570
) -> dlp.DeidentifyContentResponse:
@@ -621,7 +623,7 @@ def reidentify_content(
621623
self,
622624
request: Union[dlp.ReidentifyContentRequest, dict] = None,
623625
*,
624-
retry: retries.Retry = gapic_v1.method.DEFAULT,
626+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
625627
timeout: float = None,
626628
metadata: Sequence[Tuple[str, str]] = (),
627629
) -> dlp.ReidentifyContentResponse:
@@ -671,7 +673,7 @@ def list_info_types(
671673
request: Union[dlp.ListInfoTypesRequest, dict] = None,
672674
*,
673675
parent: str = None,
674-
retry: retries.Retry = gapic_v1.method.DEFAULT,
676+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
675677
timeout: float = None,
676678
metadata: Sequence[Tuple[str, str]] = (),
677679
) -> dlp.ListInfoTypesResponse:
@@ -744,7 +746,7 @@ def create_inspect_template(
744746
*,
745747
parent: str = None,
746748
inspect_template: dlp.InspectTemplate = None,
747-
retry: retries.Retry = gapic_v1.method.DEFAULT,
749+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
748750
timeout: float = None,
749751
metadata: Sequence[Tuple[str, str]] = (),
750752
) -> dlp.InspectTemplate:
@@ -856,7 +858,7 @@ def update_inspect_template(
856858
name: str = None,
857859
inspect_template: dlp.InspectTemplate = None,
858860
update_mask: field_mask_pb2.FieldMask = None,
859-
retry: retries.Retry = gapic_v1.method.DEFAULT,
861+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
860862
timeout: float = None,
861863
metadata: Sequence[Tuple[str, str]] = (),
862864
) -> dlp.InspectTemplate:
@@ -952,7 +954,7 @@ def get_inspect_template(
952954
request: Union[dlp.GetInspectTemplateRequest, dict] = None,
953955
*,
954956
name: str = None,
955-
retry: retries.Retry = gapic_v1.method.DEFAULT,
957+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
956958
timeout: float = None,
957959
metadata: Sequence[Tuple[str, str]] = (),
958960
) -> dlp.InspectTemplate:
@@ -1032,7 +1034,7 @@ def list_inspect_templates(
10321034
request: Union[dlp.ListInspectTemplatesRequest, dict] = None,
10331035
*,
10341036
parent: str = None,
1035-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1037+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10361038
timeout: float = None,
10371039
metadata: Sequence[Tuple[str, str]] = (),
10381040
) -> pagers.ListInspectTemplatesPager:
@@ -1136,7 +1138,7 @@ def delete_inspect_template(
11361138
request: Union[dlp.DeleteInspectTemplateRequest, dict] = None,
11371139
*,
11381140
name: str = None,
1139-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1141+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11401142
timeout: float = None,
11411143
metadata: Sequence[Tuple[str, str]] = (),
11421144
) -> None:
@@ -1205,7 +1207,7 @@ def create_deidentify_template(
12051207
*,
12061208
parent: str = None,
12071209
deidentify_template: dlp.DeidentifyTemplate = None,
1208-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1210+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12091211
timeout: float = None,
12101212
metadata: Sequence[Tuple[str, str]] = (),
12111213
) -> dlp.DeidentifyTemplate:
@@ -1318,7 +1320,7 @@ def update_deidentify_template(
13181320
name: str = None,
13191321
deidentify_template: dlp.DeidentifyTemplate = None,
13201322
update_mask: field_mask_pb2.FieldMask = None,
1321-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1323+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13221324
timeout: float = None,
13231325
metadata: Sequence[Tuple[str, str]] = (),
13241326
) -> dlp.DeidentifyTemplate:
@@ -1414,7 +1416,7 @@ def get_deidentify_template(
14141416
request: Union[dlp.GetDeidentifyTemplateRequest, dict] = None,
14151417
*,
14161418
name: str = None,
1417-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1419+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14181420
timeout: float = None,
14191421
metadata: Sequence[Tuple[str, str]] = (),
14201422
) -> dlp.DeidentifyTemplate:
@@ -1492,7 +1494,7 @@ def list_deidentify_templates(
14921494
request: Union[dlp.ListDeidentifyTemplatesRequest, dict] = None,
14931495
*,
14941496
parent: str = None,
1495-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1497+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14961498
timeout: float = None,
14971499
metadata: Sequence[Tuple[str, str]] = (),
14981500
) -> pagers.ListDeidentifyTemplatesPager:
@@ -1598,7 +1600,7 @@ def delete_deidentify_template(
15981600
request: Union[dlp.DeleteDeidentifyTemplateRequest, dict] = None,
15991601
*,
16001602
name: str = None,
1601-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1603+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16021604
timeout: float = None,
16031605
metadata: Sequence[Tuple[str, str]] = (),
16041606
) -> None:
@@ -1669,7 +1671,7 @@ def create_job_trigger(
16691671
*,
16701672
parent: str = None,
16711673
job_trigger: dlp.JobTrigger = None,
1672-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1674+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16731675
timeout: float = None,
16741676
metadata: Sequence[Tuple[str, str]] = (),
16751677
) -> dlp.JobTrigger:
@@ -1772,7 +1774,7 @@ def update_job_trigger(
17721774
name: str = None,
17731775
job_trigger: dlp.JobTrigger = None,
17741776
update_mask: field_mask_pb2.FieldMask = None,
1775-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1777+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17761778
timeout: float = None,
17771779
metadata: Sequence[Tuple[str, str]] = (),
17781780
) -> dlp.JobTrigger:
@@ -1864,7 +1866,7 @@ def hybrid_inspect_job_trigger(
18641866
request: Union[dlp.HybridInspectJobTriggerRequest, dict] = None,
18651867
*,
18661868
name: str = 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
) -> dlp.HybridInspectResponse:
@@ -1945,7 +1947,7 @@ def get_job_trigger(
19451947
request: Union[dlp.GetJobTriggerRequest, dict] = None,
19461948
*,
19471949
name: str = None,
1948-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1950+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19491951
timeout: float = None,
19501952
metadata: Sequence[Tuple[str, str]] = (),
19511953
) -> dlp.JobTrigger:
@@ -2020,7 +2022,7 @@ def list_job_triggers(
20202022
request: Union[dlp.ListJobTriggersRequest, dict] = None,
20212023
*,
20222024
parent: str = None,
2023-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2025+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20242026
timeout: float = None,
20252027
metadata: Sequence[Tuple[str, str]] = (),
20262028
) -> pagers.ListJobTriggersPager:
@@ -2117,7 +2119,7 @@ def delete_job_trigger(
21172119
request: Union[dlp.DeleteJobTriggerRequest, dict] = None,
21182120
*,
21192121
name: str = None,
2120-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2122+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21212123
timeout: float = None,
21222124
metadata: Sequence[Tuple[str, str]] = (),
21232125
) -> None:
@@ -2183,7 +2185,7 @@ def activate_job_trigger(
21832185
self,
21842186
request: Union[dlp.ActivateJobTriggerRequest, dict] = None,
21852187
*,
2186-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2188+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21872189
timeout: float = None,
21882190
metadata: Sequence[Tuple[str, str]] = (),
21892191
) -> dlp.DlpJob:
@@ -2238,7 +2240,7 @@ def create_dlp_job(
22382240
parent: str = None,
22392241
inspect_job: dlp.InspectJobConfig = None,
22402242
risk_job: dlp.RiskAnalysisJobConfig = None,
2241-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2243+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22422244
timeout: float = None,
22432245
metadata: Sequence[Tuple[str, str]] = (),
22442246
) -> dlp.DlpJob:
@@ -2354,7 +2356,7 @@ def list_dlp_jobs(
23542356
request: Union[dlp.ListDlpJobsRequest, dict] = None,
23552357
*,
23562358
parent: str = None,
2357-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2359+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23582360
timeout: float = None,
23592361
metadata: Sequence[Tuple[str, str]] = (),
23602362
) -> pagers.ListDlpJobsPager:
@@ -2455,7 +2457,7 @@ def get_dlp_job(
24552457
request: Union[dlp.GetDlpJobRequest, dict] = None,
24562458
*,
24572459
name: str = None,
2458-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2460+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24592461
timeout: float = None,
24602462
metadata: Sequence[Tuple[str, str]] = (),
24612463
) -> dlp.DlpJob:
@@ -2529,7 +2531,7 @@ def delete_dlp_job(
25292531
request: Union[dlp.DeleteDlpJobRequest, dict] = None,
25302532
*,
25312533
name: str = None,
2532-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2534+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25332535
timeout: float = None,
25342536
metadata: Sequence[Tuple[str, str]] = (),
25352537
) -> None:
@@ -2597,7 +2599,7 @@ def cancel_dlp_job(
25972599
self,
25982600
request: Union[dlp.CancelDlpJobRequest, dict] = None,
25992601
*,
2600-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2602+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26012603
timeout: float = None,
26022604
metadata: Sequence[Tuple[str, str]] = (),
26032605
) -> None:
@@ -2647,7 +2649,7 @@ def create_stored_info_type(
26472649
*,
26482650
parent: str = None,
26492651
config: dlp.StoredInfoTypeConfig = None,
2650-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2652+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26512653
timeout: float = None,
26522654
metadata: Sequence[Tuple[str, str]] = (),
26532655
) -> dlp.StoredInfoType:
@@ -2755,7 +2757,7 @@ def update_stored_info_type(
27552757
name: str = None,
27562758
config: dlp.StoredInfoTypeConfig = None,
27572759
update_mask: field_mask_pb2.FieldMask = None,
2758-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2760+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27592761
timeout: float = None,
27602762
metadata: Sequence[Tuple[str, str]] = (),
27612763
) -> dlp.StoredInfoType:
@@ -2853,7 +2855,7 @@ def get_stored_info_type(
28532855
request: Union[dlp.GetStoredInfoTypeRequest, dict] = None,
28542856
*,
28552857
name: str = None,
2856-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2858+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28572859
timeout: float = None,
28582860
metadata: Sequence[Tuple[str, str]] = (),
28592861
) -> dlp.StoredInfoType:
@@ -2929,7 +2931,7 @@ def list_stored_info_types(
29292931
request: Union[dlp.ListStoredInfoTypesRequest, dict] = None,
29302932
*,
29312933
parent: str = None,
2932-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2934+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29332935
timeout: float = None,
29342936
metadata: Sequence[Tuple[str, str]] = (),
29352937
) -> pagers.ListStoredInfoTypesPager:
@@ -3033,7 +3035,7 @@ def delete_stored_info_type(
30333035
request: Union[dlp.DeleteStoredInfoTypeRequest, dict] = None,
30343036
*,
30353037
name: str = None,
3036-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3038+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30373039
timeout: float = None,
30383040
metadata: Sequence[Tuple[str, str]] = (),
30393041
) -> None:
@@ -3101,7 +3103,7 @@ def hybrid_inspect_dlp_job(
31013103
request: Union[dlp.HybridInspectDlpJobRequest, dict] = None,
31023104
*,
31033105
name: str = None,
3104-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3106+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
31053107
timeout: float = None,
31063108
metadata: Sequence[Tuple[str, str]] = (),
31073109
) -> dlp.HybridInspectResponse:
@@ -3178,7 +3180,7 @@ def finish_dlp_job(
31783180
self,
31793181
request: Union[dlp.FinishDlpJobRequest, dict] = None,
31803182
*,
3181-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3183+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
31823184
timeout: float = None,
31833185
metadata: Sequence[Tuple[str, str]] = (),
31843186
) -> None:

‎packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/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
@@ -36,15 +35,6 @@
3635
except pkg_resources.DistributionNotFound:
3736
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3837

39-
try:
40-
# google.auth.__version__ was added in 1.26.0
41-
_GOOGLE_AUTH_VERSION = google.auth.__version__
42-
except AttributeError:
43-
try: # try pkg_resources if it is available
44-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
45-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
46-
_GOOGLE_AUTH_VERSION = None
47-
4838

4939
class DlpServiceTransport(abc.ABC):
5040
"""Abstract transport class for DlpService."""
@@ -94,7 +84,7 @@ def __init__(
9484
host += ":443"
9585
self._host = host
9686

97-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
87+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9888

9989
# Save the scopes.
10090
self._scopes = scopes
@@ -127,29 +117,6 @@ def __init__(
127117
# Save the credentials.
128118
self._credentials = credentials
129119

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

‎packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/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)