Skip to content
This repository has been archived by the owner on Sep 14, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
chore: use gapic-generator-python 0.53.4 (#103)
- [ ] 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
  • Loading branch information
gcf-owl-bot[bot] committed Nov 1, 2021
1 parent c346fbb commit 2bc0174
Show file tree
Hide file tree
Showing 16 changed files with 97 additions and 299 deletions.
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.api_core import operation # type: ignore
from google.api_core import operation_async # type: ignore
from google.cloud.assuredworkloads_v1.services.assured_workloads_service import pagers
Expand Down Expand Up @@ -174,18 +176,18 @@ def __init__(

async def create_workload(
self,
request: assuredworkloads.CreateWorkloadRequest = None,
request: Union[assuredworkloads.CreateWorkloadRequest, dict] = None,
*,
parent: str = None,
workload: assuredworkloads.Workload = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> operation_async.AsyncOperation:
r"""Creates Assured Workload.
Args:
request (:class:`google.cloud.assuredworkloads_v1.types.CreateWorkloadRequest`):
request (Union[google.cloud.assuredworkloads_v1.types.CreateWorkloadRequest, dict]):
The request object. Request for creating a workload.
parent (:class:`str`):
Required. The resource name of the new Workload's
Expand Down Expand Up @@ -263,11 +265,11 @@ async def create_workload(

async def update_workload(
self,
request: assuredworkloads.UpdateWorkloadRequest = None,
request: Union[assuredworkloads.UpdateWorkloadRequest, dict] = None,
*,
workload: assuredworkloads.Workload = None,
update_mask: field_mask_pb2.FieldMask = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> assuredworkloads.Workload:
Expand All @@ -277,7 +279,7 @@ async def update_workload(
workload can be in progress.
Args:
request (:class:`google.cloud.assuredworkloads_v1.types.UpdateWorkloadRequest`):
request (Union[google.cloud.assuredworkloads_v1.types.UpdateWorkloadRequest, dict]):
The request object. Request for Updating a workload.
workload (:class:`google.cloud.assuredworkloads_v1.types.Workload`):
Required. The workload to update. The workload’s
Expand Down Expand Up @@ -351,10 +353,10 @@ async def update_workload(

async def delete_workload(
self,
request: assuredworkloads.DeleteWorkloadRequest = None,
request: Union[assuredworkloads.DeleteWorkloadRequest, dict] = None,
*,
name: 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 All @@ -363,7 +365,7 @@ async def delete_workload(
with a FAILED_PRECONDITION error.
Args:
request (:class:`google.cloud.assuredworkloads_v1.types.DeleteWorkloadRequest`):
request (Union[google.cloud.assuredworkloads_v1.types.DeleteWorkloadRequest, dict]):
The request object. Request for deleting a Workload.
name (:class:`str`):
Required. The ``name`` field is used to identify the
Expand Down Expand Up @@ -417,17 +419,17 @@ async def delete_workload(

async def get_workload(
self,
request: assuredworkloads.GetWorkloadRequest = None,
request: Union[assuredworkloads.GetWorkloadRequest, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> assuredworkloads.Workload:
r"""Gets Assured Workload associated with a CRM Node
Args:
request (:class:`google.cloud.assuredworkloads_v1.types.GetWorkloadRequest`):
request (Union[google.cloud.assuredworkloads_v1.types.GetWorkloadRequest, dict]):
The request object. Request for fetching a workload.
name (:class:`str`):
Required. The resource name of the Workload to fetch.
Expand Down Expand Up @@ -492,17 +494,17 @@ async def get_workload(

async def list_workloads(
self,
request: assuredworkloads.ListWorkloadsRequest = None,
request: Union[assuredworkloads.ListWorkloadsRequest, dict] = None,
*,
parent: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> pagers.ListWorkloadsAsyncPager:
r"""Lists Assured Workloads under a CRM Node.
Args:
request (:class:`google.cloud.assuredworkloads_v1.types.ListWorkloadsRequest`):
request (Union[google.cloud.assuredworkloads_v1.types.ListWorkloadsRequest, dict]):
The request object. Request for fetching workloads in an
organization.
parent (:class:`str`):
Expand Down
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.api_core import operation # type: ignore
from google.api_core import operation_async # type: ignore
from google.cloud.assuredworkloads_v1.services.assured_workloads_service import pagers
Expand Down Expand Up @@ -359,7 +361,7 @@ def create_workload(
*,
parent: str = None,
workload: assuredworkloads.Workload = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> operation.Operation:
Expand Down Expand Up @@ -448,7 +450,7 @@ def update_workload(
*,
workload: assuredworkloads.Workload = None,
update_mask: field_mask_pb2.FieldMask = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> assuredworkloads.Workload:
Expand Down Expand Up @@ -535,7 +537,7 @@ def delete_workload(
request: Union[assuredworkloads.DeleteWorkloadRequest, dict] = None,
*,
name: 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 @@ -601,7 +603,7 @@ def get_workload(
request: Union[assuredworkloads.GetWorkloadRequest, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> assuredworkloads.Workload:
Expand Down Expand Up @@ -676,7 +678,7 @@ def list_workloads(
request: Union[assuredworkloads.ListWorkloadsRequest, dict] = None,
*,
parent: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> pagers.ListWorkloadsPager:
Expand Down
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 @@ -40,15 +39,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 AssuredWorkloadsServiceTransport(abc.ABC):
"""Abstract transport class for AssuredWorkloadsService."""
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 Expand Up @@ -184,7 +151,7 @@ def close(self):
raise NotImplementedError()

@property
def operations_client(self) -> operations_v1.OperationsClient:
def operations_client(self):
"""Return the client designed to process long-running operations."""
raise NotImplementedError()

Expand Down
Expand Up @@ -113,7 +113,7 @@ def __init__(
self._grpc_channel = None
self._ssl_channel_credentials = ssl_channel_credentials
self._stubs: Dict[str, Callable] = {}
self._operations_client = None
self._operations_client: Optional[operations_v1.OperationsClient] = None

if api_mtls_endpoint:
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)
Expand Down
Expand Up @@ -21,7 +21,6 @@
from google.api_core import operations_v1 # 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 Expand Up @@ -160,7 +159,7 @@ def __init__(
self._grpc_channel = None
self._ssl_channel_credentials = ssl_channel_credentials
self._stubs: Dict[str, Callable] = {}
self._operations_client = None
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None

if api_mtls_endpoint:
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)
Expand Down

0 comments on commit 2bc0174

Please sign in to comment.