Skip to content

Commit 0b985d8

Browse files
chore: use gapic-generator-python 0.53.4 (#130)
- [ ] 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 9a483ab commit 0b985d8

File tree

38 files changed

+295
-950
lines changed

38 files changed

+295
-950
lines changed

packages/google-cloud-resource-manager/google/cloud/resourcemanager_v3/services/folders/async_client.py

Lines changed: 36 additions & 34 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.api_core import operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.resourcemanager_v3.services.folders import pagers
@@ -165,10 +167,10 @@ def __init__(
165167

166168
async def get_folder(
167169
self,
168-
request: folders.GetFolderRequest = None,
170+
request: Union[folders.GetFolderRequest, dict] = None,
169171
*,
170172
name: str = None,
171-
retry: retries.Retry = gapic_v1.method.DEFAULT,
173+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
172174
timeout: float = None,
173175
metadata: Sequence[Tuple[str, str]] = (),
174176
) -> folders.Folder:
@@ -179,7 +181,7 @@ async def get_folder(
179181
the identified folder.
180182
181183
Args:
182-
request (:class:`google.cloud.resourcemanager_v3.types.GetFolderRequest`):
184+
request (Union[google.cloud.resourcemanager_v3.types.GetFolderRequest, dict]):
183185
The request object. The GetFolder request message.
184186
name (:class:`str`):
185187
Required. The resource name of the folder to retrieve.
@@ -249,10 +251,10 @@ async def get_folder(
249251

250252
async def list_folders(
251253
self,
252-
request: folders.ListFoldersRequest = None,
254+
request: Union[folders.ListFoldersRequest, dict] = None,
253255
*,
254256
parent: str = None,
255-
retry: retries.Retry = gapic_v1.method.DEFAULT,
257+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
256258
timeout: float = None,
257259
metadata: Sequence[Tuple[str, str]] = (),
258260
) -> pagers.ListFoldersAsyncPager:
@@ -265,7 +267,7 @@ async def list_folders(
265267
parent.
266268
267269
Args:
268-
request (:class:`google.cloud.resourcemanager_v3.types.ListFoldersRequest`):
270+
request (Union[google.cloud.resourcemanager_v3.types.ListFoldersRequest, dict]):
269271
The request object. The ListFolders request message.
270272
parent (:class:`str`):
271273
Required. The resource name of the organization or
@@ -341,10 +343,10 @@ async def list_folders(
341343

342344
async def search_folders(
343345
self,
344-
request: folders.SearchFoldersRequest = None,
346+
request: Union[folders.SearchFoldersRequest, dict] = None,
345347
*,
346348
query: str = None,
347-
retry: retries.Retry = gapic_v1.method.DEFAULT,
349+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
348350
timeout: float = None,
349351
metadata: Sequence[Tuple[str, str]] = (),
350352
) -> pagers.SearchFoldersAsyncPager:
@@ -357,7 +359,7 @@ async def search_folders(
357359
permission ``resourcemanager.folders.get``.
358360
359361
Args:
360-
request (:class:`google.cloud.resourcemanager_v3.types.SearchFoldersRequest`):
362+
request (Union[google.cloud.resourcemanager_v3.types.SearchFoldersRequest, dict]):
361363
The request object. The request message for searching
362364
folders.
363365
query (:class:`str`):
@@ -452,10 +454,10 @@ async def search_folders(
452454

453455
async def create_folder(
454456
self,
455-
request: folders.CreateFolderRequest = None,
457+
request: Union[folders.CreateFolderRequest, dict] = None,
456458
*,
457459
folder: folders.Folder = None,
458-
retry: retries.Retry = gapic_v1.method.DEFAULT,
460+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
459461
timeout: float = None,
460462
metadata: Sequence[Tuple[str, str]] = (),
461463
) -> operation_async.AsyncOperation:
@@ -490,7 +492,7 @@ async def create_folder(
490492
permission on the identified parent.
491493
492494
Args:
493-
request (:class:`google.cloud.resourcemanager_v3.types.CreateFolderRequest`):
495+
request (Union[google.cloud.resourcemanager_v3.types.CreateFolderRequest, dict]):
494496
The request object. The CreateFolder request message.
495497
folder (:class:`google.cloud.resourcemanager_v3.types.Folder`):
496498
Required. The folder being created,
@@ -556,11 +558,11 @@ async def create_folder(
556558

557559
async def update_folder(
558560
self,
559-
request: folders.UpdateFolderRequest = None,
561+
request: Union[folders.UpdateFolderRequest, dict] = None,
560562
*,
561563
folder: folders.Folder = None,
562564
update_mask: field_mask_pb2.FieldMask = None,
563-
retry: retries.Retry = gapic_v1.method.DEFAULT,
565+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
564566
timeout: float = None,
565567
metadata: Sequence[Tuple[str, str]] = (),
566568
) -> operation_async.AsyncOperation:
@@ -584,7 +586,7 @@ async def update_folder(
584586
returned in the Status.details field.
585587
586588
Args:
587-
request (:class:`google.cloud.resourcemanager_v3.types.UpdateFolderRequest`):
589+
request (Union[google.cloud.resourcemanager_v3.types.UpdateFolderRequest, dict]):
588590
The request object. The request sent to the
589591
[UpdateFolder][google.cloud.resourcemanager.v3.Folder.UpdateFolder]
590592
method.
@@ -672,11 +674,11 @@ async def update_folder(
672674

673675
async def move_folder(
674676
self,
675-
request: folders.MoveFolderRequest = None,
677+
request: Union[folders.MoveFolderRequest, dict] = None,
676678
*,
677679
name: str = None,
678680
destination_parent: str = None,
679-
retry: retries.Retry = gapic_v1.method.DEFAULT,
681+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
680682
timeout: float = None,
681683
metadata: Sequence[Tuple[str, str]] = (),
682684
) -> operation_async.AsyncOperation:
@@ -700,7 +702,7 @@ async def move_folder(
700702
current and proposed new parent.
701703
702704
Args:
703-
request (:class:`google.cloud.resourcemanager_v3.types.MoveFolderRequest`):
705+
request (Union[google.cloud.resourcemanager_v3.types.MoveFolderRequest, dict]):
704706
The request object. The MoveFolder request message.
705707
name (:class:`str`):
706708
Required. The resource name of the Folder to move. Must
@@ -781,10 +783,10 @@ async def move_folder(
781783

782784
async def delete_folder(
783785
self,
784-
request: folders.DeleteFolderRequest = None,
786+
request: Union[folders.DeleteFolderRequest, dict] = None,
785787
*,
786788
name: str = None,
787-
retry: retries.Retry = gapic_v1.method.DEFAULT,
789+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
788790
timeout: float = None,
789791
metadata: Sequence[Tuple[str, str]] = (),
790792
) -> operation_async.AsyncOperation:
@@ -802,7 +804,7 @@ async def delete_folder(
802804
identified folder.
803805
804806
Args:
805-
request (:class:`google.cloud.resourcemanager_v3.types.DeleteFolderRequest`):
807+
request (Union[google.cloud.resourcemanager_v3.types.DeleteFolderRequest, dict]):
806808
The request object. The DeleteFolder request message.
807809
name (:class:`str`):
808810
Required. The resource name of the folder to be deleted.
@@ -872,10 +874,10 @@ async def delete_folder(
872874

873875
async def undelete_folder(
874876
self,
875-
request: folders.UndeleteFolderRequest = None,
877+
request: Union[folders.UndeleteFolderRequest, dict] = None,
876878
*,
877879
name: str = None,
878-
retry: retries.Retry = gapic_v1.method.DEFAULT,
880+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
879881
timeout: float = None,
880882
metadata: Sequence[Tuple[str, str]] = (),
881883
) -> operation_async.AsyncOperation:
@@ -894,7 +896,7 @@ async def undelete_folder(
894896
identified folder.
895897
896898
Args:
897-
request (:class:`google.cloud.resourcemanager_v3.types.UndeleteFolderRequest`):
899+
request (Union[google.cloud.resourcemanager_v3.types.UndeleteFolderRequest, dict]):
898900
The request object. The UndeleteFolder request message.
899901
name (:class:`str`):
900902
Required. The resource name of the folder to undelete.
@@ -964,10 +966,10 @@ async def undelete_folder(
964966

965967
async def get_iam_policy(
966968
self,
967-
request: iam_policy_pb2.GetIamPolicyRequest = None,
969+
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
968970
*,
969971
resource: str = None,
970-
retry: retries.Retry = gapic_v1.method.DEFAULT,
972+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
971973
timeout: float = None,
972974
metadata: Sequence[Tuple[str, str]] = (),
973975
) -> policy_pb2.Policy:
@@ -979,7 +981,7 @@ async def get_iam_policy(
979981
identified folder.
980982
981983
Args:
982-
request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`):
984+
request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]):
983985
The request object. Request message for `GetIamPolicy`
984986
method.
985987
resource (:class:`str`):
@@ -1104,10 +1106,10 @@ async def get_iam_policy(
11041106

11051107
async def set_iam_policy(
11061108
self,
1107-
request: iam_policy_pb2.SetIamPolicyRequest = None,
1109+
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
11081110
*,
11091111
resource: str = None,
1110-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1112+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11111113
timeout: float = None,
11121114
metadata: Sequence[Tuple[str, str]] = (),
11131115
) -> policy_pb2.Policy:
@@ -1118,7 +1120,7 @@ async def set_iam_policy(
11181120
identified folder.
11191121
11201122
Args:
1121-
request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`):
1123+
request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]):
11221124
The request object. Request message for `SetIamPolicy`
11231125
method.
11241126
resource (:class:`str`):
@@ -1234,11 +1236,11 @@ async def set_iam_policy(
12341236

12351237
async def test_iam_permissions(
12361238
self,
1237-
request: iam_policy_pb2.TestIamPermissionsRequest = None,
1239+
request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
12381240
*,
12391241
resource: str = None,
12401242
permissions: Sequence[str] = None,
1241-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1243+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12421244
timeout: float = None,
12431245
metadata: Sequence[Tuple[str, str]] = (),
12441246
) -> iam_policy_pb2.TestIamPermissionsResponse:
@@ -1249,7 +1251,7 @@ async def test_iam_permissions(
12491251
There are no permissions required for making this API call.
12501252
12511253
Args:
1252-
request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`):
1254+
request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]):
12531255
The request object. Request message for
12541256
`TestIamPermissions` method.
12551257
resource (:class:`str`):

packages/google-cloud-resource-manager/google/cloud/resourcemanager_v3/services/folders/client.py

Lines changed: 13 additions & 11 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.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.resourcemanager_v3.services.folders import pagers
@@ -355,7 +357,7 @@ def get_folder(
355357
request: Union[folders.GetFolderRequest, dict] = None,
356358
*,
357359
name: str = None,
358-
retry: retries.Retry = gapic_v1.method.DEFAULT,
360+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
359361
timeout: float = None,
360362
metadata: Sequence[Tuple[str, str]] = (),
361363
) -> folders.Folder:
@@ -430,7 +432,7 @@ def list_folders(
430432
request: Union[folders.ListFoldersRequest, dict] = None,
431433
*,
432434
parent: str = None,
433-
retry: retries.Retry = gapic_v1.method.DEFAULT,
435+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
434436
timeout: float = None,
435437
metadata: Sequence[Tuple[str, str]] = (),
436438
) -> pagers.ListFoldersPager:
@@ -513,7 +515,7 @@ def search_folders(
513515
request: Union[folders.SearchFoldersRequest, dict] = None,
514516
*,
515517
query: str = None,
516-
retry: retries.Retry = gapic_v1.method.DEFAULT,
518+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
517519
timeout: float = None,
518520
metadata: Sequence[Tuple[str, str]] = (),
519521
) -> pagers.SearchFoldersPager:
@@ -624,7 +626,7 @@ def create_folder(
624626
request: Union[folders.CreateFolderRequest, dict] = None,
625627
*,
626628
folder: folders.Folder = None,
627-
retry: retries.Retry = gapic_v1.method.DEFAULT,
629+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
628630
timeout: float = None,
629631
metadata: Sequence[Tuple[str, str]] = (),
630632
) -> operation.Operation:
@@ -729,7 +731,7 @@ def update_folder(
729731
*,
730732
folder: folders.Folder = None,
731733
update_mask: field_mask_pb2.FieldMask = None,
732-
retry: retries.Retry = gapic_v1.method.DEFAULT,
734+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
733735
timeout: float = None,
734736
metadata: Sequence[Tuple[str, str]] = (),
735737
) -> operation.Operation:
@@ -845,7 +847,7 @@ def move_folder(
845847
*,
846848
name: str = None,
847849
destination_parent: str = None,
848-
retry: retries.Retry = gapic_v1.method.DEFAULT,
850+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
849851
timeout: float = None,
850852
metadata: Sequence[Tuple[str, str]] = (),
851853
) -> operation.Operation:
@@ -953,7 +955,7 @@ def delete_folder(
953955
request: Union[folders.DeleteFolderRequest, dict] = None,
954956
*,
955957
name: str = None,
956-
retry: retries.Retry = gapic_v1.method.DEFAULT,
958+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
957959
timeout: float = None,
958960
metadata: Sequence[Tuple[str, str]] = (),
959961
) -> operation.Operation:
@@ -1044,7 +1046,7 @@ def undelete_folder(
10441046
request: Union[folders.UndeleteFolderRequest, dict] = None,
10451047
*,
10461048
name: str = None,
1047-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1049+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10481050
timeout: float = None,
10491051
metadata: Sequence[Tuple[str, str]] = (),
10501052
) -> operation.Operation:
@@ -1136,7 +1138,7 @@ def get_iam_policy(
11361138
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
11371139
*,
11381140
resource: 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
) -> policy_pb2.Policy:
@@ -1266,7 +1268,7 @@ def set_iam_policy(
12661268
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
12671269
*,
12681270
resource: str = None,
1269-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1271+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12701272
timeout: float = None,
12711273
metadata: Sequence[Tuple[str, str]] = (),
12721274
) -> policy_pb2.Policy:
@@ -1396,7 +1398,7 @@ def test_iam_permissions(
13961398
*,
13971399
resource: str = None,
13981400
permissions: Sequence[str] = None,
1399-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1401+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14001402
timeout: float = None,
14011403
metadata: Sequence[Tuple[str, str]] = (),
14021404
) -> iam_policy_pb2.TestIamPermissionsResponse:

0 commit comments

Comments
 (0)