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

Commit b68553f

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#44)
- [ ] 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 80b3abe commit b68553f

File tree

12 files changed

+64
-285
lines changed

12 files changed

+64
-285
lines changed

‎google/cloud/debugger_v2/services/controller2/async_client.py‎

Lines changed: 12 additions & 10 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.debugger_v2.types import controller
3032
from google.cloud.debugger_v2.types import data
3133
from .transports.base import Controller2Transport, DEFAULT_CLIENT_INFO
@@ -179,10 +181,10 @@ def __init__(
179181

180182
async def register_debuggee(
181183
self,
182-
request: controller.RegisterDebuggeeRequest = None,
184+
request: Union[controller.RegisterDebuggeeRequest, dict] = None,
183185
*,
184186
debuggee: data.Debuggee = None,
185-
retry: retries.Retry = gapic_v1.method.DEFAULT,
187+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
186188
timeout: float = None,
187189
metadata: Sequence[Tuple[str, str]] = (),
188190
) -> controller.RegisterDebuggeeResponse:
@@ -200,7 +202,7 @@ async def register_debuggee(
200202
re-registration.
201203
202204
Args:
203-
request (:class:`google.cloud.debugger_v2.types.RegisterDebuggeeRequest`):
205+
request (Union[google.cloud.debugger_v2.types.RegisterDebuggeeRequest, dict]):
204206
The request object. Request to register a debuggee.
205207
debuggee (:class:`google.cloud.debugger_v2.types.Debuggee`):
206208
Required. Debuggee information to register. The fields
@@ -253,10 +255,10 @@ async def register_debuggee(
253255

254256
async def list_active_breakpoints(
255257
self,
256-
request: controller.ListActiveBreakpointsRequest = None,
258+
request: Union[controller.ListActiveBreakpointsRequest, dict] = None,
257259
*,
258260
debuggee_id: str = None,
259-
retry: retries.Retry = gapic_v1.method.DEFAULT,
261+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
260262
timeout: float = None,
261263
metadata: Sequence[Tuple[str, str]] = (),
262264
) -> controller.ListActiveBreakpointsResponse:
@@ -276,7 +278,7 @@ async def list_active_breakpoints(
276278
from the active list to avoid setting those breakpoints again.
277279
278280
Args:
279-
request (:class:`google.cloud.debugger_v2.types.ListActiveBreakpointsRequest`):
281+
request (Union[google.cloud.debugger_v2.types.ListActiveBreakpointsRequest, dict]):
280282
The request object. Request to list active breakpoints.
281283
debuggee_id (:class:`str`):
282284
Required. Identifies the debuggee.
@@ -338,11 +340,11 @@ async def list_active_breakpoints(
338340

339341
async def update_active_breakpoint(
340342
self,
341-
request: controller.UpdateActiveBreakpointRequest = None,
343+
request: Union[controller.UpdateActiveBreakpointRequest, dict] = None,
342344
*,
343345
debuggee_id: str = None,
344346
breakpoint_: data.Breakpoint = None,
345-
retry: retries.Retry = gapic_v1.method.DEFAULT,
347+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
346348
timeout: float = None,
347349
metadata: Sequence[Tuple[str, str]] = (),
348350
) -> controller.UpdateActiveBreakpointResponse:
@@ -357,7 +359,7 @@ async def update_active_breakpoint(
357359
to the correct line of code.
358360
359361
Args:
360-
request (:class:`google.cloud.debugger_v2.types.UpdateActiveBreakpointRequest`):
362+
request (Union[google.cloud.debugger_v2.types.UpdateActiveBreakpointRequest, dict]):
361363
The request object. Request to update an active
362364
breakpoint.
363365
debuggee_id (:class:`str`):

‎google/cloud/debugger_v2/services/controller2/client.py‎

Lines changed: 5 additions & 3 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.debugger_v2.types import controller
3436
from google.cloud.debugger_v2.types import data
3537
from .transports.base import Controller2Transport, DEFAULT_CLIENT_INFO
@@ -356,7 +358,7 @@ def register_debuggee(
356358
request: Union[controller.RegisterDebuggeeRequest, dict] = None,
357359
*,
358360
debuggee: data.Debuggee = None,
359-
retry: retries.Retry = gapic_v1.method.DEFAULT,
361+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
360362
timeout: float = None,
361363
metadata: Sequence[Tuple[str, str]] = (),
362364
) -> controller.RegisterDebuggeeResponse:
@@ -430,7 +432,7 @@ def list_active_breakpoints(
430432
request: Union[controller.ListActiveBreakpointsRequest, dict] = None,
431433
*,
432434
debuggee_id: 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
) -> controller.ListActiveBreakpointsResponse:
@@ -506,7 +508,7 @@ def update_active_breakpoint(
506508
*,
507509
debuggee_id: str = None,
508510
breakpoint_: data.Breakpoint = None,
509-
retry: retries.Retry = gapic_v1.method.DEFAULT,
511+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
510512
timeout: float = None,
511513
metadata: Sequence[Tuple[str, str]] = (),
512514
) -> controller.UpdateActiveBreakpointResponse:

‎google/cloud/debugger_v2/services/controller2/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 Controller2Transport(abc.ABC):
5141
"""Abstract transport class for Controller2."""
@@ -98,7 +88,7 @@ def __init__(
9888
host += ":443"
9989
self._host = host
10090

101-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
91+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10292

10393
# Save the scopes.
10494
self._scopes = scopes
@@ -131,29 +121,6 @@ def __init__(
131121
# Save the credentials.
132122
self._credentials = credentials
133123

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

‎google/cloud/debugger_v2/services/controller2/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

‎google/cloud/debugger_v2/services/debugger2/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.debugger_v2.types import data
3032
from google.cloud.debugger_v2.types import debugger
3133
from .transports.base import Debugger2Transport, DEFAULT_CLIENT_INFO
@@ -168,19 +170,19 @@ def __init__(
168170

169171
async def set_breakpoint(
170172
self,
171-
request: debugger.SetBreakpointRequest = None,
173+
request: Union[debugger.SetBreakpointRequest, dict] = None,
172174
*,
173175
debuggee_id: str = None,
174176
breakpoint_: data.Breakpoint = None,
175177
client_version: str = None,
176-
retry: retries.Retry = gapic_v1.method.DEFAULT,
178+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
177179
timeout: float = None,
178180
metadata: Sequence[Tuple[str, str]] = (),
179181
) -> debugger.SetBreakpointResponse:
180182
r"""Sets the breakpoint to the debuggee.
181183
182184
Args:
183-
request (:class:`google.cloud.debugger_v2.types.SetBreakpointRequest`):
185+
request (Union[google.cloud.debugger_v2.types.SetBreakpointRequest, dict]):
184186
The request object. Request to set a breakpoint
185187
debuggee_id (:class:`str`):
186188
Required. ID of the debuggee where
@@ -251,19 +253,19 @@ async def set_breakpoint(
251253

252254
async def get_breakpoint(
253255
self,
254-
request: debugger.GetBreakpointRequest = None,
256+
request: Union[debugger.GetBreakpointRequest, dict] = None,
255257
*,
256258
debuggee_id: str = None,
257259
breakpoint_id: str = None,
258260
client_version: str = None,
259-
retry: retries.Retry = gapic_v1.method.DEFAULT,
261+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
260262
timeout: float = None,
261263
metadata: Sequence[Tuple[str, str]] = (),
262264
) -> debugger.GetBreakpointResponse:
263265
r"""Gets breakpoint information.
264266
265267
Args:
266-
request (:class:`google.cloud.debugger_v2.types.GetBreakpointRequest`):
268+
request (Union[google.cloud.debugger_v2.types.GetBreakpointRequest, dict]):
267269
The request object. Request to get breakpoint
268270
information.
269271
debuggee_id (:class:`str`):
@@ -347,19 +349,19 @@ async def get_breakpoint(
347349

348350
async def delete_breakpoint(
349351
self,
350-
request: debugger.DeleteBreakpointRequest = None,
352+
request: Union[debugger.DeleteBreakpointRequest, dict] = None,
351353
*,
352354
debuggee_id: str = None,
353355
breakpoint_id: str = None,
354356
client_version: str = None,
355-
retry: retries.Retry = gapic_v1.method.DEFAULT,
357+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
356358
timeout: float = None,
357359
metadata: Sequence[Tuple[str, str]] = (),
358360
) -> None:
359361
r"""Deletes the breakpoint from the debuggee.
360362
361363
Args:
362-
request (:class:`google.cloud.debugger_v2.types.DeleteBreakpointRequest`):
364+
request (Union[google.cloud.debugger_v2.types.DeleteBreakpointRequest, dict]):
363365
The request object. Request to delete a breakpoint.
364366
debuggee_id (:class:`str`):
365367
Required. ID of the debuggee whose
@@ -435,18 +437,18 @@ async def delete_breakpoint(
435437

436438
async def list_breakpoints(
437439
self,
438-
request: debugger.ListBreakpointsRequest = None,
440+
request: Union[debugger.ListBreakpointsRequest, dict] = None,
439441
*,
440442
debuggee_id: str = None,
441443
client_version: str = None,
442-
retry: retries.Retry = gapic_v1.method.DEFAULT,
444+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
443445
timeout: float = None,
444446
metadata: Sequence[Tuple[str, str]] = (),
445447
) -> debugger.ListBreakpointsResponse:
446448
r"""Lists all breakpoints for the debuggee.
447449
448450
Args:
449-
request (:class:`google.cloud.debugger_v2.types.ListBreakpointsRequest`):
451+
request (Union[google.cloud.debugger_v2.types.ListBreakpointsRequest, dict]):
450452
The request object. Request to list breakpoints.
451453
debuggee_id (:class:`str`):
452454
Required. ID of the debuggee whose
@@ -518,18 +520,18 @@ async def list_breakpoints(
518520

519521
async def list_debuggees(
520522
self,
521-
request: debugger.ListDebuggeesRequest = None,
523+
request: Union[debugger.ListDebuggeesRequest, dict] = None,
522524
*,
523525
project: str = None,
524526
client_version: str = None,
525-
retry: retries.Retry = gapic_v1.method.DEFAULT,
527+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
526528
timeout: float = None,
527529
metadata: Sequence[Tuple[str, str]] = (),
528530
) -> debugger.ListDebuggeesResponse:
529531
r"""Lists all the debuggees that the user has access to.
530532
531533
Args:
532-
request (:class:`google.cloud.debugger_v2.types.ListDebuggeesRequest`):
534+
request (Union[google.cloud.debugger_v2.types.ListDebuggeesRequest, dict]):
533535
The request object. Request to list debuggees.
534536
project (:class:`str`):
535537
Required. Project number of a Google

‎google/cloud/debugger_v2/services/debugger2/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.debugger_v2.types import data
3436
from google.cloud.debugger_v2.types import debugger
3537
from .transports.base import Debugger2Transport, DEFAULT_CLIENT_INFO
@@ -349,7 +351,7 @@ def set_breakpoint(
349351
debuggee_id: str = None,
350352
breakpoint_: data.Breakpoint = None,
351353
client_version: str = None,
352-
retry: retries.Retry = gapic_v1.method.DEFAULT,
354+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
353355
timeout: float = None,
354356
metadata: Sequence[Tuple[str, str]] = (),
355357
) -> debugger.SetBreakpointResponse:
@@ -432,7 +434,7 @@ def get_breakpoint(
432434
debuggee_id: str = None,
433435
breakpoint_id: str = None,
434436
client_version: str = None,
435-
retry: retries.Retry = gapic_v1.method.DEFAULT,
437+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
436438
timeout: float = None,
437439
metadata: Sequence[Tuple[str, str]] = (),
438440
) -> debugger.GetBreakpointResponse:
@@ -518,7 +520,7 @@ def delete_breakpoint(
518520
debuggee_id: str = None,
519521
breakpoint_id: str = None,
520522
client_version: str = None,
521-
retry: retries.Retry = gapic_v1.method.DEFAULT,
523+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
522524
timeout: float = None,
523525
metadata: Sequence[Tuple[str, str]] = (),
524526
) -> None:
@@ -595,7 +597,7 @@ def list_breakpoints(
595597
*,
596598
debuggee_id: str = None,
597599
client_version: str = None,
598-
retry: retries.Retry = gapic_v1.method.DEFAULT,
600+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
599601
timeout: float = None,
600602
metadata: Sequence[Tuple[str, str]] = (),
601603
) -> debugger.ListBreakpointsResponse:
@@ -668,7 +670,7 @@ def list_debuggees(
668670
*,
669671
project: str = None,
670672
client_version: str = None,
671-
retry: retries.Retry = gapic_v1.method.DEFAULT,
673+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
672674
timeout: float = None,
673675
metadata: Sequence[Tuple[str, str]] = (),
674676
) -> debugger.ListDebuggeesResponse:

0 commit comments

Comments
 (0)