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

Commit 30b353c

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#43)
- [ ] 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 50d761c commit 30b353c

13 files changed

Lines changed: 84 additions & 307 deletions

File tree

‎google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py‎

Lines changed: 18 additions & 16 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.iap_v1.types import service
3032
from google.iam.v1 import iam_policy_pb2 # type: ignore
3133
from google.iam.v1 import policy_pb2 # type: ignore
@@ -172,9 +174,9 @@ def __init__(
172174

173175
async def set_iam_policy(
174176
self,
175-
request: iam_policy_pb2.SetIamPolicyRequest = None,
177+
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
176178
*,
177-
retry: retries.Retry = gapic_v1.method.DEFAULT,
179+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
178180
timeout: float = None,
179181
metadata: Sequence[Tuple[str, str]] = (),
180182
) -> policy_pb2.Policy:
@@ -184,7 +186,7 @@ async def set_iam_policy(
184186
https://cloud.google.com/iap/docs/managing-access#managing_access_via_the_api
185187
186188
Args:
187-
request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`):
189+
request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]):
188190
The request object. Request message for `SetIamPolicy`
189191
method.
190192
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -280,9 +282,9 @@ async def set_iam_policy(
280282

281283
async def get_iam_policy(
282284
self,
283-
request: iam_policy_pb2.GetIamPolicyRequest = None,
285+
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
284286
*,
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
) -> policy_pb2.Policy:
@@ -292,7 +294,7 @@ async def get_iam_policy(
292294
https://cloud.google.com/iap/docs/managing-access#managing_access_via_the_api
293295
294296
Args:
295-
request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`):
297+
request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]):
296298
The request object. Request message for `GetIamPolicy`
297299
method.
298300
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -388,9 +390,9 @@ async def get_iam_policy(
388390

389391
async def test_iam_permissions(
390392
self,
391-
request: iam_policy_pb2.TestIamPermissionsRequest = None,
393+
request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
392394
*,
393-
retry: retries.Retry = gapic_v1.method.DEFAULT,
395+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
394396
timeout: float = None,
395397
metadata: Sequence[Tuple[str, str]] = (),
396398
) -> iam_policy_pb2.TestIamPermissionsResponse:
@@ -400,7 +402,7 @@ async def test_iam_permissions(
400402
https://cloud.google.com/iap/docs/managing-access#managing_access_via_the_api
401403
402404
Args:
403-
request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`):
405+
request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]):
404406
The request object. Request message for
405407
`TestIamPermissions` method.
406408
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -441,17 +443,17 @@ async def test_iam_permissions(
441443

442444
async def get_iap_settings(
443445
self,
444-
request: service.GetIapSettingsRequest = None,
446+
request: Union[service.GetIapSettingsRequest, dict] = None,
445447
*,
446-
retry: retries.Retry = gapic_v1.method.DEFAULT,
448+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
447449
timeout: float = None,
448450
metadata: Sequence[Tuple[str, str]] = (),
449451
) -> service.IapSettings:
450452
r"""Gets the IAP settings on a particular IAP protected
451453
resource.
452454
453455
Args:
454-
request (:class:`google.cloud.iap_v1.types.GetIapSettingsRequest`):
456+
request (Union[google.cloud.iap_v1.types.GetIapSettingsRequest, dict]):
455457
The request object. The request sent to GetIapSettings.
456458
retry (google.api_core.retry.Retry): Designation of what errors, if any,
457459
should be retried.
@@ -488,17 +490,17 @@ async def get_iap_settings(
488490

489491
async def update_iap_settings(
490492
self,
491-
request: service.UpdateIapSettingsRequest = None,
493+
request: Union[service.UpdateIapSettingsRequest, dict] = None,
492494
*,
493-
retry: retries.Retry = gapic_v1.method.DEFAULT,
495+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
494496
timeout: float = None,
495497
metadata: Sequence[Tuple[str, str]] = (),
496498
) -> service.IapSettings:
497499
r"""Updates the IAP settings on a particular IAP protected resource.
498500
It replaces all fields unless the ``update_mask`` is set.
499501
500502
Args:
501-
request (:class:`google.cloud.iap_v1.types.UpdateIapSettingsRequest`):
503+
request (Union[google.cloud.iap_v1.types.UpdateIapSettingsRequest, dict]):
502504
The request object. The request sent to
503505
UpdateIapSettings.
504506
retry (google.api_core.retry.Retry): Designation of what errors, if any,

‎google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py‎

Lines changed: 7 additions & 5 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.iap_v1.types import service
3436
from google.iam.v1 import iam_policy_pb2 # type: ignore
3537
from google.iam.v1 import policy_pb2 # type: ignore
@@ -345,7 +347,7 @@ def set_iam_policy(
345347
self,
346348
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
347349
*,
348-
retry: retries.Retry = gapic_v1.method.DEFAULT,
350+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
349351
timeout: float = None,
350352
metadata: Sequence[Tuple[str, str]] = (),
351353
) -> policy_pb2.Policy:
@@ -452,7 +454,7 @@ def get_iam_policy(
452454
self,
453455
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
454456
*,
455-
retry: retries.Retry = gapic_v1.method.DEFAULT,
457+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
456458
timeout: float = None,
457459
metadata: Sequence[Tuple[str, str]] = (),
458460
) -> policy_pb2.Policy:
@@ -559,7 +561,7 @@ def test_iam_permissions(
559561
self,
560562
request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
561563
*,
562-
retry: retries.Retry = gapic_v1.method.DEFAULT,
564+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
563565
timeout: float = None,
564566
metadata: Sequence[Tuple[str, str]] = (),
565567
) -> iam_policy_pb2.TestIamPermissionsResponse:
@@ -611,7 +613,7 @@ def get_iap_settings(
611613
self,
612614
request: Union[service.GetIapSettingsRequest, dict] = None,
613615
*,
614-
retry: retries.Retry = gapic_v1.method.DEFAULT,
616+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
615617
timeout: float = None,
616618
metadata: Sequence[Tuple[str, str]] = (),
617619
) -> service.IapSettings:
@@ -659,7 +661,7 @@ def update_iap_settings(
659661
self,
660662
request: Union[service.UpdateIapSettingsRequest, dict] = None,
661663
*,
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
) -> service.IapSettings:

‎google/cloud/iap_v1/services/identity_aware_proxy_admin_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
@@ -37,15 +36,6 @@
3736
except pkg_resources.DistributionNotFound:
3837
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3938

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

5040
class IdentityAwareProxyAdminServiceTransport(abc.ABC):
5141
"""Abstract transport class for IdentityAwareProxyAdminService."""
@@ -95,7 +85,7 @@ def __init__(
9585
host += ":443"
9686
self._host = host
9787

98-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
88+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9989

10090
# Save the scopes.
10191
self._scopes = scopes
@@ -128,29 +118,6 @@ def __init__(
128118
# Save the credentials.
129119
self._credentials = credentials
130120

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

‎google/cloud/iap_v1/services/identity_aware_proxy_admin_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)