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

Commit df69ccc

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#140)
- [ ] 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 a27e626 commit df69ccc

26 files changed

Lines changed: 336 additions & 461 deletions

File tree

‎google/cloud/osconfig_v1/services/os_config_service/async_client.py‎

Lines changed: 30 additions & 28 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.osconfig_v1.services.os_config_service import pagers
3032
from google.cloud.osconfig_v1.types import patch_deployments
3133
from google.cloud.osconfig_v1.types import patch_jobs
@@ -176,17 +178,17 @@ def __init__(
176178

177179
async def execute_patch_job(
178180
self,
179-
request: patch_jobs.ExecutePatchJobRequest = None,
181+
request: Union[patch_jobs.ExecutePatchJobRequest, dict] = None,
180182
*,
181-
retry: retries.Retry = gapic_v1.method.DEFAULT,
183+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
182184
timeout: float = None,
183185
metadata: Sequence[Tuple[str, str]] = (),
184186
) -> patch_jobs.PatchJob:
185187
r"""Patch VM instances by creating and running a patch
186188
job.
187189
188190
Args:
189-
request (:class:`google.cloud.osconfig_v1.types.ExecutePatchJobRequest`):
191+
request (Union[google.cloud.osconfig_v1.types.ExecutePatchJobRequest, dict]):
190192
The request object. A request message to initiate
191193
patching across Compute Engine instances.
192194
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -234,10 +236,10 @@ async def execute_patch_job(
234236

235237
async def get_patch_job(
236238
self,
237-
request: patch_jobs.GetPatchJobRequest = None,
239+
request: Union[patch_jobs.GetPatchJobRequest, dict] = None,
238240
*,
239241
name: str = None,
240-
retry: retries.Retry = gapic_v1.method.DEFAULT,
242+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
241243
timeout: float = None,
242244
metadata: Sequence[Tuple[str, str]] = (),
243245
) -> patch_jobs.PatchJob:
@@ -246,7 +248,7 @@ async def get_patch_job(
246248
of completed jobs.
247249
248250
Args:
249-
request (:class:`google.cloud.osconfig_v1.types.GetPatchJobRequest`):
251+
request (Union[google.cloud.osconfig_v1.types.GetPatchJobRequest, dict]):
250252
The request object. Request to get an active or
251253
completed patch job.
252254
name (:class:`str`):
@@ -315,17 +317,17 @@ async def get_patch_job(
315317

316318
async def cancel_patch_job(
317319
self,
318-
request: patch_jobs.CancelPatchJobRequest = None,
320+
request: Union[patch_jobs.CancelPatchJobRequest, dict] = None,
319321
*,
320-
retry: retries.Retry = gapic_v1.method.DEFAULT,
322+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
321323
timeout: float = None,
322324
metadata: Sequence[Tuple[str, str]] = (),
323325
) -> patch_jobs.PatchJob:
324326
r"""Cancel a patch job. The patch job must be active.
325327
Canceled patch jobs cannot be restarted.
326328
327329
Args:
328-
request (:class:`google.cloud.osconfig_v1.types.CancelPatchJobRequest`):
330+
request (Union[google.cloud.osconfig_v1.types.CancelPatchJobRequest, dict]):
329331
The request object. Message for canceling a patch job.
330332
retry (google.api_core.retry.Retry): Designation of what errors, if any,
331333
should be retried.
@@ -372,17 +374,17 @@ async def cancel_patch_job(
372374

373375
async def list_patch_jobs(
374376
self,
375-
request: patch_jobs.ListPatchJobsRequest = None,
377+
request: Union[patch_jobs.ListPatchJobsRequest, dict] = None,
376378
*,
377379
parent: str = None,
378-
retry: retries.Retry = gapic_v1.method.DEFAULT,
380+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
379381
timeout: float = None,
380382
metadata: Sequence[Tuple[str, str]] = (),
381383
) -> pagers.ListPatchJobsAsyncPager:
382384
r"""Get a list of patch jobs.
383385
384386
Args:
385-
request (:class:`google.cloud.osconfig_v1.types.ListPatchJobsRequest`):
387+
request (Union[google.cloud.osconfig_v1.types.ListPatchJobsRequest, dict]):
386388
The request object. A request message for listing patch
387389
jobs.
388390
parent (:class:`str`):
@@ -450,17 +452,17 @@ async def list_patch_jobs(
450452

451453
async def list_patch_job_instance_details(
452454
self,
453-
request: patch_jobs.ListPatchJobInstanceDetailsRequest = None,
455+
request: Union[patch_jobs.ListPatchJobInstanceDetailsRequest, dict] = None,
454456
*,
455457
parent: str = None,
456-
retry: retries.Retry = gapic_v1.method.DEFAULT,
458+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
457459
timeout: float = None,
458460
metadata: Sequence[Tuple[str, str]] = (),
459461
) -> pagers.ListPatchJobInstanceDetailsAsyncPager:
460462
r"""Get a list of instance details for a given patch job.
461463
462464
Args:
463-
request (:class:`google.cloud.osconfig_v1.types.ListPatchJobInstanceDetailsRequest`):
465+
request (Union[google.cloud.osconfig_v1.types.ListPatchJobInstanceDetailsRequest, dict]):
464466
The request object. Request to list details for all
465467
instances that are part of a patch job.
466468
parent (:class:`str`):
@@ -530,19 +532,19 @@ async def list_patch_job_instance_details(
530532

531533
async def create_patch_deployment(
532534
self,
533-
request: patch_deployments.CreatePatchDeploymentRequest = None,
535+
request: Union[patch_deployments.CreatePatchDeploymentRequest, dict] = None,
534536
*,
535537
parent: str = None,
536538
patch_deployment: patch_deployments.PatchDeployment = None,
537539
patch_deployment_id: str = None,
538-
retry: retries.Retry = gapic_v1.method.DEFAULT,
540+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
539541
timeout: float = None,
540542
metadata: Sequence[Tuple[str, str]] = (),
541543
) -> patch_deployments.PatchDeployment:
542544
r"""Create an OS Config patch deployment.
543545
544546
Args:
545-
request (:class:`google.cloud.osconfig_v1.types.CreatePatchDeploymentRequest`):
547+
request (Union[google.cloud.osconfig_v1.types.CreatePatchDeploymentRequest, dict]):
546548
The request object. A request message for creating a
547549
patch deployment.
548550
parent (:class:`str`):
@@ -633,17 +635,17 @@ async def create_patch_deployment(
633635

634636
async def get_patch_deployment(
635637
self,
636-
request: patch_deployments.GetPatchDeploymentRequest = None,
638+
request: Union[patch_deployments.GetPatchDeploymentRequest, dict] = None,
637639
*,
638640
name: str = None,
639-
retry: retries.Retry = gapic_v1.method.DEFAULT,
641+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
640642
timeout: float = None,
641643
metadata: Sequence[Tuple[str, str]] = (),
642644
) -> patch_deployments.PatchDeployment:
643645
r"""Get an OS Config patch deployment.
644646
645647
Args:
646-
request (:class:`google.cloud.osconfig_v1.types.GetPatchDeploymentRequest`):
648+
request (Union[google.cloud.osconfig_v1.types.GetPatchDeploymentRequest, dict]):
647649
The request object. A request message for retrieving a
648650
patch deployment.
649651
name (:class:`str`):
@@ -708,17 +710,17 @@ async def get_patch_deployment(
708710

709711
async def list_patch_deployments(
710712
self,
711-
request: patch_deployments.ListPatchDeploymentsRequest = None,
713+
request: Union[patch_deployments.ListPatchDeploymentsRequest, dict] = None,
712714
*,
713715
parent: str = None,
714-
retry: retries.Retry = gapic_v1.method.DEFAULT,
716+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
715717
timeout: float = None,
716718
metadata: Sequence[Tuple[str, str]] = (),
717719
) -> pagers.ListPatchDeploymentsAsyncPager:
718720
r"""Get a page of OS Config patch deployments.
719721
720722
Args:
721-
request (:class:`google.cloud.osconfig_v1.types.ListPatchDeploymentsRequest`):
723+
request (Union[google.cloud.osconfig_v1.types.ListPatchDeploymentsRequest, dict]):
722724
The request object. A request message for listing patch
723725
deployments.
724726
parent (:class:`str`):
@@ -788,17 +790,17 @@ async def list_patch_deployments(
788790

789791
async def delete_patch_deployment(
790792
self,
791-
request: patch_deployments.DeletePatchDeploymentRequest = None,
793+
request: Union[patch_deployments.DeletePatchDeploymentRequest, dict] = None,
792794
*,
793795
name: str = None,
794-
retry: retries.Retry = gapic_v1.method.DEFAULT,
796+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
795797
timeout: float = None,
796798
metadata: Sequence[Tuple[str, str]] = (),
797799
) -> None:
798800
r"""Delete an OS Config patch deployment.
799801
800802
Args:
801-
request (:class:`google.cloud.osconfig_v1.types.DeletePatchDeploymentRequest`):
803+
request (Union[google.cloud.osconfig_v1.types.DeletePatchDeploymentRequest, dict]):
802804
The request object. A request message for deleting a
803805
patch deployment.
804806
name (:class:`str`):

‎google/cloud/osconfig_v1/services/os_config_service/client.py‎

Lines changed: 11 additions & 9 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.osconfig_v1.services.os_config_service import pagers
3436
from google.cloud.osconfig_v1.types import patch_deployments
3537
from google.cloud.osconfig_v1.types import patch_jobs
@@ -387,7 +389,7 @@ def execute_patch_job(
387389
self,
388390
request: Union[patch_jobs.ExecutePatchJobRequest, dict] = None,
389391
*,
390-
retry: retries.Retry = gapic_v1.method.DEFAULT,
392+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
391393
timeout: float = None,
392394
metadata: Sequence[Tuple[str, str]] = (),
393395
) -> patch_jobs.PatchJob:
@@ -447,7 +449,7 @@ def get_patch_job(
447449
request: Union[patch_jobs.GetPatchJobRequest, dict] = None,
448450
*,
449451
name: str = None,
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
) -> patch_jobs.PatchJob:
@@ -527,7 +529,7 @@ def cancel_patch_job(
527529
self,
528530
request: Union[patch_jobs.CancelPatchJobRequest, dict] = None,
529531
*,
530-
retry: retries.Retry = gapic_v1.method.DEFAULT,
532+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
531533
timeout: float = None,
532534
metadata: Sequence[Tuple[str, str]] = (),
533535
) -> patch_jobs.PatchJob:
@@ -586,7 +588,7 @@ def list_patch_jobs(
586588
request: Union[patch_jobs.ListPatchJobsRequest, dict] = None,
587589
*,
588590
parent: str = None,
589-
retry: retries.Retry = gapic_v1.method.DEFAULT,
591+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
590592
timeout: float = None,
591593
metadata: Sequence[Tuple[str, str]] = (),
592594
) -> pagers.ListPatchJobsPager:
@@ -664,7 +666,7 @@ def list_patch_job_instance_details(
664666
request: Union[patch_jobs.ListPatchJobInstanceDetailsRequest, dict] = None,
665667
*,
666668
parent: str = None,
667-
retry: retries.Retry = gapic_v1.method.DEFAULT,
669+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
668670
timeout: float = None,
669671
metadata: Sequence[Tuple[str, str]] = (),
670672
) -> pagers.ListPatchJobInstanceDetailsPager:
@@ -748,7 +750,7 @@ def create_patch_deployment(
748750
parent: str = None,
749751
patch_deployment: patch_deployments.PatchDeployment = None,
750752
patch_deployment_id: str = None,
751-
retry: retries.Retry = gapic_v1.method.DEFAULT,
753+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
752754
timeout: float = None,
753755
metadata: Sequence[Tuple[str, str]] = (),
754756
) -> patch_deployments.PatchDeployment:
@@ -849,7 +851,7 @@ def get_patch_deployment(
849851
request: Union[patch_deployments.GetPatchDeploymentRequest, dict] = None,
850852
*,
851853
name: str = None,
852-
retry: retries.Retry = gapic_v1.method.DEFAULT,
854+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
853855
timeout: float = None,
854856
metadata: Sequence[Tuple[str, str]] = (),
855857
) -> patch_deployments.PatchDeployment:
@@ -924,7 +926,7 @@ def list_patch_deployments(
924926
request: Union[patch_deployments.ListPatchDeploymentsRequest, dict] = None,
925927
*,
926928
parent: str = None,
927-
retry: retries.Retry = gapic_v1.method.DEFAULT,
929+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
928930
timeout: float = None,
929931
metadata: Sequence[Tuple[str, str]] = (),
930932
) -> pagers.ListPatchDeploymentsPager:
@@ -1004,7 +1006,7 @@ def delete_patch_deployment(
10041006
request: Union[patch_deployments.DeletePatchDeploymentRequest, dict] = None,
10051007
*,
10061008
name: str = None,
1007-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1009+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10081010
timeout: float = None,
10091011
metadata: Sequence[Tuple[str, str]] = (),
10101012
) -> None:

‎google/cloud/osconfig_v1/services/os_config_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 OsConfigServiceTransport(abc.ABC):
5141
"""Abstract transport class for OsConfigService."""
@@ -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/osconfig_v1/services/os_config_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)