diff --git a/.coveragerc b/.coveragerc index 0f3a6c8..9a54970 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,6 +5,7 @@ branch = True show_missing = True omit = google/cloud/service_usage/__init__.py + google/cloud/service_usage/gapic_version.py exclude_lines = # Re-enable the standard pragma pragma: NO COVER diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 889f77d..5fc5daa 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:c43f1d918bcf817d337aa29ff833439494a158a0831508fda4ec75dc4c0d0320 + digest: sha256:8555f0e37e6261408f792bfd6635102d2da5ad73f8f09bcb24f25e6afb5fac97 diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index cbd7e77..882178c 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -1,5 +1,5 @@ gcp-docuploader -gcp-releasetool +gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x importlib-metadata typing-extensions twine diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 05dc467..fa99c12 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -113,33 +113,28 @@ commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 # via rich -cryptography==38.0.3 \ - --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \ - --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \ - --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \ - --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \ - --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \ - --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \ - --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \ - --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \ - --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \ - --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \ - --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \ - --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \ - --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \ - --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \ - --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \ - --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \ - --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \ - --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \ - --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \ - --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \ - --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \ - --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \ - --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \ - --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \ - --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ - --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 +cryptography==39.0.1 \ + --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \ + --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \ + --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \ + --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \ + --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \ + --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \ + --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \ + --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \ + --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \ + --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \ + --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \ + --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \ + --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \ + --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \ + --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \ + --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \ + --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \ + --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \ + --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \ + --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \ + --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8 # via # gcp-releasetool # secretstorage @@ -159,9 +154,9 @@ gcp-docuploader==0.6.4 \ --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in -gcp-releasetool==1.10.0 \ - --hash=sha256:72a38ca91b59c24f7e699e9227c90cbe4dd71b789383cb0164b088abae294c83 \ - --hash=sha256:8c7c99320208383d4bb2b808c6880eb7a81424afe7cdba3c8d84b25f4f0e097d +gcp-releasetool==1.10.5 \ + --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \ + --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9 # via -r requirements.in google-api-core==2.10.2 \ --hash=sha256:10c06f7739fe57781f87523375e8e1a3a4674bf6392cd6131a3222182b971320 \ diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 093be7e..64e0684 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "1.6.1" + ".": "1.7.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index e9cb268..24a7c02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.7.0](https://github.com/googleapis/python-service-usage/compare/v1.6.1...v1.7.0) (2023-02-28) + + +### Features + +* Enable "rest" transport in Python for services supporting numeric enums ([#166](https://github.com/googleapis/python-service-usage/issues/166)) ([3dcb482](https://github.com/googleapis/python-service-usage/commit/3dcb482eef0796cfb3ab874e6c7637fa631da01a)) + ## [1.6.1](https://github.com/googleapis/python-service-usage/compare/v1.6.0...v1.6.1) (2023-01-23) diff --git a/google/cloud/service_usage/gapic_version.py b/google/cloud/service_usage/gapic_version.py index b4028ab..f033c61 100644 --- a/google/cloud/service_usage/gapic_version.py +++ b/google/cloud/service_usage/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.6.1" # {x-release-please-version} +__version__ = "1.7.0" # {x-release-please-version} diff --git a/google/cloud/service_usage_v1/__init__.py b/google/cloud/service_usage_v1/__init__.py index 16a14a8..0ff6b55 100644 --- a/google/cloud/service_usage_v1/__init__.py +++ b/google/cloud/service_usage_v1/__init__.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from google.cloud.service_usage import gapic_version as package_version +from google.cloud.service_usage_v1 import gapic_version as package_version __version__ = package_version.__version__ diff --git a/google/cloud/service_usage_v1/gapic_metadata.json b/google/cloud/service_usage_v1/gapic_metadata.json index 0703278..587906d 100644 --- a/google/cloud/service_usage_v1/gapic_metadata.json +++ b/google/cloud/service_usage_v1/gapic_metadata.json @@ -76,6 +76,41 @@ ] } } + }, + "rest": { + "libraryClient": "ServiceUsageClient", + "rpcs": { + "BatchEnableServices": { + "methods": [ + "batch_enable_services" + ] + }, + "BatchGetServices": { + "methods": [ + "batch_get_services" + ] + }, + "DisableService": { + "methods": [ + "disable_service" + ] + }, + "EnableService": { + "methods": [ + "enable_service" + ] + }, + "GetService": { + "methods": [ + "get_service" + ] + }, + "ListServices": { + "methods": [ + "list_services" + ] + } + } } } } diff --git a/google/cloud/service_usage_v1/gapic_version.py b/google/cloud/service_usage_v1/gapic_version.py index b4028ab..f033c61 100644 --- a/google/cloud/service_usage_v1/gapic_version.py +++ b/google/cloud/service_usage_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.6.1" # {x-release-please-version} +__version__ = "1.7.0" # {x-release-please-version} diff --git a/google/cloud/service_usage_v1/services/service_usage/client.py b/google/cloud/service_usage_v1/services/service_usage/client.py index dcf55b8..2549c36 100644 --- a/google/cloud/service_usage_v1/services/service_usage/client.py +++ b/google/cloud/service_usage_v1/services/service_usage/client.py @@ -55,6 +55,7 @@ from .transports.base import DEFAULT_CLIENT_INFO, ServiceUsageTransport from .transports.grpc import ServiceUsageGrpcTransport from .transports.grpc_asyncio import ServiceUsageGrpcAsyncIOTransport +from .transports.rest import ServiceUsageRestTransport class ServiceUsageClientMeta(type): @@ -68,6 +69,7 @@ class ServiceUsageClientMeta(type): _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceUsageTransport]] _transport_registry["grpc"] = ServiceUsageGrpcTransport _transport_registry["grpc_asyncio"] = ServiceUsageGrpcAsyncIOTransport + _transport_registry["rest"] = ServiceUsageRestTransport def get_transport_class( cls, diff --git a/google/cloud/service_usage_v1/services/service_usage/transports/__init__.py b/google/cloud/service_usage_v1/services/service_usage/transports/__init__.py index b2fd25f..1368559 100644 --- a/google/cloud/service_usage_v1/services/service_usage/transports/__init__.py +++ b/google/cloud/service_usage_v1/services/service_usage/transports/__init__.py @@ -19,14 +19,18 @@ from .base import ServiceUsageTransport from .grpc import ServiceUsageGrpcTransport from .grpc_asyncio import ServiceUsageGrpcAsyncIOTransport +from .rest import ServiceUsageRestInterceptor, ServiceUsageRestTransport # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceUsageTransport]] _transport_registry["grpc"] = ServiceUsageGrpcTransport _transport_registry["grpc_asyncio"] = ServiceUsageGrpcAsyncIOTransport +_transport_registry["rest"] = ServiceUsageRestTransport __all__ = ( "ServiceUsageTransport", "ServiceUsageGrpcTransport", "ServiceUsageGrpcAsyncIOTransport", + "ServiceUsageRestTransport", + "ServiceUsageRestInterceptor", ) diff --git a/google/cloud/service_usage_v1/services/service_usage/transports/rest.py b/google/cloud/service_usage_v1/services/service_usage/transports/rest.py new file mode 100644 index 0000000..a532566 --- /dev/null +++ b/google/cloud/service_usage_v1/services/service_usage/transports/rest.py @@ -0,0 +1,953 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import dataclasses +import json # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import ( + gapic_v1, + operations_v1, + path_template, + rest_helpers, + rest_streaming, +) +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.protobuf import json_format +import grpc # type: ignore +from requests import __version__ as requests_version + +try: + OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] +except AttributeError: # pragma: NO COVER + OptionalRetry = Union[retries.Retry, object] # type: ignore + + +from google.longrunning import operations_pb2 # type: ignore + +from google.cloud.service_usage_v1.types import resources, serviceusage + +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO +from .base import ServiceUsageTransport + +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, + grpc_version=None, + rest_version=requests_version, +) + + +class ServiceUsageRestInterceptor: + """Interceptor for ServiceUsage. + + Interceptors are used to manipulate requests, request metadata, and responses + in arbitrary ways. + Example use cases include: + * Logging + * Verifying requests according to service or custom semantics + * Stripping extraneous information from responses + + These use cases and more can be enabled by injecting an + instance of a custom subclass when constructing the ServiceUsageRestTransport. + + .. code-block:: python + class MyCustomServiceUsageInterceptor(ServiceUsageRestInterceptor): + def pre_batch_enable_services(self, request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_batch_enable_services(self, response): + logging.log(f"Received response: {response}") + return response + + def pre_batch_get_services(self, request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_batch_get_services(self, response): + logging.log(f"Received response: {response}") + return response + + def pre_disable_service(self, request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_disable_service(self, response): + logging.log(f"Received response: {response}") + return response + + def pre_enable_service(self, request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_enable_service(self, response): + logging.log(f"Received response: {response}") + return response + + def pre_get_service(self, request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_get_service(self, response): + logging.log(f"Received response: {response}") + return response + + def pre_list_services(self, request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_list_services(self, response): + logging.log(f"Received response: {response}") + return response + + transport = ServiceUsageRestTransport(interceptor=MyCustomServiceUsageInterceptor()) + client = ServiceUsageClient(transport=transport) + + + """ + + def pre_batch_enable_services( + self, + request: serviceusage.BatchEnableServicesRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[serviceusage.BatchEnableServicesRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for batch_enable_services + + Override in a subclass to manipulate the request or metadata + before they are sent to the ServiceUsage server. + """ + return request, metadata + + def post_batch_enable_services( + self, response: operations_pb2.Operation + ) -> operations_pb2.Operation: + """Post-rpc interceptor for batch_enable_services + + Override in a subclass to manipulate the response + after it is returned by the ServiceUsage server but before + it is returned to user code. + """ + return response + + def pre_batch_get_services( + self, + request: serviceusage.BatchGetServicesRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[serviceusage.BatchGetServicesRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for batch_get_services + + Override in a subclass to manipulate the request or metadata + before they are sent to the ServiceUsage server. + """ + return request, metadata + + def post_batch_get_services( + self, response: serviceusage.BatchGetServicesResponse + ) -> serviceusage.BatchGetServicesResponse: + """Post-rpc interceptor for batch_get_services + + Override in a subclass to manipulate the response + after it is returned by the ServiceUsage server but before + it is returned to user code. + """ + return response + + def pre_disable_service( + self, + request: serviceusage.DisableServiceRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[serviceusage.DisableServiceRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for disable_service + + Override in a subclass to manipulate the request or metadata + before they are sent to the ServiceUsage server. + """ + return request, metadata + + def post_disable_service( + self, response: operations_pb2.Operation + ) -> operations_pb2.Operation: + """Post-rpc interceptor for disable_service + + Override in a subclass to manipulate the response + after it is returned by the ServiceUsage server but before + it is returned to user code. + """ + return response + + def pre_enable_service( + self, + request: serviceusage.EnableServiceRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[serviceusage.EnableServiceRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for enable_service + + Override in a subclass to manipulate the request or metadata + before they are sent to the ServiceUsage server. + """ + return request, metadata + + def post_enable_service( + self, response: operations_pb2.Operation + ) -> operations_pb2.Operation: + """Post-rpc interceptor for enable_service + + Override in a subclass to manipulate the response + after it is returned by the ServiceUsage server but before + it is returned to user code. + """ + return response + + def pre_get_service( + self, + request: serviceusage.GetServiceRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[serviceusage.GetServiceRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for get_service + + Override in a subclass to manipulate the request or metadata + before they are sent to the ServiceUsage server. + """ + return request, metadata + + def post_get_service(self, response: resources.Service) -> resources.Service: + """Post-rpc interceptor for get_service + + Override in a subclass to manipulate the response + after it is returned by the ServiceUsage server but before + it is returned to user code. + """ + return response + + def pre_list_services( + self, + request: serviceusage.ListServicesRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[serviceusage.ListServicesRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for list_services + + Override in a subclass to manipulate the request or metadata + before they are sent to the ServiceUsage server. + """ + return request, metadata + + def post_list_services( + self, response: serviceusage.ListServicesResponse + ) -> serviceusage.ListServicesResponse: + """Post-rpc interceptor for list_services + + Override in a subclass to manipulate the response + after it is returned by the ServiceUsage server but before + it is returned to user code. + """ + return response + + +@dataclasses.dataclass +class ServiceUsageRestStub: + _session: AuthorizedSession + _host: str + _interceptor: ServiceUsageRestInterceptor + + +class ServiceUsageRestTransport(ServiceUsageTransport): + """REST backend transport for ServiceUsage. + + Enables services that service consumers want to use on Google Cloud + Platform, lists the available or enabled services, or disables + services that service consumers no longer use. + + See `Service Usage + API `__ + + This class defines the same methods as the primary client, so the + primary client can load the underlying transport implementation + and call it. + + It sends JSON representations of protocol buffers over HTTP/1.1 + + """ + + def __init__( + self, + *, + host: str = "serviceusage.googleapis.com", + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, + client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, + always_use_jwt_access: Optional[bool] = False, + url_scheme: str = "https", + interceptor: Optional[ServiceUsageRestInterceptor] = None, + api_audience: Optional[str] = None, + ) -> None: + """Instantiate the transport. + + Args: + host (Optional[str]): + The hostname to connect to. + credentials (Optional[google.auth.credentials.Credentials]): The + authorization credentials to attach to requests. These + credentials identify the application to the service; if none + are specified, the client will attempt to ascertain the + credentials from the environment. + + credentials_file (Optional[str]): A file with credentials that can + be loaded with :func:`google.auth.load_credentials_from_file`. + This argument is ignored if ``channel`` is provided. + scopes (Optional(Sequence[str])): A list of scopes. This argument is + ignored if ``channel`` is provided. + client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client + certificate to configure mutual TLS HTTP channel. It is ignored + if ``channel`` is provided. + quota_project_id (Optional[str]): An optional project to use for billing + and quota. + client_info (google.api_core.gapic_v1.client_info.ClientInfo): + The client info used to send a user-agent string along with + API requests. If ``None``, then default info will be used. + Generally, you only need to set this if you are developing + your own client library. + always_use_jwt_access (Optional[bool]): Whether self signed JWT should + be used for service account credentials. + url_scheme: the protocol scheme for the API endpoint. Normally + "https", but for testing or local servers, + "http" can be specified. + """ + # Run the base constructor + # TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc. + # TODO: When custom host (api_endpoint) is set, `scopes` must *also* be set on the + # credentials object + maybe_url_match = re.match("^(?Phttp(?:s)?://)?(?P.*)$", host) + if maybe_url_match is None: + raise ValueError( + f"Unexpected hostname structure: {host}" + ) # pragma: NO COVER + + url_match_items = maybe_url_match.groupdict() + + host = f"{url_scheme}://{host}" if not url_match_items["scheme"] else host + + super().__init__( + host=host, + credentials=credentials, + client_info=client_info, + always_use_jwt_access=always_use_jwt_access, + api_audience=api_audience, + ) + self._session = AuthorizedSession( + self._credentials, default_host=self.DEFAULT_HOST + ) + self._operations_client: Optional[operations_v1.AbstractOperationsClient] = None + if client_cert_source_for_mtls: + self._session.configure_mtls_channel(client_cert_source_for_mtls) + self._interceptor = interceptor or ServiceUsageRestInterceptor() + self._prep_wrapped_messages(client_info) + + @property + def operations_client(self) -> operations_v1.AbstractOperationsClient: + """Create the client designed to process long-running operations. + + This property caches on the instance; repeated calls return the same + client. + """ + # Only create a new client if we do not already have one. + if self._operations_client is None: + http_options: Dict[str, List[Dict[str, str]]] = { + "google.longrunning.Operations.GetOperation": [ + { + "method": "get", + "uri": "/v1/{name=operations/*}", + }, + ], + "google.longrunning.Operations.ListOperations": [ + { + "method": "get", + "uri": "/v1/operations", + }, + ], + } + + rest_transport = operations_v1.OperationsRestTransport( + host=self._host, + # use the credentials which are saved + credentials=self._credentials, + scopes=self._scopes, + http_options=http_options, + path_prefix="v1", + ) + + self._operations_client = operations_v1.AbstractOperationsClient( + transport=rest_transport + ) + + # Return the client from cache. + return self._operations_client + + class _BatchEnableServices(ServiceUsageRestStub): + def __hash__(self): + return hash("BatchEnableServices") + + def __call__( + self, + request: serviceusage.BatchEnableServicesRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: Optional[float] = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> operations_pb2.Operation: + r"""Call the batch enable services method over HTTP. + + Args: + request (~.serviceusage.BatchEnableServicesRequest): + The request object. Request message for the ``BatchEnableServices`` method. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.operations_pb2.Operation: + This resource represents a + long-running operation that is the + result of a network API call. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "post", + "uri": "/v1/{parent=*/*}/services:batchEnable", + "body": "*", + }, + ] + request, metadata = self._interceptor.pre_batch_enable_services( + request, metadata + ) + pb_request = serviceusage.BatchEnableServicesRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + ) + + query_params["$alt"] = "json;enum-encoding=int" + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = operations_pb2.Operation() + json_format.Parse(response.content, resp, ignore_unknown_fields=True) + resp = self._interceptor.post_batch_enable_services(resp) + return resp + + class _BatchGetServices(ServiceUsageRestStub): + def __hash__(self): + return hash("BatchGetServices") + + def __call__( + self, + request: serviceusage.BatchGetServicesRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: Optional[float] = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> serviceusage.BatchGetServicesResponse: + r"""Call the batch get services method over HTTP. + + Args: + request (~.serviceusage.BatchGetServicesRequest): + The request object. Request message for the ``BatchGetServices`` method. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.serviceusage.BatchGetServicesResponse: + Response message for the ``BatchGetServices`` method. + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "get", + "uri": "/v1/{parent=*/*}/services:batchGet", + }, + ] + request, metadata = self._interceptor.pre_batch_get_services( + request, metadata + ) + pb_request = serviceusage.BatchGetServicesRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + ) + + query_params["$alt"] = "json;enum-encoding=int" + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = serviceusage.BatchGetServicesResponse() + pb_resp = serviceusage.BatchGetServicesResponse.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_batch_get_services(resp) + return resp + + class _DisableService(ServiceUsageRestStub): + def __hash__(self): + return hash("DisableService") + + def __call__( + self, + request: serviceusage.DisableServiceRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: Optional[float] = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> operations_pb2.Operation: + r"""Call the disable service method over HTTP. + + Args: + request (~.serviceusage.DisableServiceRequest): + The request object. Request message for the ``DisableService`` method. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.operations_pb2.Operation: + This resource represents a + long-running operation that is the + result of a network API call. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "post", + "uri": "/v1/{name=*/*/services/*}:disable", + "body": "*", + }, + ] + request, metadata = self._interceptor.pre_disable_service(request, metadata) + pb_request = serviceusage.DisableServiceRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + ) + + query_params["$alt"] = "json;enum-encoding=int" + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = operations_pb2.Operation() + json_format.Parse(response.content, resp, ignore_unknown_fields=True) + resp = self._interceptor.post_disable_service(resp) + return resp + + class _EnableService(ServiceUsageRestStub): + def __hash__(self): + return hash("EnableService") + + def __call__( + self, + request: serviceusage.EnableServiceRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: Optional[float] = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> operations_pb2.Operation: + r"""Call the enable service method over HTTP. + + Args: + request (~.serviceusage.EnableServiceRequest): + The request object. Request message for the ``EnableService`` method. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.operations_pb2.Operation: + This resource represents a + long-running operation that is the + result of a network API call. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "post", + "uri": "/v1/{name=*/*/services/*}:enable", + "body": "*", + }, + ] + request, metadata = self._interceptor.pre_enable_service(request, metadata) + pb_request = serviceusage.EnableServiceRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + ) + + query_params["$alt"] = "json;enum-encoding=int" + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = operations_pb2.Operation() + json_format.Parse(response.content, resp, ignore_unknown_fields=True) + resp = self._interceptor.post_enable_service(resp) + return resp + + class _GetService(ServiceUsageRestStub): + def __hash__(self): + return hash("GetService") + + def __call__( + self, + request: serviceusage.GetServiceRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: Optional[float] = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> resources.Service: + r"""Call the get service method over HTTP. + + Args: + request (~.serviceusage.GetServiceRequest): + The request object. Request message for the ``GetService`` method. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.resources.Service: + A service that is available for use + by the consumer. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "get", + "uri": "/v1/{name=*/*/services/*}", + }, + ] + request, metadata = self._interceptor.pre_get_service(request, metadata) + pb_request = serviceusage.GetServiceRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + ) + + query_params["$alt"] = "json;enum-encoding=int" + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = resources.Service() + pb_resp = resources.Service.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_get_service(resp) + return resp + + class _ListServices(ServiceUsageRestStub): + def __hash__(self): + return hash("ListServices") + + def __call__( + self, + request: serviceusage.ListServicesRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: Optional[float] = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> serviceusage.ListServicesResponse: + r"""Call the list services method over HTTP. + + Args: + request (~.serviceusage.ListServicesRequest): + The request object. Request message for the ``ListServices`` method. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.serviceusage.ListServicesResponse: + Response message for the ``ListServices`` method. + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "get", + "uri": "/v1/{parent=*/*}/services", + }, + ] + request, metadata = self._interceptor.pre_list_services(request, metadata) + pb_request = serviceusage.ListServicesRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=True, + ) + ) + + query_params["$alt"] = "json;enum-encoding=int" + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = serviceusage.ListServicesResponse() + pb_resp = serviceusage.ListServicesResponse.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_list_services(resp) + return resp + + @property + def batch_enable_services( + self, + ) -> Callable[[serviceusage.BatchEnableServicesRequest], operations_pb2.Operation]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._BatchEnableServices(self._session, self._host, self._interceptor) # type: ignore + + @property + def batch_get_services( + self, + ) -> Callable[ + [serviceusage.BatchGetServicesRequest], serviceusage.BatchGetServicesResponse + ]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._BatchGetServices(self._session, self._host, self._interceptor) # type: ignore + + @property + def disable_service( + self, + ) -> Callable[[serviceusage.DisableServiceRequest], operations_pb2.Operation]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._DisableService(self._session, self._host, self._interceptor) # type: ignore + + @property + def enable_service( + self, + ) -> Callable[[serviceusage.EnableServiceRequest], operations_pb2.Operation]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._EnableService(self._session, self._host, self._interceptor) # type: ignore + + @property + def get_service( + self, + ) -> Callable[[serviceusage.GetServiceRequest], resources.Service]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._GetService(self._session, self._host, self._interceptor) # type: ignore + + @property + def list_services( + self, + ) -> Callable[ + [serviceusage.ListServicesRequest], serviceusage.ListServicesResponse + ]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._ListServices(self._session, self._host, self._interceptor) # type: ignore + + @property + def kind(self) -> str: + return "rest" + + def close(self): + self._session.close() + + +__all__ = ("ServiceUsageRestTransport",) diff --git a/google/cloud/service_usage_v1/types/resources.py b/google/cloud/service_usage_v1/types/resources.py index fe594c5..9998e3a 100644 --- a/google/cloud/service_usage_v1/types/resources.py +++ b/google/cloud/service_usage_v1/types/resources.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from __future__ import annotations + from typing import MutableMapping, MutableSequence from google.api import auth_pb2 # type: ignore diff --git a/google/cloud/service_usage_v1/types/serviceusage.py b/google/cloud/service_usage_v1/types/serviceusage.py index f95f447..99d790e 100644 --- a/google/cloud/service_usage_v1/types/serviceusage.py +++ b/google/cloud/service_usage_v1/types/serviceusage.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from __future__ import annotations + from typing import MutableMapping, MutableSequence import proto # type: ignore diff --git a/noxfile.py b/noxfile.py index e716318..95e58c5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -189,9 +189,9 @@ def unit(session): def install_systemtest_dependencies(session, *constraints): # Use pre-release gRPC for system tests. - # Exclude version 1.49.0rc1 which has a known issue. - # See https://github.com/grpc/grpc/pull/30642 - session.install("--pre", "grpcio!=1.49.0rc1") + # Exclude version 1.52.0rc1 which has a known issue. + # See https://github.com/grpc/grpc/issues/32163 + session.install("--pre", "grpcio!=1.52.0rc1") session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints) @@ -346,9 +346,7 @@ def prerelease_deps(session): unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES session.install(*unit_deps_all) system_deps_all = ( - SYSTEM_TEST_STANDARD_DEPENDENCIES - + SYSTEM_TEST_EXTERNAL_DEPENDENCIES - + SYSTEM_TEST_EXTRAS + SYSTEM_TEST_STANDARD_DEPENDENCIES + SYSTEM_TEST_EXTERNAL_DEPENDENCIES ) session.install(*system_deps_all) @@ -378,8 +376,8 @@ def prerelease_deps(session): # dependency of grpc "six", "googleapis-common-protos", - # Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642 - "grpcio!=1.49.0rc1", + # Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163 + "grpcio!=1.52.0rc1", "grpcio-status", "google-api-core", "proto-plus", diff --git a/samples/generated_samples/snippet_metadata_google.api.serviceusage.v1.json b/samples/generated_samples/snippet_metadata_google.api.serviceusage.v1.json index 4c885d0..c842a28 100644 --- a/samples/generated_samples/snippet_metadata_google.api.serviceusage.v1.json +++ b/samples/generated_samples/snippet_metadata_google.api.serviceusage.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-service-usage", - "version": "1.6.1" + "version": "1.7.0" }, "snippets": [ { diff --git a/setup.py b/setup.py index 035153b..5ec0a72 100644 --- a/setup.py +++ b/setup.py @@ -57,9 +57,7 @@ if package.startswith("google") ] -namespaces = ["google"] -if "google.cloud" in packages: - namespaces.append("google.cloud") +namespaces = ["google", "google.cloud"] setuptools.setup( name=name, diff --git a/tests/unit/gapic/service_usage_v1/test_service_usage.py b/tests/unit/gapic/service_usage_v1/test_service_usage.py index 271d0bf..e464526 100644 --- a/tests/unit/gapic/service_usage_v1/test_service_usage.py +++ b/tests/unit/gapic/service_usage_v1/test_service_usage.py @@ -22,6 +22,8 @@ except ImportError: # pragma: NO COVER import mock +from collections.abc import Iterable +import json import math from google.api_core import ( @@ -41,11 +43,14 @@ from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 from google.oauth2 import service_account +from google.protobuf import json_format import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest +from requests import PreparedRequest, Request, Response +from requests.sessions import Session from google.cloud.service_usage_v1.services.service_usage import ( ServiceUsageAsyncClient, @@ -102,6 +107,7 @@ def test__get_default_mtls_endpoint(): [ (ServiceUsageClient, "grpc"), (ServiceUsageAsyncClient, "grpc_asyncio"), + (ServiceUsageClient, "rest"), ], ) def test_service_usage_client_from_service_account_info(client_class, transport_name): @@ -115,7 +121,11 @@ def test_service_usage_client_from_service_account_info(client_class, transport_ assert client.transport._credentials == creds assert isinstance(client, client_class) - assert client.transport._host == ("serviceusage.googleapis.com:443") + assert client.transport._host == ( + "serviceusage.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://serviceusage.googleapis.com" + ) @pytest.mark.parametrize( @@ -123,6 +133,7 @@ def test_service_usage_client_from_service_account_info(client_class, transport_ [ (transports.ServiceUsageGrpcTransport, "grpc"), (transports.ServiceUsageGrpcAsyncIOTransport, "grpc_asyncio"), + (transports.ServiceUsageRestTransport, "rest"), ], ) def test_service_usage_client_service_account_always_use_jwt( @@ -148,6 +159,7 @@ def test_service_usage_client_service_account_always_use_jwt( [ (ServiceUsageClient, "grpc"), (ServiceUsageAsyncClient, "grpc_asyncio"), + (ServiceUsageClient, "rest"), ], ) def test_service_usage_client_from_service_account_file(client_class, transport_name): @@ -168,13 +180,18 @@ def test_service_usage_client_from_service_account_file(client_class, transport_ assert client.transport._credentials == creds assert isinstance(client, client_class) - assert client.transport._host == ("serviceusage.googleapis.com:443") + assert client.transport._host == ( + "serviceusage.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://serviceusage.googleapis.com" + ) def test_service_usage_client_get_transport_class(): transport = ServiceUsageClient.get_transport_class() available_transports = [ transports.ServiceUsageGrpcTransport, + transports.ServiceUsageRestTransport, ] assert transport in available_transports @@ -191,6 +208,7 @@ def test_service_usage_client_get_transport_class(): transports.ServiceUsageGrpcAsyncIOTransport, "grpc_asyncio", ), + (ServiceUsageClient, transports.ServiceUsageRestTransport, "rest"), ], ) @mock.patch.object( @@ -334,6 +352,8 @@ def test_service_usage_client_client_options( "grpc_asyncio", "false", ), + (ServiceUsageClient, transports.ServiceUsageRestTransport, "rest", "true"), + (ServiceUsageClient, transports.ServiceUsageRestTransport, "rest", "false"), ], ) @mock.patch.object( @@ -527,6 +547,7 @@ def test_service_usage_client_get_mtls_endpoint_and_cert_source(client_class): transports.ServiceUsageGrpcAsyncIOTransport, "grpc_asyncio", ), + (ServiceUsageClient, transports.ServiceUsageRestTransport, "rest"), ], ) def test_service_usage_client_client_options_scopes( @@ -567,6 +588,7 @@ def test_service_usage_client_client_options_scopes( "grpc_asyncio", grpc_helpers_async, ), + (ServiceUsageClient, transports.ServiceUsageRestTransport, "rest", None), ], ) def test_service_usage_client_client_options_credentials_file( @@ -1772,6 +1794,808 @@ async def test_batch_get_services_field_headers_async(): ) in kw["metadata"] +@pytest.mark.parametrize( + "request_type", + [ + serviceusage.EnableServiceRequest, + dict, + ], +) +def test_enable_service_rest(request_type): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"name": "sample1/sample2/services/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = operations_pb2.Operation(name="operations/spam") + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + json_return_value = json_format.MessageToJson(return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.enable_service(request) + + # Establish that the response is the type that we expect. + assert response.operation.name == "operations/spam" + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_enable_service_rest_interceptors(null_interceptor): + transport = transports.ServiceUsageRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.ServiceUsageRestInterceptor(), + ) + client = ServiceUsageClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + operation.Operation, "_set_result_from_operation" + ), mock.patch.object( + transports.ServiceUsageRestInterceptor, "post_enable_service" + ) as post, mock.patch.object( + transports.ServiceUsageRestInterceptor, "pre_enable_service" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = serviceusage.EnableServiceRequest.pb( + serviceusage.EnableServiceRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = json_format.MessageToJson( + operations_pb2.Operation() + ) + + request = serviceusage.EnableServiceRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = operations_pb2.Operation() + + client.enable_service( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_enable_service_rest_bad_request( + transport: str = "rest", request_type=serviceusage.EnableServiceRequest +): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"name": "sample1/sample2/services/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.enable_service(request) + + +def test_enable_service_rest_error(): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + serviceusage.DisableServiceRequest, + dict, + ], +) +def test_disable_service_rest(request_type): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"name": "sample1/sample2/services/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = operations_pb2.Operation(name="operations/spam") + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + json_return_value = json_format.MessageToJson(return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.disable_service(request) + + # Establish that the response is the type that we expect. + assert response.operation.name == "operations/spam" + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_disable_service_rest_interceptors(null_interceptor): + transport = transports.ServiceUsageRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.ServiceUsageRestInterceptor(), + ) + client = ServiceUsageClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + operation.Operation, "_set_result_from_operation" + ), mock.patch.object( + transports.ServiceUsageRestInterceptor, "post_disable_service" + ) as post, mock.patch.object( + transports.ServiceUsageRestInterceptor, "pre_disable_service" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = serviceusage.DisableServiceRequest.pb( + serviceusage.DisableServiceRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = json_format.MessageToJson( + operations_pb2.Operation() + ) + + request = serviceusage.DisableServiceRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = operations_pb2.Operation() + + client.disable_service( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_disable_service_rest_bad_request( + transport: str = "rest", request_type=serviceusage.DisableServiceRequest +): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"name": "sample1/sample2/services/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.disable_service(request) + + +def test_disable_service_rest_error(): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + serviceusage.GetServiceRequest, + dict, + ], +) +def test_get_service_rest(request_type): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"name": "sample1/sample2/services/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = resources.Service( + name="name_value", + parent="parent_value", + state=resources.State.DISABLED, + ) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = resources.Service.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.get_service(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, resources.Service) + assert response.name == "name_value" + assert response.parent == "parent_value" + assert response.state == resources.State.DISABLED + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_get_service_rest_interceptors(null_interceptor): + transport = transports.ServiceUsageRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.ServiceUsageRestInterceptor(), + ) + client = ServiceUsageClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.ServiceUsageRestInterceptor, "post_get_service" + ) as post, mock.patch.object( + transports.ServiceUsageRestInterceptor, "pre_get_service" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = serviceusage.GetServiceRequest.pb(serviceusage.GetServiceRequest()) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = resources.Service.to_json(resources.Service()) + + request = serviceusage.GetServiceRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = resources.Service() + + client.get_service( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_get_service_rest_bad_request( + transport: str = "rest", request_type=serviceusage.GetServiceRequest +): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"name": "sample1/sample2/services/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.get_service(request) + + +def test_get_service_rest_error(): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + serviceusage.ListServicesRequest, + dict, + ], +) +def test_list_services_rest(request_type): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "sample1/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = serviceusage.ListServicesResponse( + next_page_token="next_page_token_value", + ) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = serviceusage.ListServicesResponse.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.list_services(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, pagers.ListServicesPager) + assert response.next_page_token == "next_page_token_value" + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_list_services_rest_interceptors(null_interceptor): + transport = transports.ServiceUsageRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.ServiceUsageRestInterceptor(), + ) + client = ServiceUsageClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.ServiceUsageRestInterceptor, "post_list_services" + ) as post, mock.patch.object( + transports.ServiceUsageRestInterceptor, "pre_list_services" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = serviceusage.ListServicesRequest.pb( + serviceusage.ListServicesRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = serviceusage.ListServicesResponse.to_json( + serviceusage.ListServicesResponse() + ) + + request = serviceusage.ListServicesRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = serviceusage.ListServicesResponse() + + client.list_services( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_list_services_rest_bad_request( + transport: str = "rest", request_type=serviceusage.ListServicesRequest +): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "sample1/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.list_services(request) + + +def test_list_services_rest_pager(transport: str = "rest"): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # TODO(kbandes): remove this mock unless there's a good reason for it. + # with mock.patch.object(path_template, 'transcode') as transcode: + # Set the response as a series of pages + response = ( + serviceusage.ListServicesResponse( + services=[ + resources.Service(), + resources.Service(), + resources.Service(), + ], + next_page_token="abc", + ), + serviceusage.ListServicesResponse( + services=[], + next_page_token="def", + ), + serviceusage.ListServicesResponse( + services=[ + resources.Service(), + ], + next_page_token="ghi", + ), + serviceusage.ListServicesResponse( + services=[ + resources.Service(), + resources.Service(), + ], + ), + ) + # Two responses for two calls + response = response + response + + # Wrap the values into proper Response objs + response = tuple(serviceusage.ListServicesResponse.to_json(x) for x in response) + return_values = tuple(Response() for i in response) + for return_val, response_val in zip(return_values, response): + return_val._content = response_val.encode("UTF-8") + return_val.status_code = 200 + req.side_effect = return_values + + sample_request = {"parent": "sample1/sample2"} + + pager = client.list_services(request=sample_request) + + results = list(pager) + assert len(results) == 6 + assert all(isinstance(i, resources.Service) for i in results) + + pages = list(client.list_services(request=sample_request).pages) + for page_, token in zip(pages, ["abc", "def", "ghi", ""]): + assert page_.raw_page.next_page_token == token + + +@pytest.mark.parametrize( + "request_type", + [ + serviceusage.BatchEnableServicesRequest, + dict, + ], +) +def test_batch_enable_services_rest(request_type): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "sample1/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = operations_pb2.Operation(name="operations/spam") + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + json_return_value = json_format.MessageToJson(return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.batch_enable_services(request) + + # Establish that the response is the type that we expect. + assert response.operation.name == "operations/spam" + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_batch_enable_services_rest_interceptors(null_interceptor): + transport = transports.ServiceUsageRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.ServiceUsageRestInterceptor(), + ) + client = ServiceUsageClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + operation.Operation, "_set_result_from_operation" + ), mock.patch.object( + transports.ServiceUsageRestInterceptor, "post_batch_enable_services" + ) as post, mock.patch.object( + transports.ServiceUsageRestInterceptor, "pre_batch_enable_services" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = serviceusage.BatchEnableServicesRequest.pb( + serviceusage.BatchEnableServicesRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = json_format.MessageToJson( + operations_pb2.Operation() + ) + + request = serviceusage.BatchEnableServicesRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = operations_pb2.Operation() + + client.batch_enable_services( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_batch_enable_services_rest_bad_request( + transport: str = "rest", request_type=serviceusage.BatchEnableServicesRequest +): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "sample1/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.batch_enable_services(request) + + +def test_batch_enable_services_rest_error(): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + serviceusage.BatchGetServicesRequest, + dict, + ], +) +def test_batch_get_services_rest(request_type): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "sample1/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = serviceusage.BatchGetServicesResponse() + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = serviceusage.BatchGetServicesResponse.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.batch_get_services(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, serviceusage.BatchGetServicesResponse) + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_batch_get_services_rest_interceptors(null_interceptor): + transport = transports.ServiceUsageRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.ServiceUsageRestInterceptor(), + ) + client = ServiceUsageClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.ServiceUsageRestInterceptor, "post_batch_get_services" + ) as post, mock.patch.object( + transports.ServiceUsageRestInterceptor, "pre_batch_get_services" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = serviceusage.BatchGetServicesRequest.pb( + serviceusage.BatchGetServicesRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = serviceusage.BatchGetServicesResponse.to_json( + serviceusage.BatchGetServicesResponse() + ) + + request = serviceusage.BatchGetServicesRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = serviceusage.BatchGetServicesResponse() + + client.batch_get_services( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_batch_get_services_rest_bad_request( + transport: str = "rest", request_type=serviceusage.BatchGetServicesRequest +): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "sample1/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.batch_get_services(request) + + +def test_batch_get_services_rest_error(): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + def test_credentials_transport_error(): # It is an error to provide credentials and a transport instance. transport = transports.ServiceUsageGrpcTransport( @@ -1853,6 +2677,7 @@ def test_transport_get_channel(): [ transports.ServiceUsageGrpcTransport, transports.ServiceUsageGrpcAsyncIOTransport, + transports.ServiceUsageRestTransport, ], ) def test_transport_adc(transport_class): @@ -1867,6 +2692,7 @@ def test_transport_adc(transport_class): "transport_name", [ "grpc", + "rest", ], ) def test_transport_kind(transport_name): @@ -2018,6 +2844,7 @@ def test_service_usage_transport_auth_adc(transport_class): [ transports.ServiceUsageGrpcTransport, transports.ServiceUsageGrpcAsyncIOTransport, + transports.ServiceUsageRestTransport, ], ) def test_service_usage_transport_auth_gdch_credentials(transport_class): @@ -2116,11 +2943,40 @@ def test_service_usage_grpc_transport_client_cert_source_for_mtls(transport_clas ) +def test_service_usage_http_transport_client_cert_source_for_mtls(): + cred = ga_credentials.AnonymousCredentials() + with mock.patch( + "google.auth.transport.requests.AuthorizedSession.configure_mtls_channel" + ) as mock_configure_mtls_channel: + transports.ServiceUsageRestTransport( + credentials=cred, client_cert_source_for_mtls=client_cert_source_callback + ) + mock_configure_mtls_channel.assert_called_once_with(client_cert_source_callback) + + +def test_service_usage_rest_lro_client(): + client = ServiceUsageClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + transport = client.transport + + # Ensure that we have a api-core operations client. + assert isinstance( + transport.operations_client, + operations_v1.AbstractOperationsClient, + ) + + # Ensure that subsequent calls to the property send the exact same object. + assert transport.operations_client is transport.operations_client + + @pytest.mark.parametrize( "transport_name", [ "grpc", "grpc_asyncio", + "rest", ], ) def test_service_usage_host_no_port(transport_name): @@ -2131,7 +2987,11 @@ def test_service_usage_host_no_port(transport_name): ), transport=transport_name, ) - assert client.transport._host == ("serviceusage.googleapis.com:443") + assert client.transport._host == ( + "serviceusage.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://serviceusage.googleapis.com" + ) @pytest.mark.parametrize( @@ -2139,6 +2999,7 @@ def test_service_usage_host_no_port(transport_name): [ "grpc", "grpc_asyncio", + "rest", ], ) def test_service_usage_host_with_port(transport_name): @@ -2149,7 +3010,48 @@ def test_service_usage_host_with_port(transport_name): ), transport=transport_name, ) - assert client.transport._host == ("serviceusage.googleapis.com:8000") + assert client.transport._host == ( + "serviceusage.googleapis.com:8000" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://serviceusage.googleapis.com:8000" + ) + + +@pytest.mark.parametrize( + "transport_name", + [ + "rest", + ], +) +def test_service_usage_client_transport_session_collision(transport_name): + creds1 = ga_credentials.AnonymousCredentials() + creds2 = ga_credentials.AnonymousCredentials() + client1 = ServiceUsageClient( + credentials=creds1, + transport=transport_name, + ) + client2 = ServiceUsageClient( + credentials=creds2, + transport=transport_name, + ) + session1 = client1.transport.enable_service._session + session2 = client2.transport.enable_service._session + assert session1 != session2 + session1 = client1.transport.disable_service._session + session2 = client2.transport.disable_service._session + assert session1 != session2 + session1 = client1.transport.get_service._session + session2 = client2.transport.get_service._session + assert session1 != session2 + session1 = client1.transport.list_services._session + session2 = client2.transport.list_services._session + assert session1 != session2 + session1 = client1.transport.batch_enable_services._session + session2 = client2.transport.batch_enable_services._session + assert session1 != session2 + session1 = client1.transport.batch_get_services._session + session2 = client2.transport.batch_get_services._session + assert session1 != session2 def test_service_usage_grpc_transport_channel(): @@ -2446,6 +3348,7 @@ async def test_transport_close_async(): def test_transport_close(): transports = { + "rest": "_session", "grpc": "_grpc_channel", } @@ -2463,6 +3366,7 @@ def test_transport_close(): def test_client_ctx(): transports = [ + "rest", "grpc", ] for transport in transports: