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

chore: use gapic-generator-python 0.53.4 #44

Merged
merged 4 commits into from
Nov 1, 2021
Merged

chore: use gapic-generator-python 0.53.4 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76c8041
chore: use gapic-generator-python 0.53.4
gcf-owl-bot[bot] Oct 30, 2021
d17a45e
🦉 Updates from OwlBot
gcf-owl-bot[bot] Oct 30, 2021
2fdeb4d
fix(deps): require google-api-core 1.28.0
parthea Oct 30, 2021
2086e01
fix(deps): drop packaging dependency
parthea Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions google/cloud/debugger_v2/services/controller2/async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
from typing import Dict, Sequence, Tuple, Type, Union
import pkg_resources

import google.api_core.client_options as ClientOptions # type: ignore
from google.api_core.client_options import ClientOptions # type: ignore
from google.api_core import exceptions as core_exceptions # type: ignore
from google.api_core import gapic_v1 # type: ignore
from google.api_core import retry as retries # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.debugger_v2.types import controller
from google.cloud.debugger_v2.types import data
from .transports.base import Controller2Transport, DEFAULT_CLIENT_INFO
Expand Down Expand Up @@ -179,10 +181,10 @@ def __init__(

async def register_debuggee(
self,
request: controller.RegisterDebuggeeRequest = None,
request: Union[controller.RegisterDebuggeeRequest, dict] = None,
*,
debuggee: data.Debuggee = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> controller.RegisterDebuggeeResponse:
Expand All @@ -200,7 +202,7 @@ async def register_debuggee(
re-registration.

Args:
request (:class:`google.cloud.debugger_v2.types.RegisterDebuggeeRequest`):
request (Union[google.cloud.debugger_v2.types.RegisterDebuggeeRequest, dict]):
The request object. Request to register a debuggee.
debuggee (:class:`google.cloud.debugger_v2.types.Debuggee`):
Required. Debuggee information to register. The fields
Expand Down Expand Up @@ -253,10 +255,10 @@ async def register_debuggee(

async def list_active_breakpoints(
self,
request: controller.ListActiveBreakpointsRequest = None,
request: Union[controller.ListActiveBreakpointsRequest, dict] = None,
*,
debuggee_id: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> controller.ListActiveBreakpointsResponse:
Expand All @@ -276,7 +278,7 @@ async def list_active_breakpoints(
from the active list to avoid setting those breakpoints again.

Args:
request (:class:`google.cloud.debugger_v2.types.ListActiveBreakpointsRequest`):
request (Union[google.cloud.debugger_v2.types.ListActiveBreakpointsRequest, dict]):
The request object. Request to list active breakpoints.
debuggee_id (:class:`str`):
Required. Identifies the debuggee.
Expand Down Expand Up @@ -338,11 +340,11 @@ async def list_active_breakpoints(

async def update_active_breakpoint(
self,
request: controller.UpdateActiveBreakpointRequest = None,
request: Union[controller.UpdateActiveBreakpointRequest, dict] = None,
*,
debuggee_id: str = None,
breakpoint_: data.Breakpoint = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> controller.UpdateActiveBreakpointResponse:
Expand All @@ -357,7 +359,7 @@ async def update_active_breakpoint(
to the correct line of code.

Args:
request (:class:`google.cloud.debugger_v2.types.UpdateActiveBreakpointRequest`):
request (Union[google.cloud.debugger_v2.types.UpdateActiveBreakpointRequest, dict]):
The request object. Request to update an active
breakpoint.
debuggee_id (:class:`str`):
Expand Down
8 changes: 5 additions & 3 deletions google/cloud/debugger_v2/services/controller2/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.debugger_v2.types import controller
from google.cloud.debugger_v2.types import data
from .transports.base import Controller2Transport, DEFAULT_CLIENT_INFO
Expand Down Expand Up @@ -356,7 +358,7 @@ def register_debuggee(
request: Union[controller.RegisterDebuggeeRequest, dict] = None,
*,
debuggee: data.Debuggee = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> controller.RegisterDebuggeeResponse:
Expand Down Expand Up @@ -430,7 +432,7 @@ def list_active_breakpoints(
request: Union[controller.ListActiveBreakpointsRequest, dict] = None,
*,
debuggee_id: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> controller.ListActiveBreakpointsResponse:
Expand Down Expand Up @@ -506,7 +508,7 @@ def update_active_breakpoint(
*,
debuggee_id: str = None,
breakpoint_: data.Breakpoint = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> controller.UpdateActiveBreakpointResponse:
Expand Down
35 changes: 1 addition & 34 deletions google/cloud/debugger_v2/services/controller2/transports/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#
import abc
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
import packaging.version
import pkg_resources

import google.auth # type: ignore
Expand All @@ -37,15 +36,6 @@
except pkg_resources.DistributionNotFound:
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()

try:
# google.auth.__version__ was added in 1.26.0
_GOOGLE_AUTH_VERSION = google.auth.__version__
except AttributeError:
try: # try pkg_resources if it is available
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
except pkg_resources.DistributionNotFound: # pragma: NO COVER
_GOOGLE_AUTH_VERSION = None


class Controller2Transport(abc.ABC):
"""Abstract transport class for Controller2."""
Expand Down Expand Up @@ -98,7 +88,7 @@ def __init__(
host += ":443"
self._host = host

scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}

# Save the scopes.
self._scopes = scopes
Expand Down Expand Up @@ -131,29 +121,6 @@ def __init__(
# Save the credentials.
self._credentials = credentials

# TODO(busunkim): This method is in the base transport
# to avoid duplicating code across the transport classes. These functions
# should be deleted once the minimum required versions of google-auth is increased.

# TODO: Remove this function once google-auth >= 1.25.0 is required
@classmethod
def _get_scopes_kwargs(
cls, host: str, scopes: Optional[Sequence[str]]
) -> Dict[str, Optional[Sequence[str]]]:
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""

scopes_kwargs = {}

if _GOOGLE_AUTH_VERSION and (
packaging.version.parse(_GOOGLE_AUTH_VERSION)
>= packaging.version.parse("1.25.0")
):
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
else:
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}

return scopes_kwargs

def _prep_wrapped_messages(self, client_info):
# Precompute the wrapped methods.
self._wrapped_methods = {
Expand Down
1 change: 0 additions & 1 deletion google/cloud/debugger_v2/services/controller2/transports/grpc_asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from google.api_core import grpc_helpers_async # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
import packaging.version

import grpc # type: ignore
from grpc.experimental import aio # type: ignore
Expand Down
34 changes: 18 additions & 16 deletions google/cloud/debugger_v2/services/debugger2/async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
from typing import Dict, Sequence, Tuple, Type, Union
import pkg_resources

import google.api_core.client_options as ClientOptions # type: ignore
from google.api_core.client_options import ClientOptions # type: ignore
from google.api_core import exceptions as core_exceptions # type: ignore
from google.api_core import gapic_v1 # type: ignore
from google.api_core import retry as retries # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.debugger_v2.types import data
from google.cloud.debugger_v2.types import debugger
from .transports.base import Debugger2Transport, DEFAULT_CLIENT_INFO
Expand Down Expand Up @@ -168,19 +170,19 @@ def __init__(

async def set_breakpoint(
self,
request: debugger.SetBreakpointRequest = None,
request: Union[debugger.SetBreakpointRequest, dict] = None,
*,
debuggee_id: str = None,
breakpoint_: data.Breakpoint = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.SetBreakpointResponse:
r"""Sets the breakpoint to the debuggee.

Args:
request (:class:`google.cloud.debugger_v2.types.SetBreakpointRequest`):
request (Union[google.cloud.debugger_v2.types.SetBreakpointRequest, dict]):
The request object. Request to set a breakpoint
debuggee_id (:class:`str`):
Required. ID of the debuggee where
Expand Down Expand Up @@ -251,19 +253,19 @@ async def set_breakpoint(

async def get_breakpoint(
self,
request: debugger.GetBreakpointRequest = None,
request: Union[debugger.GetBreakpointRequest, dict] = None,
*,
debuggee_id: str = None,
breakpoint_id: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.GetBreakpointResponse:
r"""Gets breakpoint information.

Args:
request (:class:`google.cloud.debugger_v2.types.GetBreakpointRequest`):
request (Union[google.cloud.debugger_v2.types.GetBreakpointRequest, dict]):
The request object. Request to get breakpoint
information.
debuggee_id (:class:`str`):
Expand Down Expand Up @@ -347,19 +349,19 @@ async def get_breakpoint(

async def delete_breakpoint(
self,
request: debugger.DeleteBreakpointRequest = None,
request: Union[debugger.DeleteBreakpointRequest, dict] = None,
*,
debuggee_id: str = None,
breakpoint_id: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> None:
r"""Deletes the breakpoint from the debuggee.

Args:
request (:class:`google.cloud.debugger_v2.types.DeleteBreakpointRequest`):
request (Union[google.cloud.debugger_v2.types.DeleteBreakpointRequest, dict]):
The request object. Request to delete a breakpoint.
debuggee_id (:class:`str`):
Required. ID of the debuggee whose
Expand Down Expand Up @@ -435,18 +437,18 @@ async def delete_breakpoint(

async def list_breakpoints(
self,
request: debugger.ListBreakpointsRequest = None,
request: Union[debugger.ListBreakpointsRequest, dict] = None,
*,
debuggee_id: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.ListBreakpointsResponse:
r"""Lists all breakpoints for the debuggee.

Args:
request (:class:`google.cloud.debugger_v2.types.ListBreakpointsRequest`):
request (Union[google.cloud.debugger_v2.types.ListBreakpointsRequest, dict]):
The request object. Request to list breakpoints.
debuggee_id (:class:`str`):
Required. ID of the debuggee whose
Expand Down Expand Up @@ -518,18 +520,18 @@ async def list_breakpoints(

async def list_debuggees(
self,
request: debugger.ListDebuggeesRequest = None,
request: Union[debugger.ListDebuggeesRequest, dict] = None,
*,
project: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.ListDebuggeesResponse:
r"""Lists all the debuggees that the user has access to.

Args:
request (:class:`google.cloud.debugger_v2.types.ListDebuggeesRequest`):
request (Union[google.cloud.debugger_v2.types.ListDebuggeesRequest, dict]):
The request object. Request to list debuggees.
project (:class:`str`):
Required. Project number of a Google
Expand Down
12 changes: 7 additions & 5 deletions google/cloud/debugger_v2/services/debugger2/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.debugger_v2.types import data
from google.cloud.debugger_v2.types import debugger
from .transports.base import Debugger2Transport, DEFAULT_CLIENT_INFO
Expand Down Expand Up @@ -349,7 +351,7 @@ def set_breakpoint(
debuggee_id: str = None,
breakpoint_: data.Breakpoint = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.SetBreakpointResponse:
Expand Down Expand Up @@ -432,7 +434,7 @@ def get_breakpoint(
debuggee_id: str = None,
breakpoint_id: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.GetBreakpointResponse:
Expand Down Expand Up @@ -518,7 +520,7 @@ def delete_breakpoint(
debuggee_id: str = None,
breakpoint_id: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> None:
Expand Down Expand Up @@ -595,7 +597,7 @@ def list_breakpoints(
*,
debuggee_id: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.ListBreakpointsResponse:
Expand Down Expand Up @@ -668,7 +670,7 @@ def list_debuggees(
*,
project: str = None,
client_version: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> debugger.ListDebuggeesResponse:
Expand Down
Loading