Skip to content

Commit c7c5579

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#91)
- [ ] 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: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent 9419fb2 commit c7c5579

File tree

25 files changed

+161
-545
lines changed

25 files changed

+161
-545
lines changed

‎packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/async_client.py‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.cloud.binaryauthorization_v1.services.binauthz_management_service_v1 import (
3032
pagers,
3133
)
@@ -187,10 +189,10 @@ def __init__(
187189

188190
async def get_policy(
189191
self,
190-
request: service.GetPolicyRequest = None,
192+
request: Union[service.GetPolicyRequest, dict] = None,
191193
*,
192194
name: str = None,
193-
retry: retries.Retry = gapic_v1.method.DEFAULT,
195+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
194196
timeout: float = None,
195197
metadata: Sequence[Tuple[str, str]] = (),
196198
) -> resources.Policy:
@@ -207,7 +209,7 @@ async def get_policy(
207209
project does not have one.
208210
209211
Args:
210-
request (:class:`google.cloud.binaryauthorization_v1.types.GetPolicyRequest`):
212+
request (Union[google.cloud.binaryauthorization_v1.types.GetPolicyRequest, dict]):
211213
The request object. Request message for
212214
[BinauthzManagementService.GetPolicy][].
213215
name (:class:`str`):
@@ -279,10 +281,10 @@ async def get_policy(
279281

280282
async def update_policy(
281283
self,
282-
request: service.UpdatePolicyRequest = None,
284+
request: Union[service.UpdatePolicyRequest, dict] = None,
283285
*,
284286
policy: resources.Policy = None,
285-
retry: retries.Retry = gapic_v1.method.DEFAULT,
287+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
286288
timeout: float = None,
287289
metadata: Sequence[Tuple[str, str]] = (),
288290
) -> resources.Policy:
@@ -296,7 +298,7 @@ async def update_policy(
296298
request is malformed.
297299
298300
Args:
299-
request (:class:`google.cloud.binaryauthorization_v1.types.UpdatePolicyRequest`):
301+
request (Union[google.cloud.binaryauthorization_v1.types.UpdatePolicyRequest, dict]):
300302
The request object. Request message for
301303
[BinauthzManagementService.UpdatePolicy][].
302304
policy (:class:`google.cloud.binaryauthorization_v1.types.Policy`):
@@ -373,12 +375,12 @@ async def update_policy(
373375

374376
async def create_attestor(
375377
self,
376-
request: service.CreateAttestorRequest = None,
378+
request: Union[service.CreateAttestorRequest, dict] = None,
377379
*,
378380
parent: str = None,
379381
attestor_id: str = None,
380382
attestor: resources.Attestor = None,
381-
retry: retries.Retry = gapic_v1.method.DEFAULT,
383+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
382384
timeout: float = None,
383385
metadata: Sequence[Tuple[str, str]] = (),
384386
) -> resources.Attestor:
@@ -392,7 +394,7 @@ async def create_attestor(
392394
already exists.
393395
394396
Args:
395-
request (:class:`google.cloud.binaryauthorization_v1.types.CreateAttestorRequest`):
397+
request (Union[google.cloud.binaryauthorization_v1.types.CreateAttestorRequest, dict]):
396398
The request object. Request message for
397399
[BinauthzManagementService.CreateAttestor][].
398400
parent (:class:`str`):
@@ -477,10 +479,10 @@ async def create_attestor(
477479

478480
async def get_attestor(
479481
self,
480-
request: service.GetAttestorRequest = None,
482+
request: Union[service.GetAttestorRequest, dict] = None,
481483
*,
482484
name: str = None,
483-
retry: retries.Retry = gapic_v1.method.DEFAULT,
485+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
484486
timeout: float = None,
485487
metadata: Sequence[Tuple[str, str]] = (),
486488
) -> resources.Attestor:
@@ -491,7 +493,7 @@ async def get_attestor(
491493
not exist.
492494
493495
Args:
494-
request (:class:`google.cloud.binaryauthorization_v1.types.GetAttestorRequest`):
496+
request (Union[google.cloud.binaryauthorization_v1.types.GetAttestorRequest, dict]):
495497
The request object. Request message for
496498
[BinauthzManagementService.GetAttestor][].
497499
name (:class:`str`):
@@ -564,10 +566,10 @@ async def get_attestor(
564566

565567
async def update_attestor(
566568
self,
567-
request: service.UpdateAttestorRequest = None,
569+
request: Union[service.UpdateAttestorRequest, dict] = None,
568570
*,
569571
attestor: resources.Attestor = None,
570-
retry: retries.Retry = gapic_v1.method.DEFAULT,
572+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
571573
timeout: float = None,
572574
metadata: Sequence[Tuple[str, str]] = (),
573575
) -> resources.Attestor:
@@ -578,7 +580,7 @@ async def update_attestor(
578580
not exist.
579581
580582
Args:
581-
request (:class:`google.cloud.binaryauthorization_v1.types.UpdateAttestorRequest`):
583+
request (Union[google.cloud.binaryauthorization_v1.types.UpdateAttestorRequest, dict]):
582584
The request object. Request message for
583585
[BinauthzManagementService.UpdateAttestor][].
584586
attestor (:class:`google.cloud.binaryauthorization_v1.types.Attestor`):
@@ -656,18 +658,18 @@ async def update_attestor(
656658

657659
async def list_attestors(
658660
self,
659-
request: service.ListAttestorsRequest = None,
661+
request: Union[service.ListAttestorsRequest, dict] = None,
660662
*,
661663
parent: str = None,
662-
retry: retries.Retry = gapic_v1.method.DEFAULT,
664+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
663665
timeout: float = None,
664666
metadata: Sequence[Tuple[str, str]] = (),
665667
) -> pagers.ListAttestorsAsyncPager:
666668
r"""Lists [attestors][google.cloud.binaryauthorization.v1.Attestor].
667669
Returns INVALID_ARGUMENT if the project does not exist.
668670
669671
Args:
670-
request (:class:`google.cloud.binaryauthorization_v1.types.ListAttestorsRequest`):
672+
request (Union[google.cloud.binaryauthorization_v1.types.ListAttestorsRequest, dict]):
671673
The request object. Request message for
672674
[BinauthzManagementService.ListAttestors][].
673675
parent (:class:`str`):
@@ -749,10 +751,10 @@ async def list_attestors(
749751

750752
async def delete_attestor(
751753
self,
752-
request: service.DeleteAttestorRequest = None,
754+
request: Union[service.DeleteAttestorRequest, dict] = None,
753755
*,
754756
name: str = None,
755-
retry: retries.Retry = gapic_v1.method.DEFAULT,
757+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
756758
timeout: float = None,
757759
metadata: Sequence[Tuple[str, str]] = (),
758760
) -> None:
@@ -763,7 +765,7 @@ async def delete_attestor(
763765
not exist.
764766
765767
Args:
766-
request (:class:`google.cloud.binaryauthorization_v1.types.DeleteAttestorRequest`):
768+
request (Union[google.cloud.binaryauthorization_v1.types.DeleteAttestorRequest, dict]):
767769
The request object. Request message for
768770
[BinauthzManagementService.DeleteAttestor][].
769771
name (:class:`str`):

‎packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/client.py‎

Lines changed: 9 additions & 7 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.binaryauthorization_v1.services.binauthz_management_service_v1 import (
3436
pagers,
3537
)
@@ -377,7 +379,7 @@ def get_policy(
377379
request: Union[service.GetPolicyRequest, dict] = None,
378380
*,
379381
name: str = None,
380-
retry: retries.Retry = gapic_v1.method.DEFAULT,
382+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
381383
timeout: float = None,
382384
metadata: Sequence[Tuple[str, str]] = (),
383385
) -> resources.Policy:
@@ -459,7 +461,7 @@ def update_policy(
459461
request: Union[service.UpdatePolicyRequest, dict] = None,
460462
*,
461463
policy: resources.Policy = None,
462-
retry: retries.Retry = gapic_v1.method.DEFAULT,
464+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
463465
timeout: float = None,
464466
metadata: Sequence[Tuple[str, str]] = (),
465467
) -> resources.Policy:
@@ -545,7 +547,7 @@ def create_attestor(
545547
parent: str = None,
546548
attestor_id: str = None,
547549
attestor: resources.Attestor = None,
548-
retry: retries.Retry = gapic_v1.method.DEFAULT,
550+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
549551
timeout: float = None,
550552
metadata: Sequence[Tuple[str, str]] = (),
551553
) -> resources.Attestor:
@@ -647,7 +649,7 @@ def get_attestor(
647649
request: Union[service.GetAttestorRequest, dict] = None,
648650
*,
649651
name: str = None,
650-
retry: retries.Retry = gapic_v1.method.DEFAULT,
652+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
651653
timeout: float = None,
652654
metadata: Sequence[Tuple[str, str]] = (),
653655
) -> resources.Attestor:
@@ -724,7 +726,7 @@ def update_attestor(
724726
request: Union[service.UpdateAttestorRequest, dict] = None,
725727
*,
726728
attestor: resources.Attestor = None,
727-
retry: retries.Retry = gapic_v1.method.DEFAULT,
729+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
728730
timeout: float = None,
729731
metadata: Sequence[Tuple[str, str]] = (),
730732
) -> resources.Attestor:
@@ -806,7 +808,7 @@ def list_attestors(
806808
request: Union[service.ListAttestorsRequest, dict] = None,
807809
*,
808810
parent: str = None,
809-
retry: retries.Retry = gapic_v1.method.DEFAULT,
811+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
810812
timeout: float = None,
811813
metadata: Sequence[Tuple[str, str]] = (),
812814
) -> pagers.ListAttestorsPager:
@@ -889,7 +891,7 @@ def delete_attestor(
889891
request: Union[service.DeleteAttestorRequest, dict] = None,
890892
*,
891893
name: str = None,
892-
retry: retries.Retry = gapic_v1.method.DEFAULT,
894+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
893895
timeout: float = None,
894896
metadata: Sequence[Tuple[str, str]] = (),
895897
) -> None:

‎packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/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
@@ -39,15 +38,6 @@
3938
except pkg_resources.DistributionNotFound:
4039
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4140

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

5242
class BinauthzManagementServiceV1Transport(abc.ABC):
5343
"""Abstract transport class for BinauthzManagementServiceV1."""
@@ -97,7 +87,7 @@ def __init__(
9787
host += ":443"
9888
self._host = host
9989

100-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
90+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10191

10292
# Save the scopes.
10393
self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
130120
# Save the credentials.
131121
self._credentials = credentials
132122

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

‎packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/binauthz_management_service_v1/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

‎packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/async_client.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.cloud.binaryauthorization_v1.types import resources
3032
from google.cloud.binaryauthorization_v1.types import service
3133
from google.protobuf import timestamp_pb2 # type: ignore
@@ -164,18 +166,18 @@ def __init__(
164166

165167
async def get_system_policy(
166168
self,
167-
request: service.GetSystemPolicyRequest = None,
169+
request: Union[service.GetSystemPolicyRequest, dict] = None,
168170
*,
169171
name: str = None,
170-
retry: retries.Retry = gapic_v1.method.DEFAULT,
172+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
171173
timeout: float = None,
172174
metadata: Sequence[Tuple[str, str]] = (),
173175
) -> resources.Policy:
174176
r"""Gets the current system policy in the specified
175177
location.
176178
177179
Args:
178-
request (:class:`google.cloud.binaryauthorization_v1.types.GetSystemPolicyRequest`):
180+
request (Union[google.cloud.binaryauthorization_v1.types.GetSystemPolicyRequest, dict]):
179181
The request object. Request to read the current system
180182
policy.
181183
name (:class:`str`):

‎packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/services/system_policy_v1/client.py‎

Lines changed: 3 additions & 1 deletion
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.binaryauthorization_v1.types import resources
3436
from google.cloud.binaryauthorization_v1.types import service
3537
from google.protobuf import timestamp_pb2 # type: ignore
@@ -348,7 +350,7 @@ def get_system_policy(
348350
request: Union[service.GetSystemPolicyRequest, dict] = None,
349351
*,
350352
name: str = None,
351-
retry: retries.Retry = gapic_v1.method.DEFAULT,
353+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
352354
timeout: float = None,
353355
metadata: Sequence[Tuple[str, str]] = (),
354356
) -> resources.Policy:

0 commit comments

Comments
 (0)