Skip to content
This repository was archived by the owner on Mar 15, 2025. It is now read-only.

Commit 1d6e752

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#99)
- [ ] 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 6704725 commit 1d6e752

File tree

9 files changed

+65
-147
lines changed

9 files changed

+65
-147
lines changed

‎google/cloud/orgpolicy_v2/services/org_policy/async_client.py

+24-22
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.orgpolicy_v2.services.org_policy import pagers
3032
from google.cloud.orgpolicy_v2.types import constraint
3133
from google.cloud.orgpolicy_v2.types import orgpolicy
@@ -182,18 +184,18 @@ def __init__(
182184

183185
async def list_constraints(
184186
self,
185-
request: orgpolicy.ListConstraintsRequest = None,
187+
request: Union[orgpolicy.ListConstraintsRequest, dict] = None,
186188
*,
187189
parent: str = None,
188-
retry: retries.Retry = gapic_v1.method.DEFAULT,
190+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
189191
timeout: float = None,
190192
metadata: Sequence[Tuple[str, str]] = (),
191193
) -> pagers.ListConstraintsAsyncPager:
192194
r"""Lists ``Constraints`` that could be applied on the specified
193195
resource.
194196
195197
Args:
196-
request (:class:`google.cloud.orgpolicy_v2.types.ListConstraintsRequest`):
198+
request (Union[google.cloud.orgpolicy_v2.types.ListConstraintsRequest, dict]):
197199
The request object. The request sent to the
198200
[ListConstraints]
199201
[google.cloud.orgpolicy.v2.OrgPolicy.ListConstraints]
@@ -281,18 +283,18 @@ async def list_constraints(
281283

282284
async def list_policies(
283285
self,
284-
request: orgpolicy.ListPoliciesRequest = None,
286+
request: Union[orgpolicy.ListPoliciesRequest, dict] = None,
285287
*,
286288
parent: str = None,
287-
retry: retries.Retry = gapic_v1.method.DEFAULT,
289+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
288290
timeout: float = None,
289291
metadata: Sequence[Tuple[str, str]] = (),
290292
) -> pagers.ListPoliciesAsyncPager:
291293
r"""Retrieves all of the ``Policies`` that exist on a particular
292294
resource.
293295
294296
Args:
295-
request (:class:`google.cloud.orgpolicy_v2.types.ListPoliciesRequest`):
297+
request (Union[google.cloud.orgpolicy_v2.types.ListPoliciesRequest, dict]):
296298
The request object. The request sent to the
297299
[ListPolicies]
298300
[google.cloud.orgpolicy.v2.OrgPolicy.ListPolicies]
@@ -382,10 +384,10 @@ async def list_policies(
382384

383385
async def get_policy(
384386
self,
385-
request: orgpolicy.GetPolicyRequest = None,
387+
request: Union[orgpolicy.GetPolicyRequest, dict] = None,
386388
*,
387389
name: str = None,
388-
retry: retries.Retry = gapic_v1.method.DEFAULT,
390+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
389391
timeout: float = None,
390392
metadata: Sequence[Tuple[str, str]] = (),
391393
) -> orgpolicy.Policy:
@@ -396,7 +398,7 @@ async def get_policy(
396398
a ``Policy`` during read-modify-write.
397399
398400
Args:
399-
request (:class:`google.cloud.orgpolicy_v2.types.GetPolicyRequest`):
401+
request (Union[google.cloud.orgpolicy_v2.types.GetPolicyRequest, dict]):
400402
The request object. The request sent to the [GetPolicy]
401403
[google.cloud.orgpolicy.v2.OrgPolicy.GetPolicy] method.
402404
name (:class:`str`):
@@ -467,10 +469,10 @@ async def get_policy(
467469

468470
async def get_effective_policy(
469471
self,
470-
request: orgpolicy.GetEffectivePolicyRequest = None,
472+
request: Union[orgpolicy.GetEffectivePolicyRequest, dict] = None,
471473
*,
472474
name: str = None,
473-
retry: retries.Retry = gapic_v1.method.DEFAULT,
475+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
474476
timeout: float = None,
475477
metadata: Sequence[Tuple[str, str]] = (),
476478
) -> orgpolicy.Policy:
@@ -482,7 +484,7 @@ async def get_effective_policy(
482484
hierarchy with 'under:' prefix will not be expanded.
483485
484486
Args:
485-
request (:class:`google.cloud.orgpolicy_v2.types.GetEffectivePolicyRequest`):
487+
request (Union[google.cloud.orgpolicy_v2.types.GetEffectivePolicyRequest, dict]):
486488
The request object. The request sent to the
487489
[GetEffectivePolicy]
488490
[google.cloud.orgpolicy.v2.OrgPolicy.GetEffectivePolicy]
@@ -555,11 +557,11 @@ async def get_effective_policy(
555557

556558
async def create_policy(
557559
self,
558-
request: orgpolicy.CreatePolicyRequest = None,
560+
request: Union[orgpolicy.CreatePolicyRequest, dict] = None,
559561
*,
560562
parent: str = None,
561563
policy: orgpolicy.Policy = None,
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
) -> orgpolicy.Policy:
@@ -572,7 +574,7 @@ async def create_policy(
572574
on the given Cloud resource.
573575
574576
Args:
575-
request (:class:`google.cloud.orgpolicy_v2.types.CreatePolicyRequest`):
577+
request (Union[google.cloud.orgpolicy_v2.types.CreatePolicyRequest, dict]):
576578
The request object. The request sent to the
577579
[CreatePolicyRequest]
578580
[google.cloud.orgpolicy.v2.OrgPolicy.CreatePolicy]
@@ -657,10 +659,10 @@ async def create_policy(
657659

658660
async def update_policy(
659661
self,
660-
request: orgpolicy.UpdatePolicyRequest = None,
662+
request: Union[orgpolicy.UpdatePolicyRequest, dict] = None,
661663
*,
662664
policy: orgpolicy.Policy = None,
663-
retry: retries.Retry = gapic_v1.method.DEFAULT,
665+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
664666
timeout: float = None,
665667
metadata: Sequence[Tuple[str, str]] = (),
666668
) -> orgpolicy.Policy:
@@ -676,7 +678,7 @@ async def update_policy(
676678
fields.
677679
678680
Args:
679-
request (:class:`google.cloud.orgpolicy_v2.types.UpdatePolicyRequest`):
681+
request (Union[google.cloud.orgpolicy_v2.types.UpdatePolicyRequest, dict]):
680682
The request object. The request sent to the
681683
[UpdatePolicyRequest]
682684
[google.cloud.orgpolicy.v2.OrgPolicy.UpdatePolicy]
@@ -749,10 +751,10 @@ async def update_policy(
749751

750752
async def delete_policy(
751753
self,
752-
request: orgpolicy.DeletePolicyRequest = None,
754+
request: Union[orgpolicy.DeletePolicyRequest, 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_policy(
763765
does not exist.
764766
765767
Args:
766-
request (:class:`google.cloud.orgpolicy_v2.types.DeletePolicyRequest`):
768+
request (Union[google.cloud.orgpolicy_v2.types.DeletePolicyRequest, dict]):
767769
The request object. The request sent to the
768770
[DeletePolicy]
769771
[google.cloud.orgpolicy.v2.OrgPolicy.DeletePolicy]

‎google/cloud/orgpolicy_v2/services/org_policy/client.py

+9-7
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.orgpolicy_v2.services.org_policy import pagers
3436
from google.cloud.orgpolicy_v2.types import constraint
3537
from google.cloud.orgpolicy_v2.types import orgpolicy
@@ -385,7 +387,7 @@ def list_constraints(
385387
request: Union[orgpolicy.ListConstraintsRequest, dict] = None,
386388
*,
387389
parent: str = None,
388-
retry: retries.Retry = gapic_v1.method.DEFAULT,
390+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
389391
timeout: float = None,
390392
metadata: Sequence[Tuple[str, str]] = (),
391393
) -> pagers.ListConstraintsPager:
@@ -474,7 +476,7 @@ def list_policies(
474476
request: Union[orgpolicy.ListPoliciesRequest, dict] = None,
475477
*,
476478
parent: str = None,
477-
retry: retries.Retry = gapic_v1.method.DEFAULT,
479+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
478480
timeout: float = None,
479481
metadata: Sequence[Tuple[str, str]] = (),
480482
) -> pagers.ListPoliciesPager:
@@ -565,7 +567,7 @@ def get_policy(
565567
request: Union[orgpolicy.GetPolicyRequest, dict] = None,
566568
*,
567569
name: str = None,
568-
retry: retries.Retry = gapic_v1.method.DEFAULT,
570+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
569571
timeout: float = None,
570572
metadata: Sequence[Tuple[str, str]] = (),
571573
) -> orgpolicy.Policy:
@@ -640,7 +642,7 @@ def get_effective_policy(
640642
request: Union[orgpolicy.GetEffectivePolicyRequest, dict] = None,
641643
*,
642644
name: str = None,
643-
retry: retries.Retry = gapic_v1.method.DEFAULT,
645+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
644646
timeout: float = None,
645647
metadata: Sequence[Tuple[str, str]] = (),
646648
) -> orgpolicy.Policy:
@@ -719,7 +721,7 @@ def create_policy(
719721
*,
720722
parent: str = None,
721723
policy: orgpolicy.Policy = None,
722-
retry: retries.Retry = gapic_v1.method.DEFAULT,
724+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
723725
timeout: float = None,
724726
metadata: Sequence[Tuple[str, str]] = (),
725727
) -> orgpolicy.Policy:
@@ -810,7 +812,7 @@ def update_policy(
810812
request: Union[orgpolicy.UpdatePolicyRequest, dict] = None,
811813
*,
812814
policy: orgpolicy.Policy = None,
813-
retry: retries.Retry = gapic_v1.method.DEFAULT,
815+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
814816
timeout: float = None,
815817
metadata: Sequence[Tuple[str, str]] = (),
816818
) -> orgpolicy.Policy:
@@ -892,7 +894,7 @@ def delete_policy(
892894
request: Union[orgpolicy.DeletePolicyRequest, dict] = None,
893895
*,
894896
name: str = None,
895-
retry: retries.Retry = gapic_v1.method.DEFAULT,
897+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
896898
timeout: float = None,
897899
metadata: Sequence[Tuple[str, str]] = (),
898900
) -> None:

‎google/cloud/orgpolicy_v2/services/org_policy/transports/base.py

+1-34
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
@@ -38,15 +37,6 @@
3837
except pkg_resources.DistributionNotFound:
3938
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4039

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

5141
class OrgPolicyTransport(abc.ABC):
5242
"""Abstract transport class for OrgPolicy."""
@@ -96,7 +86,7 @@ def __init__(
9686
host += ":443"
9787
self._host = host
9888

99-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
89+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10090

10191
# Save the scopes.
10292
self._scopes = scopes
@@ -129,29 +119,6 @@ def __init__(
129119
# Save the credentials.
130120
self._credentials = credentials
131121

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

‎google/cloud/orgpolicy_v2/services/org_policy/transports/grpc_asyncio.py

-1
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

‎google/cloud/orgpolicy_v2/types/constraint.py

+9
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ class Constraint(proto.Message):
4040
is used in the absence of a ``policy`` being defined or inherited
4141
for the resource in question.
4242
43+
This message has `oneof`_ fields (mutually exclusive fields).
44+
For each oneof, at most one member field can be set at the same time.
45+
Setting any member of the oneof automatically clears all other
46+
members.
47+
48+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
49+
4350
Attributes:
4451
name (str):
4552
Immutable. The resource name of the Constraint. Must be in
@@ -65,9 +72,11 @@ class Constraint(proto.Message):
6572
list_constraint (google.cloud.orgpolicy_v2.types.Constraint.ListConstraint):
6673
Defines this constraint as being a
6774
ListConstraint.
75+
This field is a member of `oneof`_ ``constraint_type``.
6876
boolean_constraint (google.cloud.orgpolicy_v2.types.Constraint.BooleanConstraint):
6977
Defines this constraint as being a
7078
BooleanConstraint.
79+
This field is a member of `oneof`_ ``constraint_type``.
7180
"""
7281

7382
class ConstraintDefault(proto.Enum):

‎google/cloud/orgpolicy_v2/types/orgpolicy.py

+11
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,34 @@ class PolicySpec(proto.Message):
150150
class PolicyRule(proto.Message):
151151
r"""A rule used to express this policy.
152152
153+
This message has `oneof`_ fields (mutually exclusive fields).
154+
For each oneof, at most one member field can be set at the same time.
155+
Setting any member of the oneof automatically clears all other
156+
members.
157+
158+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
159+
153160
Attributes:
154161
values (google.cloud.orgpolicy_v2.types.PolicySpec.PolicyRule.StringValues):
155162
List of values to be used for this
156163
PolicyRule. This field can be set only in
157164
Policies for list constraints.
165+
This field is a member of `oneof`_ ``kind``.
158166
allow_all (bool):
159167
Setting this to true means that all values
160168
are allowed. This field can be set only in
161169
Policies for list constraints.
170+
This field is a member of `oneof`_ ``kind``.
162171
deny_all (bool):
163172
Setting this to true means that all values
164173
are denied. This field can be set only in
165174
Policies for list constraints.
175+
This field is a member of `oneof`_ ``kind``.
166176
enforce (bool):
167177
If ``true``, then the ``Policy`` is enforced. If ``false``,
168178
then any configuration is acceptable. This field can be set
169179
only in Policies for boolean constraints.
180+
This field is a member of `oneof`_ ``kind``.
170181
condition (google.type.expr_pb2.Expr):
171182
A condition which determines whether this rule is used in
172183
the evaluation of the policy. When set, the ``expression``

‎setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@
4444
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
4545
# Until this issue is closed
4646
# https://github.com/googleapis/google-cloud-python/issues/10566
47-
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
47+
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
4848
"proto-plus >= 1.10.0",
49-
"packaging >= 14.3",
5049
),
5150
python_requires=">=3.6",
5251
classifiers=[

‎testing/constraints-3.6.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
#
2020
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
2121
# Then this file should have foo==1.14.0
22-
google-api-core==1.26.0
22+
google-api-core==1.28.0
2323
proto-plus==1.10.0
24-
packaging==14.3

0 commit comments

Comments
 (0)